caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

模块隔离优化

Browse Source
This commit is contained in:
Chopper 2021-11-24 10:30:21 +08:00
parent 16f314bd80
commit 58648c3ece
93 changed files with 218 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

2
buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java → buyer-api/src/main/java/cn/lili/controller/system/MemberMessageBuyerController.java
View File

@ -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;

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

@ -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.order.entity.dos.AfterSaleReason;
import cn.lili.modules.order.order.entity.dto.AfterSaleDTO;
import cn.lili.modules.order.order.entity.vo.AfterSaleApplyVO;
import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
import cn.lili.modules.order.order.service.AfterSaleLogService;
import cn.lili.modules.order.order.service.AfterSaleReasonService;
import cn.lili.modules.order.order.service.AfterSaleService;
import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
import cn.lili.modules.order.aftersale.entity.dto.AfterSaleDTO;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleApplyVO;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
import cn.lili.modules.order.aftersale.service.AfterSaleLogService;
import cn.lili.modules.order.aftersale.service.AfterSaleReasonService;
import cn.lili.modules.order.aftersale.service.AfterSaleService;
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;

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

@ -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.order.trade.service.RechargeService;
import cn.lili.modules.wallet.entity.dos.Recharge;
import cn.lili.modules.wallet.service.RechargeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

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

@ -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.order.trade.service.WalletLogService;
import cn.lili.modules.wallet.entity.dos.WalletLog;
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;

10
buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java → buyer-api/src/main/java/cn/lili/controller/wallet/MemberWalletBuyerController.java
View File

@ -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.member.entity.vo.MemberWalletVO;
import cn.lili.modules.wallet.entity.dos.MemberWallet;
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.verification.enums.VerificationEnums;
import cn.lili.modules.wallet.service.MemberWalletService;
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;

8
buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java → buyer-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyBuyerController.java
View File

@ -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.member.entity.vo.MemberWithdrawApplyQueryVO;
import cn.lili.modules.member.service.MemberWithdrawApplyService;
import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

6
buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java → buyer-api/src/main/java/cn/lili/controller/wallet/RechargeBuyerController.java
View File

@ -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;

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

@ -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;

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

@ -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;

2
consumer/src/main/java/cn/lili/event/AfterSaleStatusChangeEvent.java
View File

