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

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

This commit is contained in:
wangw 2025-09-18 16:55:34 +08:00
parent 95d2c0d809 dcb68f5717
commit ce2af8c5be
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java
View File

@ -28,7 +28,6 @@ public interface MkShopConsumeDiscountRecordService extends IService<MkShopConsu
* @param shopUserId 店铺用户id * @param shopUserId 店铺用户id
* @param orderId 订单id * @param orderId 订单id
* @param amount 减免金额 * @param amount 减免金额
* @return 是否成功
*/ */
boolean useDiscount(Long recordId, Long shopUserId, Long orderId, BigDecimal amount); void useDiscount(Long recordId, Long shopUserId, Long orderId, BigDecimal amount);
} }

5
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java
View File

@ -38,21 +38,20 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
private ShopUserService shopUserService; private ShopUserService shopUserService;
@Override @Override
public boolean useDiscount(Long recordId, Long shopUserId, Long orderId, BigDecimal amount) { public void useDiscount(Long recordId, Long shopUserId, Long orderId, BigDecimal amount) {
AssertUtil.isTrue(recordId == null || shopUserId == null || orderId == null || amount == null, "参数不能为空"); AssertUtil.isTrue(recordId == null || shopUserId == null || orderId == null || amount == null, "参数不能为空");
MkShopConsumeDiscountRecord discountRecord = getOne(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getId, recordId) MkShopConsumeDiscountRecord discountRecord = getOne(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getId, recordId)
.eq(MkShopConsumeDiscountRecord::getShopUserId, shopUserId) .eq(MkShopConsumeDiscountRecord::getShopUserId, shopUserId)
.eq(MkShopConsumeDiscountRecord::getOrderId, orderId)); .eq(MkShopConsumeDiscountRecord::getOrderId, orderId));
AssertUtil.isNull(discountRecord, "减免记录不存在"); AssertUtil.isNull(discountRecord, "减免记录不存在");
AssertUtil.isTrue(discountRecord.getIsUse() == 0, "减免记录已使用"); AssertUtil.isTrue(discountRecord.getIsUse() == 1, "减免记录已使用");
AssertUtil.isTrue(discountRecord.getAmount().compareTo(amount) != 0, "减免金额不同"); AssertUtil.isTrue(discountRecord.getAmount().compareTo(amount) != 0, "减免金额不同");
boolean flag = updateChain().eq(MkShopConsumeDiscountRecord::getId, recordId) boolean flag = updateChain().eq(MkShopConsumeDiscountRecord::getId, recordId)
.eq(MkShopConsumeDiscountRecord::getIsUse, 0) .eq(MkShopConsumeDiscountRecord::getIsUse, 0)
.set(MkShopConsumeDiscountRecord::getIsUse, 1).update(); .set(MkShopConsumeDiscountRecord::getIsUse, 1).update();
AssertUtil.isTrue(!flag, "修改失败"); AssertUtil.isTrue(!flag, "修改失败");
return true;
} }
@Override @Override