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

d2f0f326 · 周健威 · 422256d0 · 6274d700 · d2f0f326
Commit d2f0f326 authored Nov 03, 2020 by 周健威
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

UserCouponBiz.java ...in/java/com/xxfc/platform/activity/biz/UserCouponBiz.java +5 -5

No files found.
--- a/xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java
+++ b/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();
+        List<UserCouponVo> coupons = mapper.getUserCouponsByType(userId, 0, System.currentTimeMillis(), null);
-        userCoupon.setUserId(userId);
+        Long couponNumber = 0L;
-        userCoupon.setIsUse(0);
+        if (coupons.size() > 0){
-        userCoupon.setIsDel(0);
+            couponNumber=Long.parseLong(coupons.size()+"");
-        Long couponNumber=selectCount(userCoupon);
+        }
        userInfoDTO.setCouponNumber(couponNumber);
        return  userInfoDTO;
    }