超级会员相关

cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java

@@ -1,11 +1,11 @@
 package com.czg.controller.admin;
 
-import com.czg.account.dto.MemberConfigDTO;
+import com.czg.market.dto.MemberConfigDTO;
-import com.czg.account.dto.MemberLevelDTO;
+import com.czg.market.dto.MemberLevelDTO;
-import com.czg.account.entity.MemberLevelConfig;
+import com.czg.market.entity.MemberLevelConfig;
-import com.czg.account.service.TbMemberConfigService;
+import com.czg.market.service.TbMemberConfigService;
-import com.czg.account.vo.MemberConfigVO;
+import com.czg.market.vo.MemberConfigVO;
-import com.czg.account.vo.MemberLevelVO;
+import com.czg.market.vo.MemberLevelVO;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import com.czg.validator.group.UpdateGroup;

cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java

@@ -1,6 +1,6 @@
-package com.czg.account.dto;
+package com.czg.market.dto;
 
-import com.czg.account.entity.ShopCoupon;
+import com.czg.market.entity.ShopCoupon;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.*;
 import lombok.AllArgsConstructor;

cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java

@@ -1,6 +1,6 @@
-package com.czg.account.dto;
+package com.czg.market.dto;
 
-import com.czg.account.entity.ShopCoupon;
+import com.czg.market.entity.ShopCoupon;
 import com.czg.validator.group.UpdateGroup;
 import com.czg.validator.group.member.MemberLevelCycleRewardGroup;
 import jakarta.validation.constraints.*;

cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberLevelConfig.java

@@ -1,4 +1,4 @@
-package com.czg.account.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/entity/TbMemberConfig.java

@@ -1,4 +1,4 @@
-package com.czg.account.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/MemberLevelConfigService.java

@@ -1,7 +1,7 @@
-package com.czg.account.service;
+package com.czg.market.service;
 
 import com.mybatisflex.core.service.IService;
