fix XSS and BAC, improve code style

2021-09-09 16:47:14 +08:00
parent d470192ac6
commit d3e1de5620
175 changed files with 858 additions and 678 deletions
--- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java
@@ -1,12 +1,12 @@
 package cn.lili.controller.goods;


-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.goods.entity.dos.GoodsUnit;
 import cn.lili.modules.goods.service.GoodsUnitService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -22,7 +22,7 @@ import java.util.List;
 * 管理端,商品计量单位接口
 *
 * @author Bulbasaur
- * @since: 2020/11/26 16:15
+ * @since 2020/11/26 16:15
 */
@RestController
@Api(tags = "管理端,商品计量单位接口")
--- a/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java
@@ -18,7 +18,7 @@ import javax.validation.Valid;
 * 管理端,分类绑定参数组管理接口
 *
 * @author Bulbasaur
- * @since: 2020/11/26 16:15
+ * @since 2020/11/26 16:15
 */
@RestController
@Api(tags = "管理端,分类绑定参数组管理接口")
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java
@@ -3,11 +3,11 @@ package cn.lili.controller.member;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.MemberGrade;
 import cn.lili.modules.member.service.MemberGradeService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
 * 管理端,会员等级接口
 *
 * @author Bulbasaur
- * @since: 2021/5/16 11:29 下午
+ * @since 2021/5/16 11:29 下午
 */
@RestController
@Api(tags = "管理端,会员等级接口")
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 管理端,会员消息消息管理接口
 *
 * @author pikachu
- * @since: 2020/12/6 16:09
+ * @since 2020/12/6 16:09
 */
@RestController
@Transactional(rollbackFor = Exception.class)
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 管理端,预存款接口
 *
 * @author pikachu
- * @since: 2020/11/16 10:07 下午
+ * @since 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "管理端,预存款接口")
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 管理端,余额提现记录接口
 *
 * @author pikachu
- * @since: 2020/11/16 10:07 下午
+ * @since 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "管理端,余额提现记录接口")
--- a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java
@@ -1,11 +1,11 @@
 package cn.lili.controller.other;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.page.entity.dos.Special;
 import cn.lili.modules.page.service.SpecialService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -20,7 +20,7 @@ import java.util.List;
 * 管理端,专题活动接口
 *
 * @author Bulbasaur
- * @since: 2020/12/7 11:33
+ * @since 2020/12/7 11:33
 */
@RestController
@Api(tags = "管理端,专题活动接口")
--- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java
@@ -1,12 +1,12 @@
 package cn.lili.controller.other;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
 import cn.lili.modules.system.entity.dos.VerificationSource;
 import cn.lili.modules.system.service.VerificationSourceService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,7 +21,7 @@ import java.util.List;
 * 管理端,验证码资源维护接口
 *
 * @author Chopper
- * @since: 2020/12/7 11:33
+ * @since 2020/12/7 11:33
 */
@RestController
@Api(tags = "管理端,验证码资源维护接口")
--- a/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 管理端,直播间管理接口
 *
 * @author Bulbasaur
- * @since: 2021/5/28 11:56 上午
+ * @since 2021/5/28 11:56 上午
 */
@RestController
@Api(tags = "店铺端,直播商品接口")
--- a/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull;
 * 管理端,直播间接口
 *
 * @author Bulbasaur
- * @since: 2021/5/28 11:56 上午
+ * @since 2021/5/28 11:56 上午
 */
@RestController
@Api(tags = "店铺端,直播间接口")
--- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
@@ -3,7 +3,6 @@ package cn.lili.controller.promotion;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.promotion.entity.dos.CouponActivity;
@@ -11,6 +10,7 @@ import cn.lili.modules.promotion.entity.dto.CouponActivityDTO;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
 import cn.lili.modules.promotion.entity.vos.CouponActivityVO;
 import cn.lili.modules.promotion.service.CouponActivityService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
 * 优惠券活动
 *
 * @author Bulbasaur
- * @since: 2021/5/21 7:11 下午
+ * @since 2021/5/21 7:11 下午
 */
