123

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.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.dto.UserInfoDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
@@ -162,30 +163,38 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         }
         BigDecimal mAmount=BigDecimal.ZERO;
         if (list2.size()>0){
-            if (mAmount.compareTo(BigDecimal.ZERO)==0){
                 UserCouponVo userCouponVo=list2.get(0);
                 if (userCouponVo!=null){
                     mAmount=userCouponVo.getUsedAmount();
                     userCouponVo.setIsChecked(1);
                     list2.set(0,userCouponVo);
                 }
-            }
             list2.sort(Comparator.comparing(UserCouponVo::getStatus));
         }
         if (list1.size()>0){
-            UserCouponVo userCouponVo=list1.get(0);
-            if (userCouponVo!=null){
-                mAmount=userCouponVo.getUsedAmount();
-                userCouponVo.setIsChecked(1);
-                list1.set(0,userCouponVo);
+            if (mAmount.compareTo(BigDecimal.ZERO)==0){
+                UserCouponVo userCouponVo=list1.get(0);
+                if (userCouponVo!=null){
+                    mAmount=userCouponVo.getUsedAmount();
+                    userCouponVo.setIsChecked(1);
+                    list1.set(0,userCouponVo);
+                }
             }
             list1.sort(Comparator.comparing(UserCouponVo::getStatus));
         }
+        JSONArray array = new JSONArray();
         JSONObject object=new JSONObject();
-        object.put("1",list1);
-        object.put("3",list2);
-        object.put("mAmount",mAmount);
-        return  ObjectRestResponse.succ(object);
+        object.put("type",1);
+        object.put("list",list1);
+        array.add(object);
+        JSONObject object1=new JSONObject();
+        object1.put("type",3);
+        object1.put("list",list2);
+        array.add(object1);
+        JSONObject result=new JSONObject();
+        result.put("mAmount",mAmount);
+        result.put("array",array);
+        return  ObjectRestResponse.succ(result);
     }