123

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/UserCouponVo.java

@@ -149,6 +149,12 @@ public class UserCouponVo {
 	 */
 	@ApiModelProperty(value = "跳转链接")
 	private String url;
+
+	/**
+	 *  是否选中
+	 */
+	@ApiModelProperty(value = "是否选中")
+	private Integer isChecked;
 	
 
 }

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

@@ -160,15 +160,31 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             }
            // list.sort(Comparator.comparing(UserCouponVo::getStatus));
         }
-        if (list1.size()>0){
-            list1.sort(Comparator.comparing(UserCouponVo::getStatus));
-        }
+        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);
+            }
+            list1.sort(Comparator.comparing(UserCouponVo::getStatus));
+        }
         JSONObject object=new JSONObject();
-        object.put("type1",list1);
-        object.put("type2",list2);
+        object.put("1",list1);
+        object.put("3",list2);
+        object.put("mAmount",mAmount);
         return  ObjectRestResponse.succ(object);
     }