code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除无效的代码，代码 格式、位置 调整

Browse Source
This commit is contained in:
Chopper
2021-11-05 17:49:57 +08:00
parent 27efe772ab
commit f0f343aa23
55 changed files with 31 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java → framework/src/main/java/cn/lili/modules/member/aop/annotation/PointLogPoint.java
View File

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

4
framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java → framework/src/main/java/cn/lili/modules/member/aop/interceptor/PointLogInterceptor.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.member.entity.aop.interceptor;
package cn.lili.modules.member.aop.interceptor;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dos.MemberPointsHistory;
@@ -29,7 +29,7 @@ public class PointLogInterceptor {
@Autowired
private MemberService memberService;
@After("@annotation(cn.lili.modules.member.entity.aop.annotation.PointLogPoint)")
@After("@annotation(cn.lili.modules.member.aop.annotation.PointLogPoint)")
public void doAfter(JoinPoint pjp) {
//参数
Object[] obj = pjp.getArgs();

2
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
View File

@@ -21,7 +21,7 @@ import cn.lili.modules.connect.entity.Connect;
import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
import cn.lili.modules.connect.service.ConnectService;
import cn.lili.modules.connect.util.UuidUtils;
import cn.lili.modules.member.entity.aop.annotation.PointLogPoint;
import cn.lili.modules.member.aop.annotation.PointLogPoint;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dto.ManagerMemberEditDTO;
import cn.lili.modules.member.entity.dto.MemberAddDTO;

2
framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java
View File

@@ -1,7 +1,5 @@
package cn.lili.modules.message.entity.dos;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

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

@@ -7,7 +7,7 @@ import cn.lili.modules.order.order.entity.dos.Receipt;
import cn.lili.modules.order.order.entity.enums.DeliverStatusEnum;
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
import cn.lili.modules.order.trade.entity.dos.OrderLog;
import io.swagger.annotations.ApiModelProperty;

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

@@ -33,7 +33,7 @@ import cn.lili.modules.order.trade.entity.enums.AfterSaleRefundWayEnum;
import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum;
import cn.lili.modules.order.trade.entity.enums.AfterSaleTypeEnum;
import cn.lili.modules.payment.kit.RefundSupport;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.util.StatisticsDateUtil;
import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;

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

@@ -36,7 +36,7 @@ import cn.lili.modules.order.order.mapper.OrderMapper;
import cn.lili.modules.order.order.service.*;
import cn.lili.modules.order.trade.entity.dos.OrderLog;
import cn.lili.modules.order.trade.service.OrderLogService;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import cn.lili.modules.promotion.entity.dos.Pintuan;
import cn.lili.modules.promotion.service.PintuanService;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;

2
framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java → framework/src/main/java/cn/lili/modules/payment/entity/enums/CashierEnum.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.payment.kit.enums;
package cn.lili.modules.payment.entity.enums;
/**
* 订单类型

2
framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java → framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentClientEnum.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.payment.kit.enums;
package cn.lili.modules.payment.entity.enums;
/**
* 支付方式枚举

2
framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java → framework/src/main/java/cn/lili/modules/payment/entity/enums/PaymentMethodEnum.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.payment.kit.enums;
package cn.lili.modules.payment.entity.enums;
/**
* 支付方式枚举

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

@@ -9,8 +9,8 @@ import cn.lili.common.vo.ResultMessage;
import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.modules.member.service.MemberWalletService;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.enums.PaymentClientEnum;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.PaymentClientEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import cn.lili.modules.payment.kit.params.CashierExecute;
import cn.lili.modules.payment.kit.params.dto.CashierParam;
import cn.lili.modules.system.entity.dos.Setting;

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

@@ -5,7 +5,7 @@ import cn.lili.common.exception.ServiceException;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.payment.entity.RefundLog;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

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

@@ -8,7 +8,7 @@ import cn.lili.modules.order.order.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;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -2,7 +2,7 @@ package cn.lili.modules.payment.kit.params;
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.enums.CashierEnum;
import cn.lili.modules.payment.entity.enums.CashierEnum;
import cn.lili.modules.payment.kit.params.dto.CashierParam;
/**

2
framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java
View File

@@ -11,7 +11,7 @@ import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
import cn.lili.modules.payment.kit.enums.CashierEnum;
import cn.lili.modules.payment.entity.enums.CashierEnum;
import cn.lili.modules.payment.kit.params.CashierExecute;
import cn.lili.modules.payment.kit.params.dto.CashierParam;
import cn.lili.modules.system.entity.dto.BaseSetting;

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

@@ -8,7 +8,7 @@ import cn.lili.modules.order.trade.entity.dos.Recharge;
import cn.lili.modules.order.trade.service.RechargeService;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
import cn.lili.modules.payment.kit.enums.CashierEnum;
import cn.lili.modules.payment.entity.enums.CashierEnum;
import cn.lili.modules.payment.kit.params.CashierExecute;
import cn.lili.modules.payment.kit.params.dto.CashierParam;
import cn.lili.modules.system.entity.dto.BaseSetting;

2
framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java
View File

@@ -11,7 +11,7 @@ import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.order.order.service.TradeService;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
import cn.lili.modules.payment.kit.enums.CashierEnum;
import cn.lili.modules.payment.entity.enums.CashierEnum;
import cn.lili.modules.payment.kit.params.CashierExecute;
import cn.lili.modules.payment.kit.params.dto.CashierParam;
import cn.lili.modules.system.entity.dto.BaseSetting;

2
framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java
View File

@@ -18,7 +18,7 @@ import cn.lili.modules.payment.kit.CashierSupport;
import cn.lili.modules.payment.kit.Payment;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import cn.lili.modules.payment.kit.params.dto.CashierParam;
import cn.lili.modules.payment.service.PaymentService;
import cn.lili.modules.payment.service.RefundLogService;

2
framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java
View File

@@ -6,7 +6,7 @@ import cn.lili.modules.payment.entity.RefundLog;
import cn.lili.modules.payment.kit.Payment;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import cn.lili.modules.payment.kit.params.dto.CashierParam;
import cn.lili.modules.payment.service.PaymentService;
import cn.lili.modules.payment.service.RefundLogService;

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

@@ -12,8 +12,8 @@ import cn.lili.modules.payment.kit.CashierSupport;
import cn.lili.modules.payment.kit.Payment;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
import cn.lili.modules.payment.kit.enums.CashierEnum;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.CashierEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import cn.lili.modules.payment.kit.params.dto.CashierParam;
import cn.lili.modules.payment.service.PaymentService;
import cn.lili.modules.payment.service.RefundLogService;

2
framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
View File

@@ -31,7 +31,7 @@ import cn.lili.modules.payment.kit.core.kit.*;
import cn.lili.modules.payment.kit.core.utils.DateTimeZoneUtil;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import cn.lili.modules.payment.kit.params.dto.CashierParam;
import cn.lili.modules.payment.kit.plugin.wechat.enums.WechatApiEnum;
import cn.lili.modules.payment.kit.plugin.wechat.enums.WechatDomain;

2
framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java
View File

@@ -1,7 +1,7 @@
package cn.lili.modules.system.entity.dto.payment;
import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportForm;
import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportItem;
import lombok.Data;

2
framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java
View File

@@ -1,7 +1,7 @@
package cn.lili.modules.system.entity.dto.payment.dto;
import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import lombok.Data;
import lombok.experimental.Accessors;