Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-09-17 11:21:35 +08:00
commit a0c5903aa6
1 changed files with 4 additions and 3 deletions

View File

@ -201,7 +201,8 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
if (StrUtil.isNotBlank(tbShopCoupon.getUseDays())) {
String[] split = tbShopCoupon.getUseDays().split(",");
if (split.length != 7) {
useRestrictions = new StringBuilder(STR."\{tbShopCoupon.getUseDays()} ");
// useRestrictions = new StringBuilder(STR."\{tbShopCoupon.getUseDays()} ");
useRestrictions = new StringBuilder(tbShopCoupon.getUseDays() + " ");
}
if (!tbShopCoupon.getUseDays().contains(week)) {
isUse = false;
@ -222,8 +223,8 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
isUse = false;
}
}
useRestrictions.append(
STR."\{startTime.format(formatter)}-\{endTime.format(formatter)}");
// useRestrictions.append(STR."\{startTime.format(formatter)}-\{endTime.format(formatter)}");
useRestrictions.append(startTime.format(formatter) + "-" + endTime.format(formatter));
} else {
useRestrictions.append("全时段");
}