超级会员相关

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<Boolean> 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())));
     }
 
     /**

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;

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;

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;

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;
 
 /**
  * 会员充值订单 服务层。

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java

@@ -312,7 +312,7 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
             shopUser.setShopId(null);
         }
 
-        memberConfigService.joinMember(shopId, userId);
+        memberConfigService.joinMember(shopId, userId, null);
         return saveOrUpdate(shopUser);
     }
 

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;
 
 /**
  * 会员充值订单 映射层。

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.market.dto.MemberOrderDTO;
-import com.czg.service.order.enums.OrderStatusEnums;
+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.market.entity.MemberOrder;
-import com.czg.order.service.MemberOrderService;
+import com.czg.market.service.MemberOrderService;
-import com.czg.service.order.mapper.MemberOrderMapper;
 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<MemberOrderMapper, MemberOrder> implements MemberOrderService {
     @DubboReference
     private ShopInfoService shopInfoService;

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<TbMemberConfigMapper,
     private OrderPaymentService orderPaymentService;
     @DubboReference
     private MemberPointsService memberPointsService;
+    @Resource
+    private MemberOrderService memberOrderService;
 
     @Override
     public MemberConfigVO detail(Long shopId) {
@@ -249,6 +252,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
         boolean canOpen = false;
         // 购买开通
         if (memberOrderId != null) {
+            MemberOrder memberOrder = memberOrderService.getOne(new QueryWrapper().eq(MemberOrder::getId, memberOrderId).eq(MemberOrder::getShopId, shopId));
 //            MemberOrder memberOrder = memberOrderService.getOne(new QueryWrapper().eq(MemberOrder::getId, payment.getRelatedId()));
 //            if (memberOrder == null) {
 //                log.warn("会员购买支付失败，会员订单不存在，会员订单id：{}", payment.getRelatedId());

cash-service/market-service/src/main/resources/mapper/MemberOrderMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.czg.service.order.mapper.MemberOrderMapper">
+<mapper namespace="com.czg.service.market.mapper.MemberOrderMapper">
 
 </mapper>

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;
-
 /**
  * 订单表 服务层实现。
  *

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;