Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -18,6 +18,8 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -118,8 +120,7 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         List<UserCouponVo> list=mapper.getUserCouponsByType(userId,type,time,channel);
         if(amout.compareTo(new BigDecimal("0.00"))>0&&list.size()>0){
             for (UserCouponVo couponVo:list){
-                Integer status=2;
-                if(amout.compareTo(couponVo.getUsedAmount())>=0){
+                    Integer status=2;
                     if(couponVo.getChannel()==1){
                         if (amout.compareTo(couponVo.getWithAmount())>=0){
                             status=1;
@@ -127,11 +128,12 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
                     }else if (couponVo.getChannel()==3){
                         status=1;
                     }
-                }
+
                 couponVo.setStatus(status);
             }
 
         }
+        list.sort(Comparator.comparing(UserCouponVo::getStatus));
         return  ObjectRestResponse.succ(list);
     }