Merge remote-tracking branch 'origin/dev-chw' into dev-chw

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

@@ -473,11 +473,11 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         }else {
             userInfoDTO.setTotalPoint(0);
         }
-        UserCoupon userCoupon=new UserCoupon();
-        userCoupon.setUserId(userId);
-        userCoupon.setIsUse(0);
-        userCoupon.setIsDel(0);
-        Long couponNumber=selectCount(userCoupon);
+        List<UserCouponVo> coupons = mapper.getUserCouponsByType(userId, 0, System.currentTimeMillis(), null);
+        Long couponNumber = 0L;
+        if (coupons.size() > 0){
+            couponNumber=Long.parseLong(coupons.size()+"");
+        }
         userInfoDTO.setCouponNumber(couponNumber);
         return  userInfoDTO;
     }