diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/MemberController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java similarity index 92% rename from cash-api/account-server/src/main/java/com/czg/controller/admin/MemberController.java rename to cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java index 9ea8f3c48..c0c8db588 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/MemberController.java +++ b/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.account.dto.MemberLevelDTO; -import com.czg.account.entity.MemberLevelConfig; -import com.czg.account.service.TbMemberConfigService; -import com.czg.account.vo.MemberConfigVO; -import com.czg.account.vo.MemberLevelVO; +import com.czg.market.dto.MemberConfigDTO; +import com.czg.market.dto.MemberLevelDTO; +import com.czg.market.entity.MemberLevelConfig; +import com.czg.market.service.TbMemberConfigService; +import com.czg.market.vo.MemberConfigVO; +import com.czg.market.vo.MemberLevelVO; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import com.czg.validator.group.UpdateGroup; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/MemberConfigDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java similarity index 96% rename from cash-common/cash-common-service/src/main/java/com/czg/account/dto/MemberConfigDTO.java rename to cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java index 363affd94..6b0ca65ce 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/MemberConfigDTO.java +++ b/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; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/MemberLevelDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java similarity index 96% rename from cash-common/cash-common-service/src/main/java/com/czg/account/dto/MemberLevelDTO.java rename to cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java index 146fcf13d..031a298f2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/MemberLevelDTO.java +++ b/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.*; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MemberLevelConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberLevelConfig.java similarity index 98% rename from cash-common/cash-common-service/src/main/java/com/czg/account/entity/MemberLevelConfig.java rename to cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberLevelConfig.java index ef816819d..2162cd65f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MemberLevelConfig.java +++ b/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; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/TbMemberConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/TbMemberConfig.java similarity index 98% rename from cash-common/cash-common-service/src/main/java/com/czg/account/entity/TbMemberConfig.java rename to cash-common/cash-common-service/src/main/java/com/czg/market/entity/TbMemberConfig.java index 8417836af..8b6309a9d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/TbMemberConfig.java +++ b/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; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberLevelConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MemberLevelConfigService.java similarity index 72% rename from cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberLevelConfigService.java rename to cash-common/cash-common-service/src/main/java/com/czg/market/service/MemberLevelConfigService.java index 8df028362..e6119a94d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberLevelConfigService.java +++ b/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; /** * 会员等级配置 服务层。 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/TbMemberConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java similarity index 79% rename from cash-common/cash-common-service/src/main/java/com/czg/account/service/TbMemberConfigService.java rename to cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java index 8cadd6da9..2ca6abd13 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/TbMemberConfigService.java +++ b/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.account.dto.MemberLevelDTO; -import com.czg.account.vo.MemberConfigVO; -import com.czg.account.vo.MemberLevelVO; +import com.czg.market.dto.MemberConfigDTO; +import com.czg.market.dto.MemberLevelDTO; +import com.czg.market.vo.MemberConfigVO; +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; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/MemberConfigVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberConfigVO.java similarity index 93% rename from cash-common/cash-common-service/src/main/java/com/czg/account/vo/MemberConfigVO.java rename to cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberConfigVO.java index d2ba2aac3..89597bca6 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/MemberConfigVO.java +++ b/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.mybatisflex.annotation.Column; +import com.czg.market.dto.MemberConfigDTO; import jakarta.validation.Valid; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.Min; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/MemberLevelVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberLevelVO.java similarity index 69% rename from cash-common/cash-common-service/src/main/java/com/czg/account/vo/MemberLevelVO.java rename to cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberLevelVO.java index a21369e87..51214456f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/MemberLevelVO.java +++ b/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.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 com.czg.market.entity.ShopCoupon; import lombok.Data; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; 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 2f8462852..de9fcf609 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 @@ -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; diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/enums/OrderStatusEnums.java b/cash-service/market-service/src/main/java/com/czg/service/market/enums/OrderStatusEnums.java new file mode 100644 index 000000000..bf2bbd51c --- /dev/null +++ b/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; + } +} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/TbMemberConfigMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/TbMemberConfigMapper.java similarity index 70% rename from cash-service/account-service/src/main/java/com/czg/service/account/mapper/TbMemberConfigMapper.java rename to cash-service/market-service/src/main/java/com/czg/service/market/mapper/TbMemberConfigMapper.java index 872ec7a84..4eba2b572 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/TbMemberConfigMapper.java +++ b/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; /** * 会员基础配置 映射层。 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/TbMemberLevelConfigMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/TbMemberLevelConfigMapper.java similarity index 70% rename from cash-service/account-service/src/main/java/com/czg/service/account/mapper/TbMemberLevelConfigMapper.java rename to cash-service/market-service/src/main/java/com/czg/service/market/mapper/TbMemberLevelConfigMapper.java index f2f224a26..01c405a13 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/TbMemberLevelConfigMapper.java +++ b/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; /** * 会员等级配置 映射层。 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java similarity index 95% rename from cash-service/account-service/src/main/java/com/czg/service/account/service/impl/TbMemberConfigServiceImpl.java rename to cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java index 45cdb0029..f3a973d61 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/TbMemberConfigServiceImpl.java +++ b/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.account.dto.MemberLevelDTO; +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.account.vo.MemberConfigVO; -import com.czg.account.vo.MemberLevelVO; +import com.czg.market.vo.MemberConfigVO; +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 - + diff --git a/cash-service/account-service/src/main/resources/mapper/TbMemberLevelConfigMapper.xml b/cash-service/market-service/src/main/resources/mapper/TbMemberLevelConfigMapper.xml similarity index 69% rename from cash-service/account-service/src/main/resources/mapper/TbMemberLevelConfigMapper.xml rename to cash-service/market-service/src/main/resources/mapper/TbMemberLevelConfigMapper.xml index e26df2460..ecb5a7cbe 100644 --- a/cash-service/account-service/src/main/resources/mapper/TbMemberLevelConfigMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/TbMemberLevelConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/MemberOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/MemberOrderServiceImpl.java index f622ac3cb..4a9957d8e 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/MemberOrderServiceImpl.java +++ b/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;