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/MkPointsConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsConfigServiceImpl.java index a12af81d2..16c63cdb8 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsConfigServiceImpl.java @@ -59,6 +59,9 @@ public class MkPointsConfigServiceImpl extends ServiceImpl pages = pageAs( Page.of(param.getPage(), param.getSize()) , query().eq(MkPointsGoodsRecord::getShopId, param.getShopId()) + .between(MkPointsGoodsRecord::getCreateTime, param.getStartTime(), param.getEndTime()) .eq(MkPointsGoodsRecord::getShopUserId, param.getShopUserId()) .eq(MkPointsGoodsRecord::getStatus, param.getStatus()) + .eq(MkPointsGoodsRecord::getIsDel, 0) .like(MkPointsGoodsRecord::getPointsGoodsName, param.getPointsGoodsName()) .like(MkPointsGoodsRecord::getGoodsCategory, param.getGoodsCategory()) , MkPointsGoodsRecordDTO.class); @@ -61,6 +63,7 @@ public class MkPointsGoodsRecordServiceImpl extends ServiceImpl 0 ? "积分到账" : "积分扣除") .setContent(StrUtil.format("{}提醒:{} 积分已成功{},积分可用于兑换好物、抵扣消费,快来解锁权益!", points > 0 ? "积分到账" : "积分扣除", - points, + Math.abs(points), points > 0 ? "存储你的账户" : "使用")); acUserMsgService.addUserMsg(msg); return record.getId();