diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/PointsGoodsRecordController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/PointsGoodsRecordController.java index fb2371463..b30436e7a 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/PointsGoodsRecordController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/PointsGoodsRecordController.java @@ -80,7 +80,7 @@ public class PointsGoodsRecordController { */ @PostMapping("/rejectRefund") public CzgResult rejectRefund(@RequestBody @Validated PointGoodsRefundDTO param) { - return CzgResult.success(pointsGoodsService.cancelRefund(param, StpKit.USER.getLoginIdAsLong())); + return CzgResult.success(pointsGoodsService.cancelRefund(param, null, StpKit.USER.getShopId())); } } \ No newline at end of file diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java index e517838f6..9e4536dd7 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java @@ -76,7 +76,7 @@ public class UPointGoodsController { */ @PostMapping("/cancelRefund") public CzgResult cancelRefund(@RequestBody @Validated PointGoodsRefundDTO param) { - return CzgResult.success(pointsGoodsService.cancelRefund(param, StpKit.USER.getLoginIdAsLong())); + return CzgResult.success(pointsGoodsService.cancelRefund(param, StpKit.USER.getLoginIdAsLong(), null)); } /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java index aed9f65ce..4bf05dec2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java @@ -26,7 +26,7 @@ public interface MkPointsGoodsService extends IService { //用户申请退款 boolean applyRefund(PointGoodsRefundDTO param, Long userId); - boolean cancelRefund(PointGoodsRefundDTO param, Long userId); + boolean cancelRefund(PointGoodsRefundDTO param, Long userId, Long shopId); /** * 更新商品数量 diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java index ce68cbf8b..6f13dff56 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java @@ -125,7 +125,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl