同步master，解决冲突

2021-07-27 10:00:34 +08:00
parent 2e2ba961d9 a407d3a539
commit 5a7440c5bf
1183 changed files with 2438 additions and 2673 deletions
--- a/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java
+++ b/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java
@@ -14,7 +14,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 * 买家API
 *
 * @author Chopper
- * @date 2020/11/16 10:03 下午
+ * @since 2020/11/16 10:03 下午
 */
@SpringBootApplication
@EnableJpaAuditing
--- a/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java
@@ -21,7 +21,7 @@ import java.util.List;
 * 买家端,商品分类接口
 *
 * @author Chopper
- * @date: 2020/11/16 10:05 下午
+ * @since: 2020/11/16 10:05 下午
 */
@RestController
@Api(tags = "买家端,商品分类接口")
--- a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
@@ -5,7 +5,6 @@ import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.distribution.service.DistributionService;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dto.GoodsSearchParams;
 import cn.lili.modules.goods.entity.vos.GoodsVO;
@@ -38,7 +37,7 @@ import java.util.Map;
 * 买家端,商品接口
 *
 * @author Chopper
- * @date 2020/11/16 10:06 下午
+ * @since 2020/11/16 10:06 下午
 */
@Slf4j
@Api(tags = "买家端,商品接口")
@@ -61,12 +60,6 @@ public class GoodsBuyerController {
     */
    @Autowired
    private EsGoodsSearchService goodsSearchService;
-    /**
-     * 分销员
-     */
-    @Autowired
-    private DistributionService distributionService;
-

    @ApiOperation(value = "通过id获取商品信息")
    @ApiImplicitParam(name = "goodsId", value = "商品ID", required = true, paramType = "path", dataType = "Long")
--- a/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java
@@ -27,7 +27,7 @@ import javax.validation.constraints.NotNull;
 * 买家端,买家优惠券接口
 *
 * @author paulG
- * @date 2020/11/17 3:35 下午
+ * @since 2020/11/17 3:35 下午
 */
@RestController
@Api(tags = "买家端,买家优惠券接口")
--- a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
@@ -19,7 +19,7 @@ import java.util.List;
 * 买家端,浏览历史接口
 *
 * @author Chopper
- * @date: 2020/11/16 10:06 下午
+ * @since: 2020/11/16 10:06 下午
 */
@RestController
@Api(tags = "买家端,浏览历史接口")
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java
@@ -20,7 +20,7 @@ import javax.validation.Valid;
 * 买家端,会员地址接口
 *
 * @author Bulbasaur
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "买家端,会员地址接口")
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java
@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
 * 买家端,会员收藏接口
 *
 * @author Chopper
- * @date: 2020/11/17 2:32 下午
+ * @since: 2020/11/17 2:32 下午
 */
@RestController
@Api(tags = "买家端,会员收藏接口")
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
@@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull;
 * 买家端,会员商品评价接口
 *
 * @author Bulbasaur
- * @date: 2020/11/16 10:08 下午
+ * @since: 2020/11/16 10:08 下午
 */
@RestController
@Api(tags = "买家端,会员商品评价接口")
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 * 买家端,会员站内消息接口
 *
 * @author Bulbasaur
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "买家端,会员站内消息接口")
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 * 买家端,会员发票接口
 *
 * @author paulG
- * @date: 2021-03-29 14:10:16
+ * @since: 2021-03-29 14:10:16
 */
@RestController
@Api(tags = "买家端,会员发票接口")
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java
@@ -18,7 +18,7 @@ import java.util.List;
 * 会员签到控制器
 *
 * @author pikachu
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "买家端，会员签到API")
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java
@@ -5,8 +5,8 @@ import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.verification.enums.VerificationEnums;
-import cn.lili.common.verification.service.VerificationService;
+import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.service.VerificationService;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dos.MemberWallet;
@@ -30,7 +30,7 @@ import javax.validation.constraints.Pattern;
 * 买家端,会员余额接口
 *
 * @author pikachu
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "买家端,会员余额接口")
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 买家端,余额提现记录接口
 *
 * @author pikachu
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "买家端,余额提现记录接口")
--- a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.member;

 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 买家端,会员积分历史接口
 *
 * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
 */
@RestController
@Api(tags = "买家端,会员积分历史接口")
--- a/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 买家端,预存款充值记录接口
 *
 * @author pikachu
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "买家端,预存款充值记录接口")
--- a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.member;

-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 买家端,会员站服务消息接口
 *
 * @author Chopper
- * @date: 2020/11/17 2:31 下午
+ * @since: 2020/11/17 2:31 下午
 */
@RestController
@RequestMapping("/service/notice")
--- a/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.other;

 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.system.entity.dos.AppVersion;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 买家端,APP版本
 *
 * @author Bulbasaur
- * @date: 2021/5/21 11:15 上午
+ * @since: 2021/5/21 11:15 上午
 */
@RestController
@Api(tags = "买家端,APP版本")
--- a/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java
@@ -25,7 +25,7 @@ import java.util.List;
 * 买家端,文章接口
 *
 * @author Chopper
- * @date: 2020/11/16 10:02 下午
+ * @since: 2020/11/16 10:02 下午
 */
@RestController
@Api(tags = "买家端,文章接口")
--- a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 买家端,意见反馈接口
 *
 * @author Bulbasaur
- * @date 2020-05-5 15:10:16
+ * @since 2020-05-5 15:10:16
 */
@RestController
@Api(tags = "买家端,意见反馈接口")
--- a/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java
@@ -17,7 +17,7 @@ import java.util.List;
 * 买家端,物流公司接口
 *
 * @author Bulbasaur
- * @date 2020-05-5 15:10:16
+ * @since 2020-05-5 15:10:16
 */
@RestController
@Api(tags = "买家端,物流公司接口")
--- a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 买家端,页面接口
 *
 * @author Chopper
- * @date 2020/11/16 10:08 下午
+ * @since 2020/11/16 10:08 下午
 */
@RestController
@Api(tags = "买家端,页面接口")
--- a/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 买家端,直播间接口
 *
 * @author Bulbasaur
- * @date: 2021/5/20 12:03 下午
+ * @since: 2021/5/20 12:03 下午
 */
@RestController
@Api(tags = "买家端,直播间接口")
--- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 * 买家端,分销员接口
 *
 * @author pikachu
- * @date: 2020/11/16 10:03 下午
+ * @since: 2020/11/16 10:03 下午
 */
@RestController
@Api(tags = "买家端,分销员接口")
--- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java
@@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull;
 * 买家端,分销商品佣金提现接口
 *
 * @author pikachu
- * @date: 2020/11/16 10:03 下午
+ * @since: 2020/11/16 10:03 下午
 */
@RestController
@Api(tags = "买家端,分销商品佣金提现接口")
--- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java
@@ -25,7 +25,7 @@ import javax.validation.constraints.NotNull;
 * 买家端,分销商品接口
 *
 * @author Bulbasaur
- * @date: 2020/11/16 10:06 下午
+ * @since: 2020/11/16 10:06 下午
 */
@RestController
@Api(tags = "买家端,分销商品接口")
--- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 买家端,分销商品佣金提现接口
 *
 * @author pikachu
- * @date: 2020/11/16 10:03 下午
+ * @since: 2020/11/16 10:03 下午
 */
@RestController
@Api(tags = "买家端,分销订单接口")
--- a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
@@ -2,10 +2,10 @@ package cn.lili.controller.passport;

 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.sms.SmsUtil;
+import cn.lili.modules.system.sms.SmsUtil;
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.verification.enums.VerificationEnums;
-import cn.lili.common.verification.service.VerificationService;
+import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.service.VerificationService;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dto.MemberEditDTO;
@@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull;
 * 买家端,会员接口
 *
 * @author Chopper
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "买家端,会员接口")
--- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java
@@ -17,7 +17,7 @@ import java.util.List;
 * 买家端,app/小程序 联合登录
 *
 * @author Chopper
- * @date 2020-11-25 19:29
+ * @since 2020-11-25 19:29
 */