@RestController
@Api(tags = "管理端,优惠券活动接口")
--- a/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java
@@ -23,7 +23,7 @@ import java.util.List;
 * 管理端,采购接口
 *
 * @author Chopper
- * @since: 2020/11/16 10:06 下午
+ * @since 2020/11/16 10:06 下午
 */
@Api(tags = "管理端,采购接口")
@RestController
--- a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java
@@ -1,6 +1,5 @@
 package cn.lili.controller.setting;

-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -8,6 +7,7 @@ import cn.lili.modules.system.entity.dos.InstantDelivery;
 import cn.lili.modules.system.entity.plugin.ConfigItem;
 import cn.lili.modules.system.entity.vo.InstantDeliveryVO;
 import cn.lili.modules.system.service.InstantDeliveryService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
@@ -23,7 +23,7 @@ import java.util.List;
 * 管理端,即时配送接口
 *
 * @author pikachu
- * @since: 2020/11/17 7:56 下午
+ * @since 2020/11/17 7:56 下午
 */
@RestController
@Api(tags = "管理端,即时配送接口")
--- a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java
@@ -19,7 +19,7 @@ import java.util.List;
 * 管理端,日志管理接口
 *
 * @author Chopper
- * @since: 2020/11/17 7:56 下午
+ * @since 2020/11/17 7:56 下午
 */
@Slf4j
@RestController
--- a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java
@@ -1,11 +1,11 @@
 package cn.lili.controller.setting;

-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.system.entity.dos.Logistics;
 import cn.lili.modules.system.service.LogisticsService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull;
 * 管理端,物流公司接口
 *
 * @author Chopper
- * @since: 2020/11/17 7:56 下午
+ * @since 2020/11/17 7:56 下午
 */
@RestController
@Api(tags = "管理端,物流公司接口")
--- a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java
@@ -1,12 +1,12 @@
 package cn.lili.controller.setting;

-import cn.lili.common.security.context.UserContext;
-import cn.lili.mybatis.util.PageUtil;
 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.MemberNotice;
 import cn.lili.modules.member.service.MemberNoticeService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,7 +21,7 @@ import java.util.List;
 * 管理端,会员站内信管理接口
 *
 * @author Chopper
- * @since: 2020/11/17 4:31 下午
+ * @since 2020/11/17 4:31 下午
 */
@RestController
@Api(tags = "管理端,会员站内信管理API")
--- a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java
@@ -1,10 +1,10 @@
 package cn.lili.controller.setting;

 import cn.lili.common.enums.ResultCode;
+import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.message.entity.dos.NoticeMessage;
@@ -30,7 +30,7 @@ import java.util.List;
 * 管理端,会员站内信管理接口
 *
 * @author Chopper
- * @since: 2020/11/17 4:31 下午
+ * @since 2020/11/17 4:31 下午
 */
@Slf4j
@RestController
--- a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java
@@ -1,12 +1,12 @@
 package cn.lili.controller.setting;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
 import cn.lili.modules.system.entity.dos.ServiceNotice;
 import cn.lili.modules.system.service.ServiceNoticeService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +20,7 @@ import java.util.List;
 * 管理端,服务订阅消息接口
 *
 * @author Chopper
- * @since: 2020/11/17 4:33 下午
+ * @since 2020/11/17 4:33 下午
 */
@RestController
@Api(tags = "管理端,服务订阅消息接口")
--- a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java
@@ -1,11 +1,11 @@
 package cn.lili.controller.setting;

-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.message.entity.dos.SmsReach;
 import cn.lili.modules.message.service.SmsReachService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,7 +19,7 @@ import java.util.List;
 * 管理端,短信接口
 *
 * @author Bulbasaur
- * @since: 2021/1/30 4:09 下午
+ * @since 2021/1/30 4:09 下午
 */
@RestController
@Api(tags = "管理端,短信接口")
--- a/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java
@@ -1,6 +1,5 @@
 package cn.lili.controller.setting;

-import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -19,7 +18,7 @@ import javax.validation.Valid;
 * 管理端,短信签名接口
 *
 * @author Chopper