@ -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;
/**
* 售后单改变状态

2
consumer/src/main/java/cn/lili/event/MemberWithdrawalEvent.java
View File

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

2
consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java
View File

@ -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;

4
consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
View File

@ -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;

3
consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java
View File

@ -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 lombok.RequiredArgsConstructor;
import cn.lili.modules.wallet.service.MemberWalletService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

8
consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
View File

@ -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.member.entity.enums.MemberWithdrawalDestinationEnum;
import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
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;

2
consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java
View File

@ -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;

2
consumer/src/main/java/cn/lili/listener/MemberMessageListener.java
View File

@ -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;

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

@ -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;

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

@ -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.order.trade.service.RechargeService;
import cn.lili.modules.wallet.entity.dos.Recharge;
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;

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

@ -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;

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

@ -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.member.entity.enums.MemberWithdrawalDestinationEnum;
import cn.lili.modules.member.service.MemberWalletService;
import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
import cn.lili.modules.wallet.entity.enums.MemberWithdrawalDestinationEnum;
import cn.lili.modules.wallet.service.MemberWalletService;
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;

2
framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java → framework/src/main/java/cn/lili/modules/order/aftersale/aop/AfterSaleLogPoint.java
View File

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

8
framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java → framework/src/main/java/cn/lili/modules/order/aftersale/aop/AfterSaleOperationLogAspect.java
View File

@ -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.trade.entity.dos.AfterSaleLog;
import cn.lili.modules.order.aftersale.service.AfterSaleLogService;
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();

2
framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java → framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSale.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java → framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSaleLog.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java → framework/src/main/java/cn/lili/modules/order/aftersale/entity/dos/AfterSaleReason.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java → framework/src/main/java/cn/lili/modules/order/aftersale/entity/dto/AfterSaleDTO.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java → framework/src/main/java/cn/lili/modules/order/aftersale/entity/dto/AfterSalePriceDetailDTO.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java → framework/src/main/java/cn/lili/modules/order/aftersale/entity/enums/ComplaintStatusEnum.java
View File

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

4
framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java → framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleAllowOperation.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java → framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleApplyVO.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java → framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java
View File

@ -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;

4
framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java → framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleVO.java
View File

@ -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;

4
framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java → framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleLogMapper.java
View File

@ -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;
/**

6
framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java → framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleMapper.java
View File

@ -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.order.entity.vo.AfterSaleVO;
import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
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;

4
framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java → framework/src/main/java/cn/lili/modules/order/aftersale/mapper/AfterSaleReasonMapper.java
View File

@ -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;
/**

4
framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java → framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleLogService.java
View File

@ -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;

4
framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java → framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleReasonService.java
View File

@ -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;

12
framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java → framework/src/main/java/cn/lili/modules/order/aftersale/service/AfterSaleService.java
View File

@ -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.order.entity.dto.AfterSaleDTO;
import cn.lili.modules.order.order.entity.vo.AfterSaleApplyVO;
import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.aftersale.entity.dto.AfterSaleDTO;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleApplyVO;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
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;

8
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java → framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleLogServiceImpl.java
View File

@ -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.trade.entity.dos.AfterSaleLog;
import cn.lili.modules.order.trade.mapper.AfterSaleLogMapper;
import cn.lili.modules.order.aftersale.service.AfterSaleLogService;
import cn.lili.modules.order.aftersale.entity.dos.AfterSaleLog;
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;

8
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java → framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleReasonServiceImpl.java
View File

@ -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.order.mapper.AfterSaleReasonMapper;
import cn.lili.modules.order.order.service.AfterSaleReasonService;
import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
import cn.lili.modules.order.aftersale.mapper.AfterSaleReasonMapper;
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;

18
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java → framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
View File

@ -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.order.entity.dos.AfterSale;
import cn.lili.modules.order.aftersale.aop.AfterSaleLogPoint;
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.order.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
import cn.lili.modules.order.order.mapper.AfterSaleMapper;
import cn.lili.modules.order.order.service.AfterSaleService;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleApplyVO;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
import cn.lili.modules.order.aftersale.mapper.AfterSaleMapper;
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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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.order.trade.service.RechargeService;
import cn.lili.modules.wallet.entity.dos.Recharge;
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;

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

@ -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.order.trade.entity.enums.DepositServiceTypeEnum;
import cn.lili.modules.wallet.service.MemberWalletService;
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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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.*;

2
framework/src/main/java/cn/lili/modules/verification/enums/VerificationEnums.java → framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationEnums.java
View File

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

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

@ -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;

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

@ -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;

2
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java → framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWallet.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java → framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWithdrawApply.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java → framework/src/main/java/cn/lili/modules/wallet/entity/dos/Recharge.java
View File

@ -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;

20
framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java → framework/src/main/java/cn/lili/modules/wallet/entity/dos/WalletLog.java
View File

@ -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 cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum
* @see DepositServiceTypeEnum
*/
@ApiModelProperty(value = "业务类型")
private String serviceType;
/**
* 日志明细
*/
@ApiModelProperty(value = "日志明细")
private String detail;

5
framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java → framework/src/main/java/cn/lili/modules/wallet/entity/dto/MemberWithdrawalMessage.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java → framework/src/main/java/cn/lili/modules/wallet/entity/enums/DepositServiceTypeEnum.java
View File

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

2
framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java → framework/src/main/java/cn/lili/modules/wallet/entity/enums/MemberWithdrawalDestinationEnum.java
View File

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

2
framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java → framework/src/main/java/cn/lili/modules/wallet/entity/enums/WithdrawStatusEnum.java
View File

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

2
framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java → framework/src/main/java/cn/lili/modules/wallet/entity/vo/MemberWalletVO.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java → framework/src/main/java/cn/lili/modules/wallet/entity/vo/MemberWithdrawApplyQueryVO.java
View File

@ -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;

4
framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java → framework/src/main/java/cn/lili/modules/wallet/mapper/MemberWalletMapper.java
View File

