1、站点可以领取的优惠券列表；

2、领取优惠券；

common/src/main/java/com/kym/common/handler/GlobalExceptionHandler.java

@@ -44,8 +44,8 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(value = BusinessException.class)
     @ResponseBody
-    public R handleBusinessException(BaseException e) {
-        LOGGER.error(e.getMessage(), e);
+    public R<?> handleBusinessException(BaseException e) {
+        LOGGER.error(e.getMessage());
         return R.failed(e.getCode(), e.getMessage());
     }
 

entity/src/main/java/com/kym/entity/admin/Coupon.java

@@ -31,8 +31,10 @@ public class Coupon extends BaseEntity {
     public static final String RECEIVE_TYPE_系统发放 = "Release";
     public static final String RECEIVE_TYPE_主动领取 = "Collect";
 
-    public static final int STATUS_无效 = 0;
-    public static final int STATUS_有效 = 1;
+    public static final int STATUS_未开始 = 0;
+    public static final int STATUS_进行中 = 1;
+    public static final int STATUS_已结束 = 2;
+    public static final int STATUS_已取消 = 3;
 
 
     /**

miniapp/src/main/java/com/kym/miniapp/controller/CouponController.java

@@ -44,6 +44,7 @@ public class CouponController {
      * @param couponId
      * @return
      */
+    @GetMapping(value = "/collectCoupon")
     public R<?> collectCoupon(@RequestParam("couponId") Long couponId) {
         userCouponService.collectCoupon(couponId);
         return R.success();

service/src/main/java/com/kym/service/admin/impl/CouponServiceImpl.java

@@ -102,7 +102,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
                 userCoupon.setMinServiceMoney(coupon.getMinServiceMoney());
                 userCoupon.setAllowStacke(coupon.getAllowStacke());
                 userCoupon.setRemark(coupon.getRemark());
-                userCoupon.setStatus(Coupon.STATUS_有效);
+                userCoupon.setStatus(coupon.getStatus());
                 userCouponSender.sendMessage(userCoupon);
             }
         });
@@ -119,7 +119,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
                 .selectAll(Coupon.class)
                 .leftJoin(ActivityStation.class, ActivityStation::getActivityId, Coupon::getActivityId)
                 .eq(Coupon::getReceiveType, Coupon.RECEIVE_TYPE_主动领取)
-                .eq(Coupon::getStatus, Coupon.STATUS_有效)
+                .in(Coupon::getStatus, Coupon.STATUS_未开始, Coupon.STATUS_进行中)
                 .eq(ActivityStation::getStationId, params.getStationId());
         var res = this.selectJoinList(Coupon.class, wrapper);
         return new PageBean<>(res);

service/src/main/java/com/kym/service/miniapp/impl/UserCouponServiceImpl.java

@@ -91,7 +91,7 @@ public class UserCouponServiceImpl extends MPJBaseServiceImpl<UserCouponMapper,
         // 优惠券状态校验
         var coupon = couponService.lambdaQuery()
                 .eq(Coupon::getId, couponId)
-                .eq(Coupon::getStatus, Coupon.STATUS_有效)
+                .in(Coupon::getStatus, Coupon.STATUS_未开始, Coupon.STATUS_进行中)
                 .one();
 
         if (coupon == null) {