123

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/feign/ActivityFeign.java

@@ -50,10 +50,10 @@ public interface ActivityFeign {
     @ApiOperation("新人有礼参加活动")
     @RequestMapping(value = "/join/user", method = RequestMethod.POST)
     public ObjectRestResponse join(@RequestParam(value = "userId",defaultValue ="0" ) Integer userId);
-    
+
     @ApiModelProperty("获取用户积分")
-    @GetMapping(value = "/user")
-    public IntegralUserTotal user(@RequestParam("userId") Integer userId);
+    @GetMapping(value = "/user/info")
+    public IntegralUserTotal info(@RequestParam("userId") Integer userId);
 
      @GetMapping("/activity_data/clear")
      ObjectRestResponse<Void> clearDate(@RequestParam(value = "userIds") List<Integer>  userIds);

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

 package com.xxfc.platform.activity.biz;
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.admin.dto.UserInfoDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -12,6 +13,7 @@ import com.xxfc.platform.activity.dto.UserCouponDTO;
 import com.xxfc.platform.activity.dto.UserCouponFindDTO;
 import com.xxfc.platform.activity.dto.UserCouponSendDTO;
 import com.xxfc.platform.activity.entity.Coupon;
+import com.xxfc.platform.activity.entity.IntegralUserTotal;
 import com.xxfc.platform.activity.entity.UserCoupon;
 import com.xxfc.platform.activity.vo.CouponVo;
 import com.xxfc.platform.activity.vo.UserCouponPageVo;
@@ -51,6 +53,9 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
     @Autowired
     private UserFeign userFeign;
 
+    @Autowired
+    private  IntegralUserTotalBiz integralUserTotalBiz;
+
     private  static  final  Long  DAY=86400000L;
 
     //自动发送优惠卷
@@ -324,4 +329,17 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
 
         return mapper.inserBatch(userCoupons);
     }
+
+
+    public UserInfoDTO getUserInfo(Integer userId)throws  Exception{
+        UserInfoDTO  userInfoDTO=new UserInfoDTO();
+        IntegralUserTotal integralUserTotal=integralUserTotalBiz.getIntegralByUser(userId);
+        BeanUtils.copyProperties(userInfoDTO,integralUserTotal);
+        UserCoupon userCoupon=new UserCoupon();
+        userCoupon.setUserId(userId);
+        userCoupon.setIsUse(0);
+        Long couponNumber=selectCount(userCoupon);
+        userInfoDTO.setCouponNumber(couponNumber);
+        return  userInfoDTO;
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/UserCouponController.java

 package com.xxfc.platform.activity.rest;
 
+import com.github.wxiaoqi.security.admin.dto.UserInfoDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -98,7 +99,11 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
     }
 
 
-
+    @ApiOperation("获取用户信息")
+    @GetMapping(value = "/info")
+    public UserInfoDTO info(@RequestParam("userId") Integer userId) throws Exception{
+        return baseBiz.getUserInfo(userId);
+    }
 
 
 }
\ No newline at end of file