From 9cbe81df411d8fcbef24077d55c15da1792bf3d0 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 11 Dec 2025 17:15:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E8=B5=A0=E9=80=81?= =?UTF-8?q?=E7=A7=AF=E5=88=86=200=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/market/service/impl/MkPointsConfigServiceImpl.java | 3 +++ .../service/market/service/impl/MkPointsUserServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) 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 Date: Thu, 11 Dec 2025 17:18:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=95=B0=E5=80=BC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/market/service/impl/MkPointsUserServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java index aa3ca39fe..84f6e8296 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java @@ -22,7 +22,6 @@ import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.stereotype.Service; import java.util.List; @@ -165,7 +164,7 @@ public class MkPointsUserServiceImpl extends ServiceImpl 0 ? "积分到账" : "积分扣除") .setContent(StrUtil.format("{}提醒：{} 积分已成功{}，积分可用于兑换好物、抵扣消费，快来解锁权益！", points > 0 ? "积分到账" : "积分扣除", - points, + Math.abs(points), points > 0 ? "存储你的账户" : "使用")); acUserMsgService.addUserMsg(msg); return record.getId(); From 105e6833820ee8833679bdcbba1277872812f403 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 11 Dec 2025 17:37:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98=20=E4=B8=8D?= =?UTF-8?q?=E5=81=9A=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkPointsGoodsRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java index ddee88991..a1fcdbdc2 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java @@ -41,6 +41,7 @@ public class MkPointsGoodsRecordServiceImpl extends ServiceImpl Date: Thu, 11 Dec 2025 17:45:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/admin/PointsGoodsRecordController.java | 2 +- .../java/com/czg/controller/user/UPointGoodsController.java | 2 +- .../main/java/com/czg/market/service/MkPointsGoodsService.java | 2 +- .../service/market/service/impl/MkPointsGoodsServiceImpl.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) 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 Date: Thu, 11 Dec 2025 17:50:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkPointsGoodsRecordServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java index a1fcdbdc2..cf83afdbb 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java @@ -39,6 +39,7 @@ public class MkPointsGoodsRecordServiceImpl 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) @@ -62,6 +63,7 @@ public class MkPointsGoodsRecordServiceImpl extends ServiceImpl