模块隔离优化

buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java

@@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dto.MemberEditDTO;
 import cn.lili.modules.member.service.MemberService;
 import cn.lili.modules.system.sms.SmsUtil;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

buyer-api/src/main/java/cn/lili/controller/system/MemberMessageBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.member;
+package cn.lili.controller.system;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;

buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java

@@ -2,16 +2,16 @@ package cn.lili.controller.trade;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
-import cn.lili.modules.order.order.entity.dos.AfterSaleReason;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
-import cn.lili.modules.order.order.entity.dto.AfterSaleDTO;
+import cn.lili.modules.order.aftersale.entity.dto.AfterSaleDTO;
-import cn.lili.modules.order.order.entity.vo.AfterSaleApplyVO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleApplyVO;
-import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
-import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
-import cn.lili.modules.order.order.service.AfterSaleLogService;
+import cn.lili.modules.order.aftersale.service.AfterSaleLogService;
-import cn.lili.modules.order.order.service.AfterSaleReasonService;
+import cn.lili.modules.order.aftersale.service.AfterSaleReasonService;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
-import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleLog;
 import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
 import cn.lili.common.security.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;

buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java

@@ -2,8 +2,8 @@ package cn.lili.controller.trade;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
+import cn.lili.modules.wallet.entity.dos.Recharge;
-import cn.lili.modules.order.trade.service.RechargeService;
+import cn.lili.modules.wallet.service.RechargeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java

@@ -5,8 +5,8 @@ import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.trade.entity.dos.WalletLog;
+import cn.lili.modules.wallet.entity.dos.WalletLog;
-import cn.lili.modules.order.trade.service.WalletLogService;
+import cn.lili.modules.wallet.service.WalletLogService;
 import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

buyer-api/src/main/java/cn/lili/controller/wallet/MemberWalletBuyerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.member;
+package cn.lili.controller.wallet;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
@@ -7,11 +7,11 @@ import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.Member;
-import cn.lili.modules.member.entity.dos.MemberWallet;
+import cn.lili.modules.wallet.entity.dos.MemberWallet;
-import cn.lili.modules.member.entity.vo.MemberWalletVO;
+import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
 import cn.lili.modules.member.service.MemberService;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWalletService;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;

buyer-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyBuyerController.java

@@ -1,13 +1,13 @@
-package cn.lili.controller.member;
+package cn.lili.controller.wallet;
 
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.vo.MemberWithdrawApplyQueryVO;
+import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
-import cn.lili.modules.member.service.MemberWithdrawApplyService;
+import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

buyer-api/src/main/java/cn/lili/controller/wallet/RechargeBuyerController.java

@@ -1,12 +1,12 @@
-package cn.lili.controller.member;
+package cn.lili.controller.wallet;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
+import cn.lili.modules.wallet.entity.dos.Recharge;
 import cn.lili.modules.order.trade.entity.vo.RechargeQueryVO;
-import cn.lili.modules.order.trade.service.RechargeService;
+import cn.lili.modules.wallet.service.RechargeService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

common-api/src/main/java/cn/lili/controller/common/SliderImageController.java

@@ -3,7 +3,7 @@ package cn.lili.controller.common;
 import cn.lili.cache.limit.annotation.LimitPoint;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

common-api/src/main/java/cn/lili/controller/common/SmsController.java

@@ -5,7 +5,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.system.sms.SmsUtil;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

consumer/src/main/java/cn/lili/event/AfterSaleStatusChangeEvent.java