@ -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;
/**

4
framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java → framework/src/main/java/cn/lili/modules/wallet/mapper/MemberWithdrawApplyMapper.java
View File

@ -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;
/**

4
framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java → framework/src/main/java/cn/lili/modules/wallet/mapper/RechargeMapper.java
View File

@ -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;
/**

4
framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java → framework/src/main/java/cn/lili/modules/wallet/mapper/WalletLogMapper.java
View File

@ -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;
/**

8
framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java → framework/src/main/java/cn/lili/modules/wallet/service/MemberWalletService.java
View File

@ -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.member.entity.dos.MemberWithdrawApply;
import cn.lili.modules.member.entity.vo.MemberWalletVO;
import cn.lili.modules.wallet.entity.dos.MemberWallet;
import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
import com.baomidou.mybatisplus.extension.service.IService;
/**

6
framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java → framework/src/main/java/cn/lili/modules/wallet/service/MemberWithdrawApplyService.java
View File

@ -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.member.entity.vo.MemberWithdrawApplyQueryVO;
import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

6
framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java → framework/src/main/java/cn/lili/modules/wallet/service/RechargeService.java
View File

@ -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

6
framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java → framework/src/main/java/cn/lili/modules/wallet/service/WalletLogService.java
View File

@ -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

28
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java → framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java
View File

@ -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.member.entity.dos.MemberWithdrawApply;
import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
import cn.lili.modules.member.entity.vo.MemberWalletVO;
import cn.lili.modules.member.mapper.MemberWalletMapper;
import cn.lili.modules.wallet.entity.dos.MemberWallet;
import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
import cn.lili.modules.wallet.entity.enums.MemberWithdrawalDestinationEnum;
import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
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.member.service.MemberWithdrawApplyService;
import cn.lili.modules.order.trade.entity.dos.WalletLog;
import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
import cn.lili.modules.order.trade.service.WalletLogService;
import cn.lili.modules.wallet.service.MemberWalletService;
import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
import cn.lili.modules.wallet.entity.dos.WalletLog;
import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum;
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

22
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java → framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWithdrawApplyServiceImpl.java
View File

@ -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.member.entity.enums.MemberWithdrawalDestinationEnum;
import cn.lili.modules.wallet.entity.dto.MemberWithdrawalMessage;
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.member.entity.enums.WithdrawStatusEnum;
import cn.lili.modules.member.entity.vo.MemberWalletVO;
import cn.lili.modules.member.entity.vo.MemberWithdrawApplyQueryVO;
import cn.lili.modules.member.mapper.MemberWithdrawApplyMapper;
import cn.lili.modules.member.service.MemberWalletService;
import cn.lili.modules.member.service.MemberWithdrawApplyService;
import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
import cn.lili.modules.wallet.mapper.MemberWithdrawApplyMapper;
import cn.lili.modules.wallet.service.MemberWalletService;
import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
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;

14
framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java → framework/src/main/java/cn/lili/modules/wallet/serviceimpl/RechargeServiceImpl.java
View File

@ -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.order.trade.entity.enums.DepositServiceTypeEnum;
import cn.lili.modules.wallet.entity.dos.Recharge;
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.order.trade.service.RechargeService;
import cn.lili.modules.wallet.mapper.RechargeMapper;
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

8
framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java → framework/src/main/java/cn/lili/modules/wallet/serviceimpl/WalletLogServiceImpl.java
View File

@ -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.order.trade.service.WalletLogService;
import cn.lili.modules.wallet.mapper.WalletLogMapper;
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;

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

@ -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.member.service.MemberWalletService;
import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
import cn.lili.modules.wallet.service.MemberWalletService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;

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

@ -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.member.entity.vo.MemberWithdrawApplyQueryVO;
import cn.lili.modules.member.service.MemberWithdrawApplyService;
import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

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

@ -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;

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

@ -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;

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

@ -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.order.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
import cn.lili.modules.order.order.service.AfterSaleService;
import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
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;

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

@ -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.order.service.AfterSaleReasonService;
import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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.order.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
import cn.lili.modules.order.order.service.AfterSaleService;
import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
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;