czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: czg_team:61a8c31e31b3b504bf6683412f8538d694655509
Branches Tags
czg_team:master czg_team:prod czg_team:pay czg_team:dev czg_team:test czg_team:backup-250910
...
compare: czg_team:4710fc4e71e70c0a4525f18b297df2f407362d04
Branches Tags
czg_team:prod czg_team:pay czg_team:dev czg_team:test czg_team:backup-250910 czg_team:master

2 Commits
61a8c31e31 ... 4710fc4e71

Author SHA1 Message Date
张松
4710fc4e71 Merge remote-tracking branch 'origin/test' into test 2025-09-17 17:59:53 +08:00
张松
e44ceece68 新客立减修改 2025-09-17 17:59:46 +08:00
1 changed files with 1 additions and 2 deletions
Expand all files Collapse all files

3
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeDiscountServiceImpl.java
View File

@@ -52,7 +52,7 @@ public class MkConsumeDiscountServiceImpl extends ServiceImpl<MkConsumeDiscountM
throw new ApiNotPrintException("优惠金额和随机优惠金额不能同时为空"); throw new ApiNotPrintException("优惠金额和随机优惠金额不能同时为空");
} }
MkConsumeDiscount consumeDiscount = getOne(new QueryWrapper().eq(MkConsumeDiscount::getShopId, shopId)); MkConsumeDiscount consumeDiscount = getOne(new QueryWrapper().eq(MkConsumeDiscount::getShopId, shopId));
BeanUtil.copyProperties(consumeDiscountDTO, consumeDiscount);
if (TableValueConstant.ConsumeDiscount.DiscountType.RANDOM.getCode().equals(consumeDiscountDTO.getDiscountType())) { if (TableValueConstant.ConsumeDiscount.DiscountType.RANDOM.getCode().equals(consumeDiscountDTO.getDiscountType())) {
if (consumeDiscountDTO.getRandomDiscountList() == null || consumeDiscountDTO.getRandomDiscountList().isEmpty()) { if (consumeDiscountDTO.getRandomDiscountList() == null || consumeDiscountDTO.getRandomDiscountList().isEmpty()) {
throw new ApiNotPrintException("随机优惠金额不能为空"); throw new ApiNotPrintException("随机优惠金额不能为空");
@@ -72,7 +72,6 @@ public class MkConsumeDiscountServiceImpl extends ServiceImpl<MkConsumeDiscountM
} }
} }
BeanUtil.copyProperties(consumeDiscountDTO, consumeDiscount);
if (consumeDiscountDTO.getUseTypeList() != null) { if (consumeDiscountDTO.getUseTypeList() != null) {