@@ -1,7 +1,7 @@
 package cn.lili.event;
 
 
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 
 /**
  * 售后单改变状态

consumer/src/main/java/cn/lili/event/MemberWithdrawalEvent.java

@@ -1,6 +1,6 @@
 package cn.lili.event;
 
-import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
+import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
 
 /**
  * 会员提现消息

consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java

@@ -7,7 +7,7 @@ import cn.lili.modules.distribution.entity.dos.DistributionOrder;
 import cn.lili.modules.distribution.entity.enums.DistributionOrderStatusEnum;
 import cn.lili.modules.distribution.mapper.DistributionOrderMapper;
 import cn.lili.modules.distribution.service.DistributionOrderService;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dto.OrderMessage;
 import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum;
 import cn.lili.timetask.handler.EveryDayExecute;

consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java

@@ -1,7 +1,6 @@
 package cn.lili.event.impl;
 
 
-import cn.hutool.core.convert.Convert;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.event.AfterSaleStatusChangeEvent;
@@ -12,11 +11,10 @@ import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dos.MemberEvaluation;
 import cn.lili.modules.member.entity.enums.PointTypeEnum;
 import cn.lili.modules.member.service.MemberService;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dos.Order;
 import cn.lili.modules.order.order.entity.dto.OrderMessage;
 import cn.lili.modules.order.order.entity.enums.OrderPromotionTypeEnum;
-import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum;

consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java

@@ -3,8 +3,7 @@ package cn.lili.event.impl;
 
 import cn.lili.event.MemberRegisterEvent;
 import cn.lili.modules.member.entity.dos.Member;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWalletService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java

@@ -2,16 +2,16 @@ package cn.lili.event.impl;
 
 import cn.lili.event.*;
 import cn.lili.modules.member.entity.dto.MemberPointMessage;
-import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
+import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
-import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
+import cn.lili.modules.wallet.entity.enums.MemberWithdrawalDestinationEnum;
 import cn.lili.modules.member.entity.enums.PointTypeEnum;
-import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
+import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
 import cn.lili.modules.message.entity.dto.NoticeMessageDTO;
 import cn.lili.modules.message.entity.enums.NoticeMessageNodeEnum;
 import cn.lili.modules.message.entity.enums.NoticeMessageParameterEnum;
 import cn.lili.modules.message.service.NoticeMessageService;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dto.OrderMessage;
 import cn.lili.modules.order.order.entity.enums.OrderPromotionTypeEnum;
 import cn.lili.modules.order.order.entity.vo.OrderDetailVO;

consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java

@@ -3,7 +3,7 @@ package cn.lili.listener;
 import cn.hutool.json.JSONUtil;
 import cn.lili.rocketmq.tags.AfterSaleTagsEnum;
 import cn.lili.event.AfterSaleStatusChangeEvent;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;

consumer/src/main/java/cn/lili/listener/MemberMessageListener.java

@@ -8,7 +8,7 @@ import cn.lili.event.MemberWithdrawalEvent;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dos.MemberSign;
 import cn.lili.modules.member.entity.dto.MemberPointMessage;
-import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
+import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
 import cn.lili.modules.member.service.MemberSignService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.common.message.MessageExt;

consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java

@@ -15,7 +15,7 @@ import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum;
 import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum;
 import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
 import cn.lili.modules.order.order.mapper.OrderItemMapper;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
 import cn.lili.modules.order.order.service.OrderItemService;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.system.entity.dos.Setting;

consumer/src/main/java/cn/lili/timetask/handler/impl/order/RechargeOrderTaskExecute.java

@@ -4,8 +4,8 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
+import cn.lili.modules.wallet.entity.dos.Recharge;
-import cn.lili.modules.order.trade.service.RechargeService;
+import cn.lili.modules.wallet.service.RechargeService;
 import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.dto.OrderSetting;
 import cn.lili.modules.system.entity.enums.SettingEnum;

framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.distribution.entity.dos;
 
-import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
+import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java

@@ -2,7 +2,7 @@ package cn.lili.modules.distribution.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
+import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.common.utils.CurrencyUtil;
@@ -17,10 +17,10 @@ import cn.lili.modules.distribution.entity.vos.DistributionCashSearchParams;
 import cn.lili.modules.distribution.mapper.DistributionCashMapper;
 import cn.lili.modules.distribution.service.DistributionCashService;
 import cn.lili.modules.distribution.service.DistributionService;
-import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
+import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
-import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
+import cn.lili.modules.wallet.entity.enums.MemberWithdrawalDestinationEnum;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWalletService;
-import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

framework/src/main/java/cn/lili/modules/order/aftersale/aop/AfterSaleLogPoint.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.aop;
+package cn.lili.modules.order.aftersale.aop;
 
 import java.lang.annotation.*;
 

framework/src/main/java/cn/lili/modules/order/aftersale/aop/AfterSaleOperationLogAspect.java

@@ -1,12 +1,12 @@
-package cn.lili.modules.order.order.aop;
+package cn.lili.modules.order.aftersale.aop;
 
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.SpelUtil;
 import cn.lili.common.utils.ThreadPoolUtil;
-import cn.lili.modules.order.order.service.AfterSaleLogService;
+import cn.lili.modules.order.aftersale.service.AfterSaleLogService;
-import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleLog;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -32,7 +32,7 @@ public class AfterSaleOperationLogAspect {
     @Autowired
     private AfterSaleLogService afterSaleLogService;
 
-    @AfterReturning(returning = "rvt", pointcut = "@annotation(cn.lili.modules.order.order.aop.AfterSaleLogPoint)")
+    @AfterReturning(returning = "rvt", pointcut = "@annotation(cn.lili.modules.order.aftersale.aop.AfterSaleLogPoint)")
     public void afterReturning(JoinPoint joinPoint, Object rvt) {
         try {
             AuthUser auth = UserContext.getCurrentUser();

framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSale.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.dos;
+package cn.lili.modules.order.aftersale.entity.dos;
 
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSaleLog.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.trade.entity.dos;
+package cn.lili.modules.order.aftersale.entity.dos;
 
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.mybatis.BaseIdEntity;

framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSaleReason.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.dos;
+package cn.lili.modules.order.aftersale.entity.dos;
 
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/order/aftersale/entity/dto/AfterSaleDTO.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.dto;
+package cn.lili.modules.order.aftersale.entity.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

framework/src/main/java/cn/lili/modules/order/aftersale/entity/dto/AfterSalePriceDetailDTO.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.dto;
+package cn.lili.modules.order.aftersale.entity.dto;
 
 
 import cn.lili.modules.promotion.entity.dto.BasePromotion;

framework/src/main/java/cn/lili/modules/order/aftersale/entity/enums/ComplaintStatusEnum.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.enums;
+package cn.lili.modules.order.aftersale.entity.enums;
 
 /**
  * 交易投诉状态

framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleAllowOperation.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.order.order.entity.vo;
+package cn.lili.modules.order.aftersale.entity.vo;
 
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleApplyVO.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.vo;
+package cn.lili.modules.order.aftersale.entity.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.entity.vo;
+package cn.lili.modules.order.aftersale.entity.vo;
 
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;

framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleVO.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.order.order.entity.vo;
+package cn.lili.modules.order.aftersale.entity.vo;
 
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import jdk.nashorn.internal.objects.annotations.Getter;
 import lombok.Data;
 

framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleLogMapper.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.order.trade.mapper;
+package cn.lili.modules.order.aftersale.mapper;
 
-import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleMapper.java

@@ -1,7 +1,7 @@
-package cn.lili.modules.order.order.mapper;
+package cn.lili.modules.order.aftersale.mapper;
 
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
-import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleReasonMapper.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.order.order.mapper;
+package cn.lili.modules.order.aftersale.mapper;
 
-import cn.lili.modules.order.order.entity.dos.AfterSaleReason;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleLogService.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.order.order.service;
+package cn.lili.modules.order.aftersale.service;
 
-import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleReasonService.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.order.order.service;
+package cn.lili.modules.order.aftersale.service;
 
-import cn.lili.modules.order.order.entity.dos.AfterSaleReason;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleService.java

@@ -1,12 +1,12 @@
-package cn.lili.modules.order.order.service;
+package cn.lili.modules.order.aftersale.service;
 
 
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
-import cn.lili.modules.order.order.entity.dto.AfterSaleDTO;
+import cn.lili.modules.order.aftersale.entity.dto.AfterSaleDTO;
-import cn.lili.modules.order.order.entity.vo.AfterSaleApplyVO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleApplyVO;
-import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
-import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
 import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
 import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
 import cn.lili.modules.system.entity.vo.Traces;

framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleLogServiceImpl.java

@@ -1,8 +1,8 @@
-package cn.lili.modules.order.order.serviceimpl;
+package cn.lili.modules.order.aftersale.serviceimpl;
 
-import cn.lili.modules.order.order.service.AfterSaleLogService;
+import cn.lili.modules.order.aftersale.service.AfterSaleLogService;
-import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleLog;
-import cn.lili.modules.order.trade.mapper.AfterSaleLogMapper;
+import cn.lili.modules.order.aftersale.mapper.AfterSaleLogMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleReasonServiceImpl.java

@@ -1,8 +1,8 @@
-package cn.lili.modules.order.order.serviceimpl;
+package cn.lili.modules.order.aftersale.serviceimpl;
 
-import cn.lili.modules.order.order.entity.dos.AfterSaleReason;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
-import cn.lili.modules.order.order.mapper.AfterSaleReasonMapper;
+import cn.lili.modules.order.aftersale.mapper.AfterSaleReasonMapper;
-import cn.lili.modules.order.order.service.AfterSaleReasonService;
+import cn.lili.modules.order.aftersale.service.AfterSaleReasonService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.order.serviceimpl;
+package cn.lili.modules.order.aftersale.serviceimpl;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.NumberUtil;
@@ -13,20 +13,20 @@ import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.order.aop.AfterSaleLogPoint;
+import cn.lili.modules.order.aftersale.aop.AfterSaleLogPoint;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dos.Order;
 import cn.lili.modules.order.order.entity.dos.OrderItem;
-import cn.lili.modules.order.order.entity.dto.AfterSaleDTO;
+import cn.lili.modules.order.aftersale.entity.dto.AfterSaleDTO;
 import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum;
 import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
 import cn.lili.modules.order.order.entity.enums.OrderTypeEnum;
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
-import cn.lili.modules.order.order.entity.vo.AfterSaleApplyVO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleApplyVO;
-import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
-import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
-import cn.lili.modules.order.order.mapper.AfterSaleMapper;
+import cn.lili.modules.order.aftersale.mapper.AfterSaleMapper;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
 import cn.lili.modules.order.order.service.OrderItemService;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.order.trade.entity.enums.AfterSaleRefundWayEnum;

framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.modules.order.order.entity.enums.ComplaintStatusEnum;
+import cn.lili.modules.order.aftersale.entity.enums.ComplaintStatusEnum;
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java

@@ -2,7 +2,7 @@ package cn.lili.modules.order.order.entity.vo;
 
 import cn.hutool.core.util.StrUtil;
 import cn.lili.modules.order.order.entity.dos.OrderComplaint;
-import cn.lili.modules.order.order.entity.enums.ComplaintStatusEnum;
+import cn.lili.modules.order.aftersale.entity.enums.ComplaintStatusEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.order.order.service;
 
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dos.StoreFlow;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java

@@ -15,7 +15,7 @@ import cn.lili.modules.order.order.entity.dos.OrderComplaint;
 import cn.lili.modules.order.order.entity.dos.OrderComplaintCommunication;
 import cn.lili.modules.order.order.entity.dos.OrderItem;
 import cn.lili.modules.order.order.entity.dto.OrderComplaintDTO;
-import cn.lili.modules.order.order.entity.enums.ComplaintStatusEnum;
+import cn.lili.modules.order.aftersale.entity.enums.ComplaintStatusEnum;
 import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum;
 import cn.lili.modules.order.order.entity.vo.*;
 import cn.lili.modules.order.order.mapper.OrderComplaintMapper;

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java

@@ -2,7 +2,7 @@ package cn.lili.modules.order.order.serviceimpl;
 
 import cn.lili.common.utils.*;
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dos.Order;
 import cn.lili.modules.order.order.entity.dos.OrderItem;
 import cn.lili.modules.order.order.entity.dos.StoreFlow;

framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java

@@ -7,7 +7,7 @@ import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.SpringContextUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.enums.ClientTypeEnum;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWalletService;
 import cn.lili.modules.payment.kit.dto.PayParam;
 import cn.lili.modules.payment.entity.enums.PaymentClientEnum;
 import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;

framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java

@@ -2,9 +2,9 @@ package cn.lili.modules.payment.kit;
 
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.SpringContextUtil;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dos.Order;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.order.order.service.StoreFlowService;
 import cn.lili.modules.payment.entity.RefundLog;

framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java

@@ -4,8 +4,8 @@ import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
+import cn.lili.modules.wallet.entity.dos.Recharge;
-import cn.lili.modules.order.trade.service.RechargeService;
+import cn.lili.modules.wallet.service.RechargeService;
 import cn.lili.modules.payment.kit.dto.PayParam;
 import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
 import cn.lili.modules.payment.entity.enums.CashierEnum;

framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java

@@ -5,8 +5,8 @@ import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWalletService;
-import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
 import cn.lili.modules.payment.entity.RefundLog;
 import cn.lili.modules.payment.kit.CashierSupport;
 import cn.lili.modules.payment.kit.Payment;

framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java

@@ -12,7 +12,7 @@ import cn.lili.modules.goods.service.GoodsService;
 import cn.lili.modules.member.service.MemberEvaluationService;
 import cn.lili.modules.order.order.entity.enums.FlowTypeEnum;
 import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
 import cn.lili.modules.order.order.service.OrderComplaintService;
 import cn.lili.modules.order.trade.entity.enums.AfterSaleTypeEnum;
 import cn.lili.modules.promotion.service.SeckillService;

framework/src/main/java/cn/lili/modules/system/sms/SmsUtil.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.system.sms;
 
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 
 import java.util.List;
 import java.util.Map;

framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java

@@ -10,7 +10,7 @@ import cn.lili.common.security.context.UserContext;
 import cn.lili.modules.system.sms.AliSmsUtil;
 import cn.lili.modules.system.sms.SmsUtil;
 import cn.lili.common.utils.CommonUtil;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.common.properties.SmsTemplateProperties;
 import cn.lili.common.properties.SystemSettingProperties;
 import cn.lili.common.utils.Base64Utils;

framework/src/main/java/cn/lili/modules/verification/aop/VerificationInterceptor.java

@@ -3,7 +3,7 @@ package cn.lili.modules.verification.aop;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.verification.aop.annotation.Verification;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;

framework/src/main/java/cn/lili/modules/verification/aop/annotation/Verification.java

@@ -1,7 +1,7 @@
 package cn.lili.modules.verification.aop.annotation;
 
 
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 
 import java.lang.annotation.*;
 

framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationEnums.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.verification.enums;
+package cn.lili.modules.verification.entity.enums;
 
 /**
  * VerificationEnums

framework/src/main/java/cn/lili/modules/verification/service/VerificationService.java

@@ -1,6 +1,6 @@
 package cn.lili.modules.verification.service;
 
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 
 import java.io.IOException;
 import java.util.Map;

framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java

@@ -11,7 +11,7 @@ import cn.lili.modules.verification.entity.dos.VerificationSource;
 import cn.lili.modules.verification.entity.dto.VerificationDTO;
 import cn.lili.modules.verification.service.VerificationSourceService;
 import cn.lili.modules.verification.SliderImageUtil;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWallet.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.dos;
+package cn.lili.modules.wallet.entity.dos;
 
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWithdrawApply.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.dos;
+package cn.lili.modules.wallet.entity.dos;
 
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;

framework/src/main/java/cn/lili/modules/wallet/entity/dos/Recharge.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.trade.entity.dos;
+package cn.lili.modules.wallet.entity.dos;
 
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
 import cn.lili.mybatis.BaseIdEntity;

framework/src/main/java/cn/lili/modules/wallet/entity/dos/WalletLog.java

@@ -1,5 +1,6 @@
-package cn.lili.modules.order.trade.entity.dos;
+package cn.lili.modules.wallet.entity.dos;
 
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
 import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -29,34 +30,21 @@ public class WalletLog extends BaseIdEntity {
 
     private static final long serialVersionUID = -1599270544927161096L;
 
-    /**
-     * 会员id
-     */
     @ApiModelProperty(value = "会员id")
     private String memberId;
 
