Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
commit
a0c5903aa6
|
|
@ -201,7 +201,8 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
|
||||||
if (StrUtil.isNotBlank(tbShopCoupon.getUseDays())) {
|
if (StrUtil.isNotBlank(tbShopCoupon.getUseDays())) {
|
||||||
String[] split = tbShopCoupon.getUseDays().split(",");
|
String[] split = tbShopCoupon.getUseDays().split(",");
|
||||||
if (split.length != 7) {
|
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)) {
|
if (!tbShopCoupon.getUseDays().contains(week)) {
|
||||||
isUse = false;
|
isUse = false;
|
||||||
|
|
@ -222,8 +223,8 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
|
||||||
isUse = false;
|
isUse = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
useRestrictions.append(
|
// useRestrictions.append(STR."\{startTime.format(formatter)}-\{endTime.format(formatter)}");
|
||||||
STR."\{startTime.format(formatter)}-\{endTime.format(formatter)}");
|
useRestrictions.append(startTime.format(formatter) + "-" + endTime.format(formatter));
|
||||||
} else {
|
} else {
|
||||||
useRestrictions.append("全时段");
|
useRestrictions.append("全时段");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue