|
@@ -39,6 +39,7 @@ import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
import java.math.RoundingMode;
|
|
|
import java.text.DecimalFormat;
|
|
import java.text.DecimalFormat;
|
|
|
import java.time.Instant;
|
|
import java.time.Instant;
|
|
|
|
|
+import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
import java.time.ZoneId;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
import java.time.format.DateTimeFormatter;
|
|
@@ -548,8 +549,8 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
|
|
|
lifeCouponMapper.update(null, new LambdaUpdateWrapper<LifeCoupon>()
|
|
lifeCouponMapper.update(null, new LambdaUpdateWrapper<LifeCoupon>()
|
|
|
.set(LifeCoupon::getStatus, CouponStatusEnum.ONGOING.getCode())
|
|
.set(LifeCoupon::getStatus, CouponStatusEnum.ONGOING.getCode())
|
|
|
.eq(LifeCoupon::getId, couponId)
|
|
.eq(LifeCoupon::getId, couponId)
|
|
|
- .le(LifeCoupon::getStartDate, LocalDateTime.now())
|
|
|
|
|
- .ge(LifeCoupon::getEndDate, LocalDateTime.now())
|
|
|
|
|
|
|
+ .le(LifeCoupon::getStartDate, LocalDate.now())
|
|
|
|
|
+ .ge(LifeCoupon::getEndDate, LocalDate.now())
|
|
|
.gt(LifeCoupon::getSingleQty, 0));
|
|
.gt(LifeCoupon::getSingleQty, 0));
|
|
|
} else {
|
|
} else {
|
|
|
// 团购信息
|
|
// 团购信息
|
|
@@ -561,8 +562,8 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
|
|
|
lifeGroupBuyMainMapper.update(null, new LambdaUpdateWrapper<LifeGroupBuyMain>()
|
|
lifeGroupBuyMainMapper.update(null, new LambdaUpdateWrapper<LifeGroupBuyMain>()
|
|
|
.set(LifeGroupBuyMain::getStatus, CouponStatusEnum.ONGOING.getCode())
|
|
.set(LifeGroupBuyMain::getStatus, CouponStatusEnum.ONGOING.getCode())
|
|
|
.eq(LifeGroupBuyMain::getId, couponId)
|
|
.eq(LifeGroupBuyMain::getId, couponId)
|
|
|
- .le(LifeGroupBuyMain::getStartTimeValue, LocalDateTime.now())
|
|
|
|
|
- .ge(LifeGroupBuyMain::getEndTime, LocalDateTime.now())
|
|
|
|
|
|
|
+ .le(LifeGroupBuyMain::getStartTimeValue, LocalDate.now())
|
|
|
|
|
+ .ge(LifeGroupBuyMain::getEndTime, LocalDate.now())
|
|
|
.gt(LifeGroupBuyMain::getInventoryNum, 0));
|
|
.gt(LifeGroupBuyMain::getInventoryNum, 0));
|
|
|
}
|
|
}
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|