@RestController
@Api(tags = "买家端,app/小程序 联合登录")
--- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
@@ -3,7 +3,7 @@ package cn.lili.controller.passport.connect;

 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.connect.entity.dto.AuthCallback;
@@ -29,7 +29,6 @@ import java.io.IOException;
 * 买家端,web联合登录
 *
 * @author Chopper
- * @date 2020-11-25 19:29
 */
@Slf4j
@RestController
--- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.passport.connect;

-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.connect.entity.dto.WechatMPLoginParams;
@@ -23,7 +23,7 @@ import java.util.List;
 * 买家端,小程序登录接口
 *
 * @author Chopper
- * @date 2021/2/19 09:28
+ * @since 2021/2/19 09:28
 */
@RestController
@RequestMapping("/buyer/mini-program")
--- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
 * 买家端,收银台接口
 *
 * @author Chopper
- * @date 2020-12-18 16:59
+ * @since 2020-12-18 16:59
 */
@Slf4j
@RestController
--- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java
@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
 * 买家端,退款回调
 *
 * @author Chopper
- * @date 2020-12-18 16:59
+ * @since 2020-12-18 16:59
 */
@Api(tags = "买家端,退款回调")
@RestController
--- a/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java
@@ -6,7 +6,7 @@ import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.entity.vos.PintuanMemberVO;
 import cn.lili.modules.promotion.entity.vos.PintuanShareVO;
 import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;
@@ -27,7 +27,7 @@ import java.util.List;
 * 买家端,拼团接口
 *
 * @author paulG
- * @date 2021/2/20
+ * @since 2021/2/20
 **/
@Api(tags = "买家端,拼团接口")
@RestController
--- a/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 买家端,积分商品接口
 *
 * @author paulG
- * @date 2021/1/19
+ * @since 2021/1/19
 **/
@RestController
@Api(tags = "买家端,积分商品接口")
--- a/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java
@@ -20,7 +20,7 @@ import java.util.List;
 * 买家端,秒杀活动接口
 *
 * @author paulG
- * @date 2020/11/17 2:30 下午
+ * @since 2020/11/17 2:30 下午
 */
@Api(tags = "买家端,秒杀活动接口")
@RestController
--- a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java
@@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull;
 * 买家端,采购接口
 *
 * @author Chopper
- * @date: 2020/11/16 10:06 下午
+ * @since: 2020/11/16 10:06 下午
 */
@Api(tags = "买家端,采购接口")
@RestController
--- a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java
@@ -18,7 +18,7 @@ import java.util.List;
 * 买家端,采购报价接口
 *
 * @author Bulbasaur
- * @date: 2020/11/16 10:06 下午
+ * @since: 2020/11/16 10:06 下午
 */
@Api(tags = "买家端,采购报价接口")
@RestController
--- a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java
@@ -4,8 +4,6 @@ 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.statistics.aop.PageViewPoint;
-import cn.lili.modules.statistics.aop.enums.PageViewEnum;
 import cn.lili.modules.store.entity.dto.StoreBankDTO;
 import cn.lili.modules.store.entity.dto.StoreCompanyDTO;
 import cn.lili.modules.store.entity.dto.StoreOtherInfoDTO;
@@ -29,7 +27,7 @@ import java.util.List;
 * 买家端,店铺接口
 *
 * @author Bulbasaur
- * @date: 2020/11/17 2:32 下午
+ * @since: 2020/11/17 2:32 下午
 */