- * @since: 2021/1/30 4:09 下午
+ * @since 2021/1/30 4:09 下午
 */
@RestController
@Api(tags = "管理端,短信签名接口")
--- a/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java
@@ -1,6 +1,5 @@
 package cn.lili.controller.setting;

-import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -19,7 +18,7 @@ import javax.validation.Valid;
 * 管理端,短信模板接口
 *
 * @author Bulbasaur
- * @since: 2021/1/30 4:09 下午
+ * @since 2021/1/30 4:09 下午
 */
@RestController
@Api(tags = "管理端,短信模板接口")
--- a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java
@@ -19,7 +19,7 @@ import java.util.List;
 * 管理端,商品统计接口
 *
 * @author Bulbasaur
- * @since: 2020/12/9 19:04
+ * @since 2020/12/9 19:04
 */
@Api(tags = "管理端,商品统计接口")
@RestController
--- a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java
@@ -24,7 +24,7 @@ import java.util.List;
 * 管理端,首页统计数据接口
 *
 * @author Bulbasaur
- * @since: 2020/12/15 17:53
+ * @since 2020/12/15 17:53
 */
@Slf4j
@Api(tags = "管理端,首页统计数据接口")
--- a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java
@@ -18,7 +18,7 @@ import java.util.List;
 * 管理端,会员统计接口
 *
 * @author Bulbasaur
- * @since: 2020/12/9 19:04
+ * @since 2020/12/9 19:04
 */
@Api(tags = "管理端,会员统计接口")
@RestController
--- a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java
@@ -26,7 +26,7 @@ import java.util.List;
 * 管理端,订单统计接口
 *
 * @author Bulbasaur
- * @since: 2020/12/9 19:04
+ * @since 2020/12/9 19:04
 */
@Slf4j
@Api(tags = "管理端,订单统计接口")
--- a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 管理端,退款统计接口
 *
 * @author Bulbasaur
- * @since: 2020/12/9 19:04
+ * @since 2020/12/9 19:04
 */
@Api(tags = "管理端,退款统计接口")
@RestController
--- a/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java
@@ -22,7 +22,7 @@ import javax.validation.constraints.NotNull;
 * 管理端,商家结算单接口
 *
 * @author Chopper
- * @since: 2020/11/17 7:23 下午
+ * @since 2020/11/17 7:23 下午
 */
@RestController
@Api(tags = "管理端,商家结算单接口")
--- a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
@@ -3,7 +3,6 @@ package cn.lili.controller.store;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.system.aspect.annotation.DemoSite;
 import cn.lili.modules.goods.entity.vos.CategoryVO;
 import cn.lili.modules.store.entity.dos.Store;
 import cn.lili.modules.store.entity.dto.AdminStoreApplyDTO;
@@ -30,7 +29,7 @@ import java.util.List;
 * 管理端,店铺管理接口
 *
 * @author Bulbasaur
- * @since: 2020/12/6 16:09
+ * @since 2020/12/6 16:09
 */
@Api(tags = "管理端,店铺管理接口")
@RestController
--- a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 管理端,店铺消息消息管理接口
 *
 * @author pikachu
- * @since: 2020/12/6 16:09
+ * @since 2020/12/6 16:09
 */
@RestController
@Transactional(rollbackFor = Exception.class)
--- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java
@@ -23,7 +23,7 @@ import java.util.List;
 * 管理端,售后接口
 *
 * @author Bulbasaur
- * @since: 2021/1/6 14:11
+ * @since 2021/1/6 14:11
 */
@RestController
@RequestMapping("/manager/afterSale")
--- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java
@@ -1,11 +1,11 @@
 package cn.lili.controller.trade;

-import cn.lili.mybatis.util.PageUtil;
 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.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
@@ -20,7 +20,7 @@ import javax.validation.Valid;
 * 管理端,售后原因接口
 *
 * @author Bulbasaur
- * @since: 2021/1/6 14:11
+ * @since 2021/1/6 14:11
 */