-    /**
-     * 会员名称
-     */
     @ApiModelProperty(value = "会员名称")
     private String memberName;
-    /**
+
-     * 金额
-     */
     @ApiModelProperty(value = "金额")
     private Double money;
 
     /**
-     * 变动业务类型
+     * @see DepositServiceTypeEnum
-     *
-     * @see cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum
      */
     @ApiModelProperty(value = "业务类型")
     private String serviceType;
 
-    /**
-     * 日志明细
-     */
     @ApiModelProperty(value = "日志明细")
     private String detail;
 

framework/src/main/java/cn/lili/modules/wallet/entity/dto/MemberWithdrawalMessage.java

@@ -1,5 +1,6 @@
-package cn.lili.modules.member.entity.dto;
+package cn.lili.modules.wallet.entity.dto;
 
+import cn.lili.modules.wallet.entity.enums.MemberWithdrawalDestinationEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -22,7 +23,7 @@ public class MemberWithdrawalMessage {
     private String status;
 
     /**
-     * @see cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum
+     * @see MemberWithdrawalDestinationEnum
      */
     @ApiModelProperty(value = "提现到哪里")
     private String destination;

framework/src/main/java/cn/lili/modules/wallet/entity/enums/DepositServiceTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.trade.entity.enums;
+package cn.lili.modules.wallet.entity.enums;
 
 /**
  * 预存款变动日志业务类型

framework/src/main/java/cn/lili/modules/wallet/entity/enums/MemberWithdrawalDestinationEnum.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.enums;
+package cn.lili.modules.wallet.entity.enums;
 
 /**
  * 会员提现到哪里 枚举

framework/src/main/java/cn/lili/modules/wallet/entity/enums/WithdrawStatusEnum.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.enums;
+package cn.lili.modules.wallet.entity.enums;
 
 /**
  * 提现申请状态枚举类

framework/src/main/java/cn/lili/modules/wallet/entity/vo/MemberWalletVO.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.vo;
+package cn.lili.modules.wallet.entity.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/wallet/entity/vo/MemberWithdrawApplyQueryVO.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.member.entity.vo;
+package cn.lili.modules.wallet.entity.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

framework/src/main/java/cn/lili/modules/wallet/mapper/MemberWalletMapper.java

@@ -1,7 +1,7 @@
-package cn.lili.modules.member.mapper;
+package cn.lili.modules.wallet.mapper;
 
 
-import cn.lili.modules.member.entity.dos.MemberWallet;
+import cn.lili.modules.wallet.entity.dos.MemberWallet;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

framework/src/main/java/cn/lili/modules/wallet/mapper/MemberWithdrawApplyMapper.java

@@ -1,7 +1,7 @@
-package cn.lili.modules.member.mapper;
+package cn.lili.modules.wallet.mapper;
 
 
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

framework/src/main/java/cn/lili/modules/wallet/mapper/RechargeMapper.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.order.trade.mapper;
+package cn.lili.modules.wallet.mapper;
 
-import cn.lili.modules.order.trade.entity.dos.Recharge;
+import cn.lili.modules.wallet.entity.dos.Recharge;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

framework/src/main/java/cn/lili/modules/wallet/mapper/WalletLogMapper.java

@@ -1,6 +1,6 @@
-package cn.lili.modules.order.trade.mapper;
+package cn.lili.modules.wallet.mapper;
 
-import cn.lili.modules.order.trade.entity.dos.WalletLog;
+import cn.lili.modules.wallet.entity.dos.WalletLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

framework/src/main/java/cn/lili/modules/wallet/service/MemberWalletService.java

@@ -1,10 +1,10 @@
-package cn.lili.modules.member.service;
+package cn.lili.modules.wallet.service;
 
 
 import cn.lili.modules.member.entity.dos.Member;
-import cn.lili.modules.member.entity.dos.MemberWallet;
+import cn.lili.modules.wallet.entity.dos.MemberWallet;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.vo.MemberWalletVO;
+import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

framework/src/main/java/cn/lili/modules/wallet/service/MemberWithdrawApplyService.java

@@ -1,9 +1,9 @@
-package cn.lili.modules.member.service;
+package cn.lili.modules.wallet.service;
 
 
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.vo.MemberWithdrawApplyQueryVO;
+import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 

framework/src/main/java/cn/lili/modules/wallet/service/RechargeService.java

@@ -1,13 +1,13 @@
-package cn.lili.modules.order.trade.service;
+package cn.lili.modules.wallet.service;
 
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
+import cn.lili.modules.wallet.entity.dos.Recharge;
 import cn.lili.modules.order.trade.entity.vo.RechargeQueryVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * 预存款充值记录业务层
+ * 预存款充值业务层
  *
  * @author pikachu
  * @since 2020-02-25 14:10:16

framework/src/main/java/cn/lili/modules/wallet/service/WalletLogService.java

@@ -1,13 +1,13 @@
-package cn.lili.modules.order.trade.service;
+package cn.lili.modules.wallet.service;
 
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.trade.entity.dos.WalletLog;
+import cn.lili.modules.wallet.entity.dos.WalletLog;
 import cn.lili.modules.order.trade.entity.vo.DepositQueryVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * 预存款日志业务层
+ * 钱包变动日志业务层
  *
  * @author pikachu
  * @since 2020-02-25 14:10:16

framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.member.serviceimpl;
+package cn.lili.modules.wallet.serviceimpl;
 
 
 import cn.lili.common.enums.ResultCode;
@@ -10,19 +10,19 @@ import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.member.entity.dos.Member;
-import cn.lili.modules.member.entity.dos.MemberWallet;
+import cn.lili.modules.wallet.entity.dos.MemberWallet;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
+import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
-import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
+import cn.lili.modules.wallet.entity.enums.MemberWithdrawalDestinationEnum;
-import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
+import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
-import cn.lili.modules.member.entity.vo.MemberWalletVO;
+import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
-import cn.lili.modules.member.mapper.MemberWalletMapper;
+import cn.lili.modules.wallet.mapper.MemberWalletMapper;
 import cn.lili.modules.member.service.MemberService;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWalletService;
-import cn.lili.modules.member.service.MemberWithdrawApplyService;
+import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
-import cn.lili.modules.order.trade.entity.dos.WalletLog;
+import cn.lili.modules.wallet.entity.dos.WalletLog;
-import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
-import cn.lili.modules.order.trade.service.WalletLogService;
+import cn.lili.modules.wallet.service.WalletLogService;
 import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.dto.WithdrawalSetting;
 import cn.lili.modules.system.entity.enums.SettingEnum;
@@ -42,7 +42,7 @@ import java.util.Date;
 
 
 /**
- * 会员预存款业务层实现
+ * 会员余额业务层实现
  *
  * @author pikachu
  * @since 2020-02-25 14:10:16

framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWithdrawApplyServiceImpl.java

@@ -1,22 +1,22 @@
-package cn.lili.modules.member.serviceimpl;
+package cn.lili.modules.wallet.serviceimpl;
 
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.properties.RocketmqCustomProperties;
-import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
+import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
-import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
+import cn.lili.modules.wallet.entity.enums.MemberWithdrawalDestinationEnum;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
+import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
-import cn.lili.modules.member.entity.vo.MemberWalletVO;
+import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
-import cn.lili.modules.member.entity.vo.MemberWithdrawApplyQueryVO;
+import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
-import cn.lili.modules.member.mapper.MemberWithdrawApplyMapper;
+import cn.lili.modules.wallet.mapper.MemberWithdrawApplyMapper;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWalletService;
-import cn.lili.modules.member.service.MemberWithdrawApplyService;
+import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
-import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.MemberTagsEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

framework/src/main/java/cn/lili/modules/wallet/serviceimpl/RechargeServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.lili.modules.order.trade.serviceimpl;
+package cn.lili.modules.wallet.serviceimpl;
 
 import cn.hutool.core.date.DateTime;
 import cn.lili.common.enums.ResultCode;
@@ -9,13 +9,13 @@ import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWalletService;
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
+import cn.lili.modules.wallet.entity.dos.Recharge;
-import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
+import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
 import cn.lili.modules.order.trade.entity.vo.RechargeQueryVO;
-import cn.lili.modules.order.trade.mapper.RechargeMapper;
+import cn.lili.modules.wallet.mapper.RechargeMapper;
-import cn.lili.modules.order.trade.service.RechargeService;
+import cn.lili.modules.wallet.service.RechargeService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -26,7 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Date;
 
 /**
- * 预存款日志业务层实现
+ * 预存款业务层实现
  *
  * @author pikachu
  * @since 2020-02-25 14:10:16

framework/src/main/java/cn/lili/modules/wallet/serviceimpl/WalletLogServiceImpl.java

@@ -1,12 +1,12 @@
-package cn.lili.modules.order.trade.serviceimpl;
+package cn.lili.modules.wallet.serviceimpl;
 
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.order.trade.entity.dos.WalletLog;
+import cn.lili.modules.wallet.entity.dos.WalletLog;
 import cn.lili.modules.order.trade.entity.vo.DepositQueryVO;
-import cn.lili.modules.order.trade.mapper.WalletLogMapper;
+import cn.lili.modules.wallet.mapper.WalletLogMapper;
-import cn.lili.modules.order.trade.service.WalletLogService;
+import cn.lili.modules.wallet.service.WalletLogService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java

@@ -2,8 +2,8 @@ package cn.lili.controller.member;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.member.entity.vo.MemberWalletVO;
+import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.service.MemberWalletService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java

@@ -4,9 +4,9 @@ package cn.lili.controller.member;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.vo.MemberWithdrawApplyQueryVO;
+import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
-import cn.lili.modules.member.service.MemberWithdrawApplyService;
+import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java

@@ -18,7 +18,7 @@ import cn.lili.modules.permission.entity.vo.AdminUserVO;
 import cn.lili.modules.permission.service.AdminUserService;
 import cn.lili.modules.permission.service.DepartmentService;
 import cn.lili.modules.system.aspect.annotation.DemoSite;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;

manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java

@@ -3,9 +3,9 @@ package cn.lili.controller.statistics;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
 import cn.lili.modules.statistics.entity.vo.OrderOverviewVO;

manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java

@@ -2,10 +2,10 @@ package cn.lili.controller.trade;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
-import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
-import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
 import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
 import cn.lili.modules.system.entity.vo.Traces;
 import com.baomidou.mybatisplus.core.metadata.IPage;

manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java

@@ -3,8 +3,8 @@ package cn.lili.controller.trade;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.order.entity.dos.AfterSaleReason;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
-import cn.lili.modules.order.order.service.AfterSaleReasonService;
+import cn.lili.modules.order.aftersale.service.AfterSaleReasonService;
 import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java

@@ -3,9 +3,9 @@ package cn.lili.controller.trade;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
+import cn.lili.modules.wallet.entity.dos.Recharge;
 import cn.lili.modules.order.trade.entity.vo.RechargeQueryVO;
-import cn.lili.modules.order.trade.service.RechargeService;
+import cn.lili.modules.wallet.service.RechargeService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java

@@ -3,9 +3,9 @@ package cn.lili.controller.trade;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.trade.entity.dos.WalletLog;
+import cn.lili.modules.wallet.entity.dos.WalletLog;
 import cn.lili.modules.order.trade.entity.vo.DepositQueryVO;
-import cn.lili.modules.order.trade.service.WalletLogService;
+import cn.lili.modules.wallet.service.WalletLogService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java

@@ -8,7 +8,7 @@ import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java

@@ -4,9 +4,9 @@ import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
 import cn.lili.modules.statistics.entity.vo.OrderOverviewVO;

seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java

@@ -3,10 +3,10 @@ package cn.lili.controller.trade;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
-import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
-import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
 import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
 import cn.lili.modules.system.entity.vo.Traces;
 import cn.lili.common.security.OperationalJudgment;