@RestController
@RequestMapping("/buyer/store")
@@ -61,7 +59,6 @@ public class StoreBuyerController {
    @ApiOperation(value = "通过id获取店铺信息")
    @ApiImplicitParam(name = "id", value = "店铺ID", required = true, paramType = "path")
    @GetMapping(value = "/get/detail/{id}")
-    @PageViewPoint(type = PageViewEnum.STORE, id = "#id")
    public ResultMessage<StoreBasicInfoVO> detail(@NotNull @PathVariable String id) {
        return ResultUtil.data(storeDetailService.getStoreBasicInfoDTO(id));
    }
--- a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java
@@ -30,7 +30,7 @@ import java.util.List;
 * 买家端,售后管理接口
 *
 * @author Chopper
- * @date 2020/11/16 10:02 下午
+ * @since 2020/11/16 10:02 下午
 */
@RestController
@Api(tags = "买家端,售后管理接口")
@@ -95,7 +95,7 @@ public class AfterSaleBuyerController {
    public ResultMessage<AfterSale> delivery(@NotNull(message = "售后编号不能为空") @PathVariable("afterSaleSn") String afterSaleSn,
                                             @NotNull(message = "发货单号不能为空") @RequestParam String logisticsNo,
                                             @NotNull(message = "请选择物流公司") @RequestParam String logisticsId,
-                                             @NotNull(message = "请选择发货时间") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date mDeliverTime) {
+                                             @NotNull(message = "请选择发货时间") @RequestParam  @DateTimeFormat(pattern = "yyyy-MM-dd") Date mDeliverTime) {
        return ResultUtil.data(afterSaleService.buyerDelivery(afterSaleSn, logisticsNo, logisticsId, mDeliverTime));
    }

--- a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java
@@ -25,7 +25,7 @@ import javax.validation.constraints.NotNull;
 * 买家端，购物车接口
 *
 * @author Chopper
- * @date 2020/11/16 10:04 下午
+ * @since 2020/11/16 10:04 下午
 */
@Slf4j
@RestController
--- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java
@@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull;
 * 买家端,订单接口
 *
 * @author Chopper
- * @date 2020/11/16 10:08 下午
+ * @since 2020/11/16 10:08 下午
 */
@RestController
@Api(tags = "买家端,订单接口")
--- a/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java
@@ -21,7 +21,7 @@ import javax.validation.constraints.Min;
 * 买家端,预存款充值记录接口
 *
 * @author paulG
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "买家端,预存款充值记录接口")
--- a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java
@@ -2,7 +2,7 @@ package cn.lili.controller.trade;

 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 * 买家端,预存款变动日志记录接口
 *
 * @author pikachu
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
 */
@RestController
@Api(tags = "买家端,预存款变动日志记录接口")
--- a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java
+++ b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java
@@ -1,12 +1,12 @@
 package cn.lili.security;

 import cn.hutool.core.util.StrUtil;
-import cn.lili.common.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.Cache;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.token.SecretKeyUtil;
+import cn.lili.common.security.token.SecretKeyUtil;
 import cn.lili.common.utils.ResponseUtil;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;
@@ -35,8 +35,7 @@ import java.util.List;
 *
 * @author Chopper
 * @version v4.1
- * @date 2020/11/17 3:37 下午
- * @Description:
+ * @since 2020/11/17 3:37 下午
 * @since
 */
@Slf4j
--- a/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java
+++ b/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java
@@ -1,9 +1,9 @@
 package cn.lili.security;

-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.security.CustomAccessDeniedHandler;
 import cn.lili.common.utils.SpringContextUtil;
-import cn.lili.config.properties.IgnoredUrlsProperties;
+import cn.lili.common.properties.IgnoredUrlsProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -19,7 +19,6 @@ import org.springframework.web.cors.CorsConfigurationSource;
 *
 * @author Chopper
 * @version v4.0
- * @Description:
 * @since 2020/11/14 16:20
 */

--- a/buyer-api/src/main/resources/application.yml
+++ b/buyer-api/src/main/resources/application.yml
@@ -118,9 +118,9 @@ spring:
    #            standard:
    #              sharding-column: create_time
    #              #分表策略
-    #              precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
+    #              precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
    #              #范围查询实现
-    #              range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
+    #              range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
    props:
      #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
      sql:
--- a/buyer-api/src/test/resources/application.yml
+++ b/buyer-api/src/test/resources/application.yml
@@ -115,9 +115,9 @@ spring:
    #            standard:
    #              sharding-column: create_time
    #              #分表策略
-    #              precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
+    #              precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
    #              #范围查询实现
-    #              range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
+    #              range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
    props:
      #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
      sql: