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

取消退款问题

Browse Source
This commit is contained in:
wangw
2025-12-11 17:45:37 +08:00
parent 105e683382
commit 15264625d6
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/order-server/src/main/java/com/czg/controller/admin/PointsGoodsRecordController.java
View File

@@ -80,7 +80,7 @@ public class PointsGoodsRecordController {
*/ */
@PostMapping("/rejectRefund") @PostMapping("/rejectRefund")
public CzgResult<Boolean> rejectRefund(@RequestBody @Validated PointGoodsRefundDTO param) { public CzgResult<Boolean> rejectRefund(@RequestBody @Validated PointGoodsRefundDTO param) {
return CzgResult.success(pointsGoodsService.cancelRefund(param, StpKit.USER.getLoginIdAsLong())); return CzgResult.success(pointsGoodsService.cancelRefund(param, null, StpKit.USER.getShopId()));
} }
} }

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

@@ -76,7 +76,7 @@ public class UPointGoodsController {
*/ */
@PostMapping("/cancelRefund") @PostMapping("/cancelRefund")
public CzgResult<Boolean> cancelRefund(@RequestBody @Validated PointGoodsRefundDTO param) { public CzgResult<Boolean> cancelRefund(@RequestBody @Validated PointGoodsRefundDTO param) {
return CzgResult.success(pointsGoodsService.cancelRefund(param, StpKit.USER.getLoginIdAsLong())); return CzgResult.success(pointsGoodsService.cancelRefund(param, StpKit.USER.getLoginIdAsLong(), null));
} }
/** /**

2
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java
View File

@@ -26,7 +26,7 @@ public interface MkPointsGoodsService extends IService<MkPointsGoods> {
//用户申请退款 //用户申请退款
boolean applyRefund(PointGoodsRefundDTO param, Long userId); boolean applyRefund(PointGoodsRefundDTO param, Long userId);
boolean cancelRefund(PointGoodsRefundDTO param, Long userId); boolean cancelRefund(PointGoodsRefundDTO param, Long userId, Long shopId);
/** /**
* 更新商品数量 * 更新商品数量

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

@@ -125,7 +125,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
} }
@Override @Override
public boolean cancelRefund(PointGoodsRefundDTO param, Long userId) { public boolean cancelRefund(PointGoodsRefundDTO param, Long userId, Long shopId) {
MkPointsGoodsRecord record1 = goodsRecordService.getById(param.getRecordId()); MkPointsGoodsRecord record1 = goodsRecordService.getById(param.getRecordId());
if (record1 == null) { if (record1 == null) {
throw new CzgException("取消失败，订单不存在"); throw new CzgException("取消失败，订单不存在");
@@ -146,6 +146,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
.eq(MkPointsGoodsRecord::getId, param.getRecordId()) .eq(MkPointsGoodsRecord::getId, param.getRecordId())
.eq(MkPointsGoodsRecord::getOrderNo, param.getOrderNo()) .eq(MkPointsGoodsRecord::getOrderNo, param.getOrderNo())
.eq(MkPointsGoodsRecord::getUserId, userId) .eq(MkPointsGoodsRecord::getUserId, userId)
.eq(MkPointsGoodsRecord::getShopId, shopId)
); );
} }