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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java

@@ -110,11 +110,7 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
         return mapper.select(user);
     }
 
-    public User getUserByUid(Integer toUid){
-        User user=mapper.getUserByUid(toUid);
-        if(user!=null){
-            user=mapper.selectByPrimaryKey(user.getId());
-        }
-        return user;
+    public User getUserByUid(Integer userId){
+        return mapper.selectByPrimaryKey(userId);
     }
 }

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

@@ -139,6 +139,8 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         }
         Long time=System.currentTimeMillis();
         List<UserCouponVo> list=mapper.getUserCouponsByType(userId,type,time,channel);
+        List<UserCouponVo> list1=new ArrayList<>();
+        List<UserCouponVo> list2=new ArrayList<>();
         if(list.size()>0){
             for (UserCouponVo couponVo:list){
                     Integer status=2;
@@ -147,16 +149,43 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
                             if (amout.compareTo(couponVo.getWithAmount())>=0){
                                 status=1;
                             }
+                            couponVo.setStatus(status);
+                            list1.add(couponVo);
                         }else if (couponVo.getType()==3){
                             status=1;
+                            couponVo.setStatus(status);
+                            list2.add(couponVo);
                         }
                     }
-                couponVo.setStatus(status);
             }
-            list.sort(Comparator.comparing(UserCouponVo::getStatus));
+           // list.sort(Comparator.comparing(UserCouponVo::getStatus));
         }
-
-        return  ObjectRestResponse.succ(list);
+        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("1",list1);
+        object.put("3",list2);
+        object.put("mAmount",mAmount);
+        return  ObjectRestResponse.succ(object);
     }