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

订单支付修改

Browse Source
This commit is contained in:
张松
2025-09-27 19:52:19 +08:00
parent ab17010291
commit 8ec3fbd1f7
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java
View File

@@ -40,7 +40,7 @@ public class UShopConsumeDiscountController {
* @return 金额 * @return 金额
*/ */
@GetMapping @GetMapping
public CzgResult<MkShopConsumeDiscountRecord> get(@RequestParam Long shopId, @RequestParam Long orderId) { public CzgResult<MkShopConsumeDiscountRecord> get(@RequestParam Long shopId, @RequestParam(required = false) Long orderId) {
// shopConsumeDiscountRecordService.useDiscount(null, null,null,null); // shopConsumeDiscountRecordService.useDiscount(null, null,null,null);
return CzgResult.success(shopConsumeDiscountRecordService.getDiscount(shopId, StpKit.USER.getLoginIdAsLong(), orderId)); return CzgResult.success(shopConsumeDiscountRecordService.getDiscount(shopId, StpKit.USER.getLoginIdAsLong(), orderId));
} }

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

@@ -106,6 +106,10 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
.eq(MkShopConsumeDiscountRecord::getOrderId, orderId) .eq(MkShopConsumeDiscountRecord::getOrderId, orderId)
.eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId())); .eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId()));
if (discountRecord != null) { if (discountRecord != null) {
if (discountRecord.getOrderId() == null) {
discountRecord.setOrderId(orderId);
updateById(discountRecord);
}
return discountRecord; return discountRecord;
} }
long count = orderInfoService.count(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId()) long count = orderInfoService.count(new QueryWrapper().eq(OrderInfo::getUserId, shopUser.getUserId())
@@ -129,6 +133,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
// 固定金额 // 固定金额
if (TableValueConstant.ConsumeDiscount.DiscountType.FIXED.getCode().equals(consumeDiscountVO.getDiscountType())) { if (TableValueConstant.ConsumeDiscount.DiscountType.FIXED.getCode().equals(consumeDiscountVO.getDiscountType())) {
shopConsumeDiscountRecord.setAmount(consumeDiscountVO.getDiscountAmount()); shopConsumeDiscountRecord.setAmount(consumeDiscountVO.getDiscountAmount());
save(shopConsumeDiscountRecord);
return shopConsumeDiscountRecord; return shopConsumeDiscountRecord;
} }