123

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

@@ -195,6 +195,34 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         return  ObjectRestResponse.succ(result);
     }
 
+    //获取我的优惠卷
+    public ObjectRestResponse getUserCouponList(Integer userId,int type,Integer channel,BigDecimal amout) {
+        if (userId == null || userId == 0) {
+            log.error("----参数不能为空");
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数不能为空");
+        }
+        Long time = System.currentTimeMillis();
+        List<UserCouponVo> list = mapper.getUserCouponsByType(userId, type, time, channel);
+        if (list.size() > 0) {
+            for (UserCouponVo couponVo : list) {
+                Integer status = 2;
+                if (amout.compareTo(new BigDecimal("0.00")) > 0) {
+                    if (couponVo.getType() == 1) {
+                        if (amout.compareTo(couponVo.getWithAmount()) >= 0) {
+                            status = 1;
+                        }
+                    } else if (couponVo.getType() == 3) {
+                        status = 1;
+                    }
+                }
+                couponVo.setStatus(status);
+            }
+            list.sort(Comparator.comparing(UserCouponVo::getStatus));
+        }
+
+        return ObjectRestResponse.succ(list);
+    }
+
 
     //获取单个优惠卷
     public UserCouponVo getUserCoupon(String tickerNo){

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/UserCouponController.java

@@ -45,6 +45,25 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
         if(userId==null){
             return ObjectRestResponse.createDefaultFail();
         }
+        return baseBiz.getUserCouponList(userId,type,channel,amount);
+    }
+
+    /**
+     *
+     * @param type  0-未使用；1-已使用；3-已过期
+     * @param channel 1-租车；2-旅游；null-全部
+     * @return
+     */
+    @ApiOperation("订单我的优惠卷")
+    @RequestMapping(value = "/coupon/typelist", method = RequestMethod.GET)
+    public ObjectRestResponse typelist(@RequestParam(value = "type",defaultValue = "0") Integer type,
+                                   @RequestParam(value = "channel",required = false) Integer channel,
+                                   @RequestParam(value = "amount",defaultValue = "0.00") BigDecimal amount) {
+        AppUserDTO userInfo = getUserInfo();
+        Integer userId = userInfo.getUserid();
+        if(userId==null){
+            return ObjectRestResponse.createDefaultFail();
+        }
         return baseBiz.getCouponList(userId,type,channel,amount);
     }