ソースを参照

领取优惠券列表修改

zhangchen 4 ヶ月 前
コミット
e7ec093879

+ 1 - 1
alien-store/src/main/java/shop/alien/store/controller/LifeDiscountCouponController.java

@@ -181,7 +181,7 @@ public class LifeDiscountCouponController {
     @GetMapping("/getUserCouponList")
     @ApiImplicitParams({@ApiImplicitParam(name = "page", value = "分页页数", dataType = "String", paramType = "query", required = true),
             @ApiImplicitParam(name = "size", value = "分页条数", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "tabType", value = "分页类型(0:全部,1:即将过期,2:已使用,3:已过期)", dataType = "String", paramType = "query", required = true)
+            @ApiImplicitParam(name = "tabType", value = "分页类型(0:全部(未使用),1:即将过期,2:已使用,3:已过期)", dataType = "String", paramType = "query", required = true)
     })
     public R<List<LifeDiscountCouponVo>> getUserCouponList(@ApiIgnore @TokenInfo UserLoginInfo userLoginInfo,
                                                            @RequestParam(value = "tabType") String tabType,

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponServiceImpl.java

@@ -676,7 +676,7 @@ public class LifeDiscountCouponServiceImpl extends ServiceImpl<LifeDiscountCoupo
             lifeDiscountCouponVo.setQuantityClaimed(lifeDiscountCouponUserIPage.getRecords().size());
             // 判断是否到了优惠券的开始时间
             lifeDiscountCouponVo.setReachUseTimeFlag(1);
-            if (localNow1.isBefore(lifeDiscountCouponOne.getStartDate())) {
+            if (localNow1.isBefore(lifeDiscountCouponOne.getBeginGetDate())) {
                 lifeDiscountCouponVo.setReachUseTimeFlag(0);
             }
             lifeDiscountCouponVos.add(lifeDiscountCouponVo);

+ 1 - 1
alien-util/src/main/java/shop/alien/util/common/constant/DiscountCouponEnum.java

@@ -50,7 +50,7 @@ public enum DiscountCouponEnum {
     UNAVAILABLE_TIME_QUANTUM("unavailable_time_quantum"),
 
     /**条件类型*/
-    //所有
+    //所有(未使用)
     ALL("0"),
     //即将过期
     BE_ABOUT_TO_EXPORE("1"),