-import com.czg.account.entity.MemberLevelConfig;
+import com.czg.market.entity.MemberLevelConfig;
 
 /**
  * 会员等级配置 服务层。

cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java

@@ -1,11 +1,11 @@
-package com.czg.account.service;
+package com.czg.market.service;
 
-import com.czg.account.dto.MemberConfigDTO;
+import com.czg.market.dto.MemberConfigDTO;
-import com.czg.account.dto.MemberLevelDTO;
+import com.czg.market.dto.MemberLevelDTO;
-import com.czg.account.vo.MemberConfigVO;
+import com.czg.market.vo.MemberConfigVO;
-import com.czg.account.vo.MemberLevelVO;
+import com.czg.market.vo.MemberLevelVO;
 import com.mybatisflex.core.service.IService;
-import com.czg.account.entity.TbMemberConfig;
+import com.czg.market.entity.TbMemberConfig;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberConfigVO.java

@@ -1,7 +1,6 @@
-package com.czg.account.vo;
+package com.czg.market.vo;
 
-import com.czg.account.dto.MemberConfigDTO;
+import com.czg.market.dto.MemberConfigDTO;
-import com.mybatisflex.annotation.Column;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.Min;

cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberLevelVO.java

@@ -1,18 +1,8 @@
-package com.czg.account.vo;
+package com.czg.market.vo;
 
-import com.czg.account.dto.MemberConfigDTO;
+import com.czg.market.entity.ShopCoupon;
-import com.czg.account.entity.ShopCoupon;
-import com.mybatisflex.annotation.Column;
-import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 

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

@@ -11,6 +11,7 @@ import com.czg.config.RedisCst;
 import com.czg.enums.ShopUserFlowBizEnum;
 import com.czg.enums.YesNoEnum;
 import com.czg.exception.ApiNotPrintException;
+import com.czg.market.service.TbMemberConfigService;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.service.OrderDetailService;
 import com.czg.order.service.OrderInfoService;

cash-service/market-service/src/main/java/com/czg/service/market/enums/OrderStatusEnums.java

@@ -0,0 +1,31 @@
+package com.czg.service.market.enums;
+
+
+import lombok.Getter;
+
+/**
+ * 订单状态枚举类
+ * @author ww
+ */
+@Getter
+public enum OrderStatusEnums {
+
+
+    UNPAID("unpaid", "待支付"),
+    IN_PRODUCTION("in_production", "制作中"),
+    WAIT_OUT("wait_out", "待取餐"),
+    DONE("done", "订单完成"),
+    REFUNDING("refunding", "申请退单"),
+    REFUND("refund", "退单"),
+    PART_REFUND("part_refund", "部分退单"),
+    CANCELLED("cancelled", "取消订单");
+
+
+    private final String code;
+    private final String msg;
+
+    OrderStatusEnums(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+}

cash-service/market-service/src/main/java/com/czg/service/market/mapper/TbMemberConfigMapper.java

@@ -1,7 +1,7 @@
-package com.czg.service.account.mapper;
+package com.czg.service.market.mapper;
 
 import com.mybatisflex.core.BaseMapper;
-import com.czg.account.entity.TbMemberConfig;
+import com.czg.market.entity.TbMemberConfig;
 
 /**
  * 会员基础配置 映射层。

cash-service/market-service/src/main/java/com/czg/service/market/mapper/TbMemberLevelConfigMapper.java

@@ -1,7 +1,7 @@
-package com.czg.service.account.mapper;
+package com.czg.service.market.mapper;
 
 import com.mybatisflex.core.BaseMapper;
-import com.czg.account.entity.MemberLevelConfig;
+import com.czg.market.entity.MemberLevelConfig;
 
 /**
  * 会员等级配置 映射层。

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java

@@ -1,31 +1,35 @@
-package com.czg.service.account.service.impl;
+package com.czg.service.market.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.czg.account.dto.MemberConfigDTO;
+import com.czg.market.dto.MemberConfigDTO;
-import com.czg.account.dto.MemberLevelDTO;
+import com.czg.market.dto.MemberLevelDTO;
 import com.czg.account.entity.*;
 import com.czg.account.service.*;
-import com.czg.account.vo.MemberConfigVO;
+import com.czg.market.vo.MemberConfigVO;
-import com.czg.account.vo.MemberLevelVO;
+import com.czg.market.vo.MemberLevelVO;
 import com.czg.exception.CzgException;
+import com.czg.market.entity.MemberLevelConfig;
+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.OrderInfo;
 import com.czg.order.entity.OrderPayment;
 import com.czg.order.service.OrderInfoService;
 import com.czg.order.service.OrderPaymentService;
-import com.czg.service.order.enums.OrderStatusEnums;
+import com.czg.service.market.enums.OrderStatusEnums;
+import com.czg.service.market.mapper.TbMemberConfigMapper;
 import com.czg.validator.ValidatorUtil;
 import com.czg.validator.group.member.MemberLevelCycleRewardGroup;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
-import com.czg.service.account.mapper.TbMemberConfigMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -46,9 +50,9 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
 
     @Resource
     private MemberLevelConfigService levelConfigService;
-    @Resource
+    @DubboReference
     private UserInfoService userInfoService;
-    @Resource
+    @DubboReference
     private ShopUserService shopUserService;
     @DubboReference
     private OrderInfoService orderInfoService;

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberLevelConfigServiceImpl.java

@@ -1,9 +1,9 @@
-package com.czg.service.account.service.impl;
+package com.czg.service.market.service.impl;
 
+import com.czg.service.market.mapper.TbMemberLevelConfigMapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
-import com.czg.account.entity.MemberLevelConfig;
+import com.czg.market.entity.MemberLevelConfig;
-import com.czg.account.service.MemberLevelConfigService;
+import com.czg.market.service.MemberLevelConfigService;
-import com.czg.service.account.mapper.TbMemberLevelConfigMapper;
 import org.springframework.stereotype.Service;
 
 /**

cash-service/market-service/src/main/resources/mapper/TbMemberConfigMapper.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.account.mapper.TbMemberConfigMapper">
+<mapper namespace="com.czg.service.market.mapper.TbMemberConfigMapper">
 
 </mapper>

cash-service/market-service/src/main/resources/mapper/TbMemberLevelConfigMapper.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.account.mapper.TbMemberLevelConfigMapper">
+<mapper namespace="com.czg.service.market.mapper.TbMemberLevelConfigMapper">
 
 </mapper>

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/MemberOrderServiceImpl.java

@@ -2,14 +2,14 @@ package com.czg.service.order.service.impl;
 
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson2.JSONObject;
-import com.czg.account.dto.MemberConfigDTO;
+import com.czg.market.dto.MemberConfigDTO;
 import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.UserInfo;
 import com.czg.account.service.ShopInfoService;
 import com.czg.account.service.ShopUserService;
-import com.czg.account.service.TbMemberConfigService;
+import com.czg.market.service.TbMemberConfigService;
 import com.czg.account.service.UserInfoService;
-import com.czg.account.vo.MemberConfigVO;
+import com.czg.market.vo.MemberConfigVO;
 import com.czg.exception.CzgException;
 import com.czg.order.dto.MemberOrderDTO;
 import com.czg.service.order.enums.OrderStatusEnums;