From 31678fa6f11c9af24c579e140dc4f3d45131848a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 12 Sep 2025 09:21:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E4=BC=9A=E5=91=98=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/controller/admin/MemberController.java | 2 +- .../czg/controller/user/UserOrderController.java | 6 +++--- .../czg/{order => market}/dto/MemberOrderDTO.java | 5 +---- .../czg/{order => market}/entity/MemberOrder.java | 2 +- .../service/MemberOrderService.java | 6 +++--- .../account/service/impl/ShopUserServiceImpl.java | 2 +- .../service/market}/mapper/MemberOrderMapper.java | 4 ++-- .../service/impl/MemberOrderServiceImpl.java | 15 ++++++++------- .../service/impl/TbMemberConfigServiceImpl.java | 6 +++++- .../main/resources/mapper/MemberOrderMapper.xml | 2 +- .../order/service/impl/OrderInfoServiceImpl.java | 3 +-- .../order/service/impl/PayServiceImpl.java | 3 ++- 12 files changed, 29 insertions(+), 27 deletions(-) rename cash-common/cash-common-service/src/main/java/com/czg/{order => market}/dto/MemberOrderDTO.java (86%) rename cash-common/cash-common-service/src/main/java/com/czg/{order => market}/entity/MemberOrder.java (98%) rename cash-common/cash-common-service/src/main/java/com/czg/{order => market}/service/MemberOrderService.java (69%) rename cash-service/{order-service/src/main/java/com/czg/service/order => market-service/src/main/java/com/czg/service/market}/mapper/MemberOrderMapper.java (70%) rename cash-service/{order-service/src/main/java/com/czg/service/order => market-service/src/main/java/com/czg/service/market}/service/impl/MemberOrderServiceImpl.java (89%) rename cash-service/{order-service => market-service}/src/main/resources/mapper/MemberOrderMapper.xml (71%) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java index c0c8db588..18974a592 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java @@ -75,7 +75,7 @@ public class MemberController { // @SaAdminCheckPermission(value = "member:edit", name = "会员配置列表") @DeleteMapping("/level/{id}") public CzgResult deleteLevel(@PathVariable Long id) { - return CzgResult.success(memberConfigService.remove(new QueryWrapper().eq(MemberLevelDTO::getId, id).eq(MemberLevelConfig::getShopId, StpKit.USER.getShopId()))); + return CzgResult.success(memberConfigService.remove(new QueryWrapper().eq(MemberLevelConfig::getId, id).eq(MemberLevelConfig::getShopId, StpKit.USER.getShopId()))); } /** diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java index 048bfb016..718315415 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java @@ -2,13 +2,13 @@ package com.czg.controller.user; import com.czg.annotation.Debounce; import com.czg.exception.CzgException; -import com.czg.order.dto.MemberOrderDTO; +import com.czg.market.dto.MemberOrderDTO; import com.czg.order.dto.OrderCannelDTO; import com.czg.order.dto.OrderInfoAddDTO; import com.czg.order.dto.OrderInfoQueryDTO; -import com.czg.order.entity.MemberOrder; +import com.czg.market.entity.MemberOrder; import com.czg.order.entity.OrderInfo; -import com.czg.order.service.MemberOrderService; +import com.czg.market.service.MemberOrderService; import com.czg.order.service.OrderInfoService; import com.czg.order.vo.HistoryOrderVo; import com.czg.order.vo.OrderInfoVo; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MemberOrderDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberOrderDTO.java similarity index 86% rename from cash-common/cash-common-service/src/main/java/com/czg/order/dto/MemberOrderDTO.java rename to cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberOrderDTO.java index 2602a4a60..56fb09c4d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MemberOrderDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberOrderDTO.java @@ -1,10 +1,7 @@ -package com.czg.order.dto; +package com.czg.market.dto; import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import com.alibaba.fastjson2.annotation.JSONField; import java.io.Serial; import jakarta.validation.constraints.NotBlank; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/MemberOrder.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberOrder.java similarity index 98% rename from cash-common/cash-common-service/src/main/java/com/czg/order/entity/MemberOrder.java rename to cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberOrder.java index e5068ac33..cbf56269b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/MemberOrder.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberOrder.java @@ -1,4 +1,4 @@ -package com.czg.order.entity; +package com.czg.market.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/MemberOrderService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MemberOrderService.java similarity index 69% rename from cash-common/cash-common-service/src/main/java/com/czg/order/service/MemberOrderService.java rename to cash-common/cash-common-service/src/main/java/com/czg/market/service/MemberOrderService.java index 5d82c355d..c678dc0cf 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/MemberOrderService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MemberOrderService.java @@ -1,8 +1,8 @@ -package com.czg.order.service; +package com.czg.market.service; -import com.czg.order.dto.MemberOrderDTO; +import com.czg.market.dto.MemberOrderDTO; import com.mybatisflex.core.service.IService; -import com.czg.order.entity.MemberOrder; +import com.czg.market.entity.MemberOrder; /** * 会员充值订单 服务层。 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java index de9fcf609..a5726605c 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java @@ -312,7 +312,7 @@ public class ShopUserServiceImpl extends ServiceImpl i shopUser.setShopId(null); } - memberConfigService.joinMember(shopId, userId); + memberConfigService.joinMember(shopId, userId, null); return saveOrUpdate(shopUser); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/MemberOrderMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MemberOrderMapper.java similarity index 70% rename from cash-service/order-service/src/main/java/com/czg/service/order/mapper/MemberOrderMapper.java rename to cash-service/market-service/src/main/java/com/czg/service/market/mapper/MemberOrderMapper.java index 35b64ef81..25ef1db45 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/MemberOrderMapper.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MemberOrderMapper.java @@ -1,7 +1,7 @@ -package com.czg.service.order.mapper; +package com.czg.service.market.mapper; import com.mybatisflex.core.BaseMapper; -import com.czg.order.entity.MemberOrder; +import com.czg.market.entity.MemberOrder; /** * 会员充值订单 映射层。 diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/MemberOrderServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java similarity index 89% rename from cash-service/order-service/src/main/java/com/czg/service/order/service/impl/MemberOrderServiceImpl.java rename to cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java index 4a9957d8e..9fc70c0b6 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/MemberOrderServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java @@ -1,4 +1,4 @@ -package com.czg.service.order.service.impl; +package com.czg.service.market.service.impl; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson2.JSONObject; @@ -11,14 +11,15 @@ import com.czg.market.service.TbMemberConfigService; import com.czg.account.service.UserInfoService; import com.czg.market.vo.MemberConfigVO; import com.czg.exception.CzgException; -import com.czg.order.dto.MemberOrderDTO; -import com.czg.service.order.enums.OrderStatusEnums; +import com.czg.market.dto.MemberOrderDTO; +import com.czg.service.market.enums.OrderStatusEnums; +import com.czg.service.market.mapper.MemberOrderMapper; import com.czg.utils.AssertUtil; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.order.entity.MemberOrder; -import com.czg.order.service.MemberOrderService; -import com.czg.service.order.mapper.MemberOrderMapper; +import com.czg.market.entity.MemberOrder; +import com.czg.market.service.MemberOrderService; import org.apache.dubbo.config.annotation.DubboReference; +import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -29,7 +30,7 @@ import java.math.BigDecimal; * @author zs * @since 2025-09-11 */ -@Service +@DubboService public class MemberOrderServiceImpl extends ServiceImpl implements MemberOrderService { @DubboReference private ShopInfoService shopInfoService; diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java index 09f29400c..ac680ecae 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java @@ -9,6 +9,8 @@ import com.czg.market.dto.MemberConfigDTO; import com.czg.market.dto.MemberLevelDTO; import com.czg.account.entity.*; import com.czg.account.service.*; +import com.czg.market.entity.MemberOrder; +import com.czg.market.service.MemberOrderService; import com.czg.market.vo.MemberConfigVO; import com.czg.market.vo.MemberLevelVO; import com.czg.exception.CzgException; @@ -17,7 +19,6 @@ import com.czg.market.entity.ShopCoupon; import com.czg.market.entity.TbMemberConfig; import com.czg.market.service.MemberLevelConfigService; import com.czg.market.service.TbMemberConfigService; -import com.czg.order.entity.MemberOrder; import com.czg.order.entity.OrderInfo; import com.czg.order.entity.OrderPayment; import com.czg.order.service.OrderInfoService; @@ -61,6 +62,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl - + diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 7d1c7881c..462819f69 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -21,6 +21,7 @@ import com.czg.enums.ShopUserFlowBizEnum; import com.czg.exception.ApiNotPrintException; import com.czg.exception.CzgException; import com.czg.exception.OrderCancelException; +import com.czg.market.service.MemberOrderService; import com.czg.market.service.TbMemberConfigService; import com.czg.order.dto.*; import com.czg.order.entity.*; @@ -61,8 +62,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static org.apache.dubbo.registry.zookeeper.util.CuratorFrameworkParams.MAX_RETRIES; - /** * 订单表 服务层实现。 * diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index e35aaf1f7..8a7ab6235 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -17,10 +17,11 @@ import com.czg.entity.resp.*; import com.czg.enums.ShopUserFlowBizEnum; import com.czg.exception.CzgException; import com.czg.exception.PaySuccessException; +import com.czg.market.service.MemberOrderService; import com.czg.order.dto.BigDecimalDTO; import com.czg.order.dto.CheckOrderPay; import com.czg.order.dto.OrderInfoRefundDTO; -import com.czg.order.entity.MemberOrder; +import com.czg.market.entity.MemberOrder; import com.czg.order.entity.OrderDetail; import com.czg.order.entity.OrderInfo; import com.czg.order.entity.OrderPayment;