liujunchi пре 3 година
родитељ
комит
88c4ade7ad

+ 1 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CouponInfoServiceImp.java

@@ -329,6 +329,7 @@ public class CouponInfoServiceImp extends ServiceImpl<CouponInfoMapper, CouponIn
                         .useState(CouponUseStateEnum.USABLE)
                         .useTime(0L)
                         .orderNo("")
+                        .useType(null)
                         .build());
             }
         } else {

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CouponIssueServiceImp.java

@@ -78,7 +78,7 @@ public class CouponIssueServiceImp extends ServiceImpl<CouponIssueMapper, Coupon
         // 优惠券过期状态
         couponIssueWrappers = couponIssueWrappers.stream()
                 .peek(couponIssueWrapper -> {
-                    if (couponIssueWrapper.getEndTime().compareTo(query.getExpiredTime()) <0) {
+                    if (couponIssueWrapper.getEndTime().compareTo(query.getExpiredTime()) <0 &&couponIssueWrapper.getUseState().equals(CouponUseStateEnum.USABLE)) {
                         couponIssueWrapper.setUseState(CouponUseStateEnum.EXPIRED);
                     }
                 }).collect(Collectors.toList());