123

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

@@ -119,10 +119,12 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             log.error("----参数不能为空");
             return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
         }
-        Long time=System.currentTimeMillis();
-        List<UserCouponVo> list=mapper.getUserCouponsByType(userId,type,time,channel);
-        if(amout.compareTo(new BigDecimal("0.00"))>0&&list.size()>0){
-            for (UserCouponVo couponVo:list){
+        List<UserCouponVo> list=new ArrayList<>();
+        if (amout.compareTo(new BigDecimal("0.00"))>0){
+            Long time=System.currentTimeMillis();
+            list=mapper.getUserCouponsByType(userId,type,time,channel);
+            if(list.size()>0){
+                for (UserCouponVo couponVo:list){
                     Integer status=2;
                     if(couponVo.getType()==1){
                         if (amout.compareTo(couponVo.getWithAmount())>=0){
@@ -132,11 +134,12 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
                         status=1;
                     }
 
-                couponVo.setStatus(status);
+                    couponVo.setStatus(status);
+                }
+                list.sort(Comparator.comparing(UserCouponVo::getStatus));
             }
 
         }
-        list.sort(Comparator.comparing(UserCouponVo::getStatus));
         return  ObjectRestResponse.succ(list);
     }