@RestController
@RequestMapping("/manager/afterSaleReason")
--- a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
 * 管理端,交易投诉接口
 *
 * @author paulG
- * @since: 2020/12/5
+ * @since 2020/12/5
 */
@RestController
@Api(tags = "管理端,交易投诉接口")
--- a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java
@@ -11,14 +11,16 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;


 /**
 * 管理端,预存款充值记录接口
 *
 * @author pikachu
- * @since: 2020/11/16 10:07 下午
+ * @since 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "管理端,预存款充值记录接口")
--- a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java
@@ -1,12 +1,12 @@
 package cn.lili.controller.trade;

-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
 import cn.lili.modules.payment.entity.RefundLog;
 import cn.lili.modules.payment.service.RefundLogService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 管理端,退款日志接口
 *
 * @author Chopper
- * @since: 2020/11/16 10:07 下午
+ * @since 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "管理端,退款日志接口")
--- a/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 管理端,预存款充值记录接口
 *
 * @author pikachu
- * @since: 2020/11/16 10:07 下午
+ * @since 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "管理端,预存款充值记录接口")
--- a/manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java
+++ b/manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java
@@ -1,11 +1,8 @@
 package cn.lili.test.promotion;

-import cn.hutool.core.date.DateUtil;
+import cn.lili.modules.member.service.MemberService;
 import cn.lili.modules.promotion.entity.enums.PromotionApplyStatusEnum;
-import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
-import cn.lili.modules.promotion.entity.enums.SeckillApplyStatusEnum;
 import cn.lili.modules.promotion.entity.vos.SeckillApplyVO;
-import cn.lili.modules.promotion.entity.vos.SeckillVO;
 import cn.lili.modules.promotion.service.SeckillApplyService;
 import cn.lili.modules.promotion.service.SeckillService;
 import org.junit.jupiter.api.Assertions;
@@ -32,23 +29,27 @@ class SeckillTest {
    @Autowired
    private SeckillApplyService seckillApplyService;

+    @Autowired
+    private MemberService memberService;
+
    @Test
    void add() {
-        SeckillVO seckillVO = new SeckillVO();
-        seckillVO.setId("10000");
-        seckillVO.setStoreIds("132");
-        seckillVO.setSeckillApplyStatus(SeckillApplyStatusEnum.NOT_APPLY.name());
-        seckillVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
-        seckillVO.setApplyEndTime(DateUtil.parse("2021-09-06 14:20:00"));
-        seckillVO.setStartTime(DateUtil.parse("2021-09-06 14:22:00"));
-        seckillVO.setEndTime(DateUtil.parse("2021-09-06 23:59:00"));
-        seckillVO.setHours("15,17,19");
-        seckillVO.setPromotionName("Seckill" + seckillVO.getId());
-        seckillVO.setSeckillRule("rule" + seckillVO.getId());
-        seckillVO.setStoreId("1376433565247471616");
-        seckillVO.setStoreName("platform");
-
-        Assertions.assertTrue(seckillService.saveSeckill(seckillVO));
+//        SeckillVO seckillVO = new SeckillVO();
+//        seckillVO.setId("10000");
+//        seckillVO.setStoreIds("132");
+//        seckillVO.setSeckillApplyStatus(SeckillApplyStatusEnum.NOT_APPLY.name());
+//        seckillVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
+//        seckillVO.setApplyEndTime(DateUtil.parse("2021-09-06 14:20:00"));
+//        seckillVO.setStartTime(DateUtil.parse("2021-09-06 14:22:00"));
+//        seckillVO.setEndTime(DateUtil.parse("2021-09-06 23:59:00"));
+//        seckillVO.setHours("15,17,19");
+//        seckillVO.setPromotionName("Seckill" + seckillVO.getId());
+//        seckillVO.setSeckillRule("rule" + seckillVO.getId());
+//        seckillVO.setStoreId("1376433565247471616");
+//        seckillVO.setStoreName("platform");
+//
+//        Assertions.assertTrue(seckillService.saveSeckill(seckillVO));
+//        memberService.getUserInfo()
    }

    @Test