diff --git a/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java b/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java
index 3e8f283b..41ee3d9e 100644
--- 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
diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java
index f36e14b8..49ed7429 100644
--- 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 = "买家端,商品分类接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
index b293b4fa..b299596d 100644
--- 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")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java
index 307b3f04..edb29fa9 100644
--- 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 = "买家端,买家优惠券接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
index 30d41365..4d7d73f2 100644
--- 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 = "买家端,浏览历史接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java
index aa7af08a..42cf0a6d 100644
--- 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 = "买家端,会员地址接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java
index 22a43a03..0c13c58e 100644
--- 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 = "买家端,会员收藏接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
index dc13e010..6801d9e5 100644
--- 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 = "买家端,会员商品评价接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java
index 0ca41606..d4f9520b 100644
--- 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 = "买家端,会员站内消息接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java
index 99b3c046..9f591e96 100644
--- 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 = "买家端,会员发票接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java
index eb55af7f..06c99504 100644
--- 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")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java
index 73716710..d9dac7f5 100644
--- 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 = "买家端,会员余额接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java
index 059485f5..28306be0 100644
--- 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 = "买家端,余额提现记录接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java
index 93c5f551..acea7dc5 100644
--- 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 = "买家端,会员积分历史接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java
index f22f0879..dc57af9f 100644
--- 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 = "买家端,预存款充值记录接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java
index ecd72e4e..25530f94 100644
--- 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")
diff --git a/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java
index 61354b6c..eef2a8c4 100644
--- 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版本")
diff --git a/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java
index 17d3c63a..bb0a4685 100644
--- 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 = "买家端,文章接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java
index 2f84439b..f47827db 100644
--- 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 = "买家端,意见反馈接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java
index 5c9e62d5..36c798cf 100644
--- 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 = "买家端,物流公司接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java
index 54726ff2..35b262a8 100644
--- 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 = "买家端,页面接口")
diff --git 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
index 23e37f8a..121f50ce 100644
--- 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 = "买家端,直播间接口")
diff --git 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
index edc3d3f0..515c49a2 100644
--- 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 = "买家端,分销员接口")
diff --git 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
index d79adfe9..5030d8e4 100644
--- 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 = "买家端,分销商品佣金提现接口")
diff --git 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
index 2a97f34b..eafb4250 100644
--- 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 = "买家端,分销商品接口")
diff --git 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
index 9f7b32b8..30a46f49 100644
--- 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 = "买家端,分销订单接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
index aeae60d6..7528ff04 100644
--- 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 = "买家端,会员接口")
diff --git 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
index c6b01fbe..7557e952 100644
--- 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/小程序 联合登录")
diff --git 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
index 03efbbc9..8e3264b3 100644
--- 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
diff --git 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
index bd3db44d..f7c63f4a 100644
--- 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")
diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
index 0ba33e91..389b7e3f 100644
--- 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
diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java
index 1efa16a6..e39c7225 100644
--- 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
diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java
index 53e6ce6c..9ec1ed22 100644
--- 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
diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java
index 4b1d722a..6bd0ee33 100644
--- 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 = "买家端,积分商品接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java
index 466bc376..7a64747d 100644
--- 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
diff --git a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java
index a3974480..4a7a3318 100644
--- 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
diff --git a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java
index e990e00d..facb7063 100644
--- 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
diff --git a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java
index 32120938..c3d824d4 100644
--- 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));
     }
diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java
index 12a18716..bc16e587 100644
--- 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));
     }
 
diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java b/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java
index 3ae85451..ef62421c 100644
--- 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
diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java
index dbb2ac27..ca35081e 100644
--- 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 = "买家端,订单接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java
index 9af8a36a..5f2466dc 100644
--- 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 = "买家端,预存款充值记录接口")
diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java
index aabb6b58..aa1708ec 100644
--- 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 = "买家端,预存款变动日志记录接口")
diff --git a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java
index 2b7134af..7372a7d2 100755
--- 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
diff --git a/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java b/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java
index 779e0d78..8ba35de5 100644
--- 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
  */
 
diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml
index 61b5b4fb..f40984b4 100644
--- 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:
diff --git a/buyer-api/src/test/resources/application.yml b/buyer-api/src/test/resources/application.yml
index 9484829b..ae1c4687 100644
--- 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:
diff --git a/common-api/src/main/java/cn/lili/CommonApiApplication.java b/common-api/src/main/java/cn/lili/CommonApiApplication.java
index c97858ec..ceeefb59 100644
--- a/common-api/src/main/java/cn/lili/CommonApiApplication.java
+++ b/common-api/src/main/java/cn/lili/CommonApiApplication.java
@@ -8,7 +8,7 @@ import org.springframework.cache.annotation.EnableCaching;
  * 基础API
  *
  * @author Chopper
- * @date 2020/11/17 3:38 下午
+ * @since 2020/11/17 3:38 下午
  */
 @EnableCaching
 @SpringBootApplication
diff --git a/common-api/src/main/java/cn/lili/controller/common/FileController.java b/common-api/src/main/java/cn/lili/controller/common/FileController.java
index 20e33256..84df93ff 100644
--- a/common-api/src/main/java/cn/lili/controller/common/FileController.java
+++ b/common-api/src/main/java/cn/lili/controller/common/FileController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.common;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
@@ -27,7 +27,7 @@ import java.util.List;
  * 文件管理管理接口
  *
  * @author Chopper
- * @date 2020/11/26 15:41
+ * @since 2020/11/26 15:41
  */
 @RestController
 @Api(tags = "文件管理管理接口")
diff --git a/common-api/src/main/java/cn/lili/controller/common/LogoController.java b/common-api/src/main/java/cn/lili/controller/common/LogoController.java
index b3825ddf..63595430 100644
--- a/common-api/src/main/java/cn/lili/controller/common/LogoController.java
+++ b/common-api/src/main/java/cn/lili/controller/common/LogoController.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 文件管理管理接口
  *
  * @author Chopper
- * @date 2020/11/26 15:41
+ * @since 2020/11/26 15:41
  */
 @RestController
 @Api(tags = "文件管理管理接口")
diff --git a/common-api/src/main/java/cn/lili/controller/common/RegionController.java b/common-api/src/main/java/cn/lili/controller/common/RegionController.java
index 96a45dee..0ddc11cc 100644
--- a/common-api/src/main/java/cn/lili/controller/common/RegionController.java
+++ b/common-api/src/main/java/cn/lili/controller/common/RegionController.java
@@ -19,7 +19,6 @@ import java.util.List;
  * 地址信息接口
  *
  * @author Chopper
- * @date: 2020/11/16 10:07 下午
  */
 @RestController
 @Api(tags = "地址信息接口")
diff --git a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java
index b41d0ace..640ffec9 100644
--- a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java
+++ b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java
@@ -1,11 +1,11 @@
 package cn.lili.controller.common;
 
-import cn.lili.common.aop.limiter.annotation.LimitPoint;
+import cn.lili.cache.limit.annotation.LimitPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
  * 滑块验证码接口
  *
  * @author Chopper
- * @date 2020/11/26 15:41
+ * @since 2020/11/26 15:41
  */
 @Slf4j
 @RestController
diff --git a/common-api/src/main/java/cn/lili/controller/common/SmsController.java b/common-api/src/main/java/cn/lili/controller/common/SmsController.java
index cfec27ab..70f5bfab 100644
--- a/common-api/src/main/java/cn/lili/controller/common/SmsController.java
+++ b/common-api/src/main/java/cn/lili/controller/common/SmsController.java
@@ -1,12 +1,12 @@
 package cn.lili.controller.common;
 
-import cn.lili.common.aop.limiter.annotation.LimitPoint;
+import cn.lili.cache.limit.annotation.LimitPoint;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  * 短信验证码接口
  *
  * @author Chopper
- * @date 2020/11/26 15:41
+ * @since 2020/11/26 15:41
  */
 @RestController
 @Api(tags = "短信验证码接口")
diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java
index d4f5cdfd..82003a58 100644
--- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java
+++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.common;
 
 import cn.hutool.core.util.StrUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
@@ -12,7 +12,7 @@ import cn.lili.common.utils.CommonUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.config.properties.SystemSetting;
+import cn.lili.common.properties.SystemSettingProperties;
 import cn.lili.modules.file.entity.File;
 import cn.lili.modules.file.plugin.FileManagerPlugin;
 import cn.lili.modules.file.service.FileService;
@@ -35,7 +35,7 @@ import java.io.InputStream;
  * 文件上传接口
  *
  * @author Chopper
- * @date 2020/11/26 15:41
+ * @since 2020/11/26 15:41
  */
 @Slf4j
 @RestController
@@ -53,7 +53,7 @@ public class UploadController {
     private Cache cache;
 
     @Autowired
-    private SystemSetting systemSetting;
+    private SystemSettingProperties systemSettingProperties;
 
     @ApiOperation(value = "文件上传")
     @PostMapping(value = "/file")
@@ -109,6 +109,6 @@ public class UploadController {
     @ApiOperation(value = "返回licences")
     @PostMapping(value = "/licences")
     public ResultMessage<Object> licences() {
-        return ResultUtil.data(systemSetting.getLicences());
+        return ResultUtil.data(systemSettingProperties.getLicences());
     }
 }
diff --git a/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java b/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java
index a3cd9e4c..8fa1f8c2 100644
--- a/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java
+++ b/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java
@@ -1,8 +1,8 @@
 package cn.lili.controller.security;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.security.CustomAccessDeniedHandler;
-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;
@@ -17,7 +17,6 @@ import org.springframework.web.cors.CorsConfigurationSource;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/11/14 16:20
  */
 @Slf4j
diff --git a/common-api/src/main/resources/application.yml b/common-api/src/main/resources/application.yml
index 0d48f2ae..c2ae1440 100644
--- a/common-api/src/main/resources/application.yml
+++ b/common-api/src/main/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:
diff --git a/config/application.yml b/config/application.yml
index ac7cef1e..5bab1fcc 100644
--- a/config/application.yml
+++ b/config/application.yml
@@ -112,9 +112,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:
diff --git a/consumer/src/main/java/cn/lili/ConsumerApplication.java b/consumer/src/main/java/cn/lili/ConsumerApplication.java
index afa05d8e..5b0ef78c 100644
--- a/consumer/src/main/java/cn/lili/ConsumerApplication.java
+++ b/consumer/src/main/java/cn/lili/ConsumerApplication.java
@@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * 消费者
  *
  * @author Chopper
- * @date 2020/11/16 10:03 下午
+ * @since 2020/11/16 10:03 下午
  */
 @SpringBootApplication
 public class ConsumerApplication {
diff --git a/consumer/src/main/java/cn/lili/event/AfterSaleStatusChangeEvent.java b/consumer/src/main/java/cn/lili/event/AfterSaleStatusChangeEvent.java
index 9524e265..0229cfb0 100644
--- a/consumer/src/main/java/cn/lili/event/AfterSaleStatusChangeEvent.java
+++ b/consumer/src/main/java/cn/lili/event/AfterSaleStatusChangeEvent.java
@@ -7,7 +7,7 @@ import cn.lili.modules.order.order.entity.dos.AfterSale;
  * 售后单改变状态
  *
  * @author Chopper
- * @date 2020/11/17 7:13 下午
+ * @since 2020/11/17 7:13 下午
  */
 public interface AfterSaleStatusChangeEvent {
 
diff --git a/consumer/src/main/java/cn/lili/event/GoodsCommentCompleteEvent.java b/consumer/src/main/java/cn/lili/event/GoodsCommentCompleteEvent.java
index 4ec0abfe..70c808a7 100644
--- a/consumer/src/main/java/cn/lili/event/GoodsCommentCompleteEvent.java
+++ b/consumer/src/main/java/cn/lili/event/GoodsCommentCompleteEvent.java
@@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dos.MemberEvaluation;
  * 订单状态改变事件
  *
  * @author Chopper
- * @date 2020/11/17 7:13 下午
+ * @since 2020/11/17 7:13 下午
  */
 public interface GoodsCommentCompleteEvent {
 
diff --git a/consumer/src/main/java/cn/lili/event/MemberPointChangeEvent.java b/consumer/src/main/java/cn/lili/event/MemberPointChangeEvent.java
index 3a87ddfa..7b9802fe 100644
--- a/consumer/src/main/java/cn/lili/event/MemberPointChangeEvent.java
+++ b/consumer/src/main/java/cn/lili/event/MemberPointChangeEvent.java
@@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dto.MemberPointMessage;
  * 会员积分改变消息
  *
  * @author Chopper
- * @date 2020/11/17 7:13 下午
+ * @since 2020/11/17 7:13 下午
  */
 public interface MemberPointChangeEvent {
 
diff --git a/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java b/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java
index e9a32947..eef3231e 100644
--- a/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java
+++ b/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java
@@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dos.Member;
  * 会员注册消息
  *
  * @author Chopper
- * @date 2020/11/17 7:13 下午
+ * @since 2020/11/17 7:13 下午
  */
 public interface MemberRegisterEvent {
 
diff --git a/consumer/src/main/java/cn/lili/event/MemberWithdrawalEvent.java b/consumer/src/main/java/cn/lili/event/MemberWithdrawalEvent.java
index 2738692a..0a2b333d 100644
--- a/consumer/src/main/java/cn/lili/event/MemberWithdrawalEvent.java
+++ b/consumer/src/main/java/cn/lili/event/MemberWithdrawalEvent.java
@@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
  * 会员提现消息
  *
  * @author Chopper
- * @date 2020/11/17 7:13 下午
+ * @since 2020/11/17 7:13 下午
  */
 public interface MemberWithdrawalEvent {
 
diff --git a/consumer/src/main/java/cn/lili/event/OrderStatusChangeEvent.java b/consumer/src/main/java/cn/lili/event/OrderStatusChangeEvent.java
index f1598758..f370392c 100644
--- a/consumer/src/main/java/cn/lili/event/OrderStatusChangeEvent.java
+++ b/consumer/src/main/java/cn/lili/event/OrderStatusChangeEvent.java
@@ -6,7 +6,7 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage;
  * 订单状态改变事件
  *
  * @author Chopper
- * @date 2020/11/17 7:13 下午
+ * @since 2020/11/17 7:13 下午
  */
 public interface OrderStatusChangeEvent {
 
diff --git a/consumer/src/main/java/cn/lili/event/TradeEvent.java b/consumer/src/main/java/cn/lili/event/TradeEvent.java
index 87316758..8d51eb13 100644
--- a/consumer/src/main/java/cn/lili/event/TradeEvent.java
+++ b/consumer/src/main/java/cn/lili/event/TradeEvent.java
@@ -6,7 +6,7 @@ import cn.lili.modules.order.cart.entity.dto.TradeDTO;
  * 订单创建消息
  *
  * @author Chopper
- * @date 2021/2/2 15:15
+ * @since 2021/2/2 15:15
  */
 public interface TradeEvent {
 
diff --git a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java
index 21fe71f1..d917bc83 100644
--- a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java
@@ -22,7 +22,7 @@ import javax.annotation.Resource;
  * 分销订单入库
  *
  * @author Chopper
- * @date 2020-07-03 11:20
+ * @since 2020-07-03 11:20
  */
 @Slf4j
 @Service
diff --git a/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java b/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java
index 1d465dac..6d91e9e7 100644
--- a/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
  * 商品SKU变化
  *
  * @author Chopper
- * @date 2020-07-03 11:20
+ * @since 2020-07-03 11:20
  */
 @Service
 public class GoodsSkuExecute implements GoodsCommentCompleteEvent {
diff --git a/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java b/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java
index 7fa3318a..883e3e70 100644
--- a/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Service;
  * 会员经验值
  *
  * @author Bulbasaur
- * @date: 2021/5/16 11:16 下午
+ * @since: 2021/5/16 11:16 下午
  */
 @Service
 public class MemberExperienceExecute implements MemberRegisterEvent, GoodsCommentCompleteEvent, OrderStatusChangeEvent {
diff --git a/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java b/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
index 6891833d..71cd6d01 100644
--- a/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
  * 会员积分
  *
  * @author Bulbasaur
- * @date 2020-07-03 11:20
+ * @since 2020-07-03 11:20
  */
 @Service
 public class MemberPointExecute implements MemberRegisterEvent, GoodsCommentCompleteEvent, OrderStatusChangeEvent, AfterSaleStatusChangeEvent {
diff --git a/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java b/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java
index d4c8fa3b..99703c25 100644
--- a/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * 会员钱包创建
  *
  * @author Chopper
- * @date 2020-07-03 11:20
+ * @since 2020-07-03 11:20
  */
 @Service
 public class MemberWalletExecute implements MemberRegisterEvent {
diff --git a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
index 29bbec5a..b8f89811 100644
--- a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
@@ -1,6 +1,7 @@
 package cn.lili.event.impl;
 
 import cn.lili.event.*;
+import cn.lili.modules.distribution.entity.enums.DistributionCashStatusEnum;
 import cn.lili.modules.member.entity.dto.MemberPointMessage;
 import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
 import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
@@ -27,7 +28,7 @@ import java.util.Map;
  * 通知类消息实现
  *
  * @author Chopper
- * @date 2020-07-03 11:20
+ * @since 2020-07-03 11:20
  **/
 @Service
 public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent, AfterSaleStatusChangeEvent, MemberPointChangeEvent, MemberWithdrawalEvent {
@@ -171,27 +172,58 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent,
 
     @Override
     public void memberWithdrawal(MemberWithdrawalMessage memberWithdrawalMessage) {
-
-        //如果提现到余额
-        if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) {
-
-            //组织参数
-            NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
-            noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
-            Map<String, String> params = new HashMap<>(2);
-            params.put("income", memberWithdrawalMessage.getPrice().toString());
-            noticeMessageDTO.setParameter(params);
-            noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_SUCCESS);
-            //发送提现申请成功消息
-            noticeMessageService.noticeMessage(noticeMessageDTO);
-
-            params.put("income", memberWithdrawalMessage.getPrice().toString());
-            params.put("expenditure", "0");
-            noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_CHANGE);
-            noticeMessageDTO.setParameter(params);
-            //发送余额变动消息
-            noticeMessageService.noticeMessage(noticeMessageDTO);
+        //如果提现状态为申请则发送申请提现站内消息
+        if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.APPLY.name())){
+            //如果提现到余额
+            if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) {
+                NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
+                noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
+                noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_CREATE);
+                Map<String, String> params = new HashMap<>(2);
+                params.put("price", memberWithdrawalMessage.getPrice().toString());
+                noticeMessageDTO.setParameter(params);
+                //发送提现申请成功消息
+                noticeMessageService.noticeMessage(noticeMessageDTO);
+            }
         }
+        //如果提现状态为通过则发送审核通过站内消息
+        if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.PASS.name())){
+            //如果提现到余额
+            if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) {
+                //组织参数
+                NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
+                noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
+                Map<String, String> params = new HashMap<>(2);
+                params.put("income", memberWithdrawalMessage.getPrice().toString());
+                noticeMessageDTO.setParameter(params);
+                noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_SUCCESS);
+                //发送提现成功消息
+                noticeMessageService.noticeMessage(noticeMessageDTO);
+
+                params.put("income", memberWithdrawalMessage.getPrice().toString());
+                params.put("expenditure", "0");
+                noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_CHANGE);
+                noticeMessageDTO.setParameter(params);
+                //发送余额变动消息
+                noticeMessageService.noticeMessage(noticeMessageDTO);
+            }
+        }
+        //如果提现状态为拒绝则发送审核拒绝站内消息
+        if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.REFUSE.name())){
+            //如果提现到余额
+            if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) {
+                NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
+                noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
+                noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_ERROR);
+                Map<String, String> params = new HashMap<>(2);
+                params.put("price", memberWithdrawalMessage.getPrice().toString());
+                noticeMessageDTO.setParameter(params);
+                //发送提现申请成功消息
+                noticeMessageService.noticeMessage(noticeMessageDTO);
+            }
+        }
+
+
 
 
     }
diff --git a/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java b/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java
index ca5ced61..36826a60 100644
--- a/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java
@@ -19,7 +19,7 @@ import java.util.List;
  * 订单创建发票相关处理
  *
  * @author Chopper
- * @date 2020-07-03 11:20
+ * @since 2020-07-03 11:20
  **/
 @Service
 public class OrderCreateReceiptExecute implements TradeEvent {
diff --git a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
index 8d99bace..93f80a0c 100644
--- a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
  * 订单状态处理类
  *
  * @author Chopper
- * @date 2020-07-03 11:20
+ * @since 2020-07-03 11:20
  **/
 @Service
 public class OrderStatusHandlerExecute implements TradeEvent {
diff --git a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java
index 33819f7c..47df9720 100644
--- a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
  * 支付
  *
  * @author Chopper
- * @date 2021-03-13 16:58
+ * @since 2021-03-13 16:58
  */
 @Slf4j
 @Service
diff --git a/consumer/src/main/java/cn/lili/event/impl/RegisteredCouponActivityExecute.java b/consumer/src/main/java/cn/lili/event/impl/RegisteredCouponActivityExecute.java
index 9eabd094..1f7a55b0 100644
--- a/consumer/src/main/java/cn/lili/event/impl/RegisteredCouponActivityExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/RegisteredCouponActivityExecute.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 注册赠券活动
  *
  * @author Bulbasaur
- * @date: 2021/5/24 10:48 上午
+ * @since: 2021/5/24 10:48 上午
  */
 @Component
 public class RegisteredCouponActivityExecute implements MemberRegisterEvent {
diff --git a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java
index 402b74f0..4752032f 100644
--- a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java
@@ -1,7 +1,7 @@
 package cn.lili.event.impl;
 
 import cn.hutool.core.convert.Convert;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.event.OrderStatusChangeEvent;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsSkuService;
@@ -11,7 +11,7 @@ import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
 import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.service.PromotionGoodsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ import java.util.List;
  * 库存扣减，他表示了订单状态是否出库成功
  *
  * @author Chopper
- * @date 2020-07-03 11:20
+ * @since 2020-07-03 11:20
  */
 @Slf4j
 @Service
@@ -161,6 +161,11 @@ public class StockUpdateExecute implements OrderStatusChangeEvent {
     /**
      * 同步库存和促销库存
      *
+     * 需修改：DB：商品库存、Sku商品库存、活动商品库存
+     * 1.获取需要修改的Sku列表、活动商品列表
+     * 2.写入sku商品库存，批量修改
+     * 3.写入促销商品的卖出数量、剩余数量,批量修改
+     * 4.调用方法修改商品库存
      * @param order 订单
      */
     private void synchroDB(OrderDetailVO order) {
@@ -179,6 +184,7 @@ public class StockUpdateExecute implements OrderStatusChangeEvent {
             skuKeys.add(GoodsSkuService.getStockCacheKey(orderItem.getSkuId()));
             GoodsSku goodsSku = new GoodsSku();
             goodsSku.setId(orderItem.getSkuId());
+            goodsSku.setGoodsId(orderItem.getGoodsId());
             //如果有促销信息
             if (null != orderItem.getPromotionType() && null != orderItem.getPromotionId()) {
                 //如果促销有库存信息
diff --git a/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java b/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java
index 0b696158..a5177012 100644
--- a/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Component;
  * 虚拟商品
  *
  * @author Bulbasaur
- * @date: 2021/5/29 9:17 上午
+ * @since: 2021/5/29 9:17 上午
  */
 @Component
 public class VerificationOrderExecute implements OrderStatusChangeEvent {
diff --git a/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java b/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java
index da5a5fa9..ed0ee8a7 100644
--- a/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java
+++ b/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java
@@ -1,7 +1,7 @@
 package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.rocketmq.tags.AfterSaleTagsEnum;
+import cn.lili.rocketmq.tags.AfterSaleTagsEnum;
 import cn.lili.event.AfterSaleStatusChangeEvent;
 import cn.lili.modules.order.order.entity.dos.AfterSale;
 import lombok.extern.slf4j.Slf4j;
diff --git a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
index e0f24d7b..5a9c67ad 100644
--- a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
+++ b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
@@ -1,7 +1,7 @@
 package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.event.GoodsCommentCompleteEvent;
 import cn.lili.modules.distribution.entity.dos.DistributionGoods;
 import cn.lili.modules.distribution.entity.dos.DistributionSelectedGoods;
diff --git a/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java b/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java
index 4cc3b8fa..48800bb5 100644
--- a/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java
+++ b/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java
@@ -1,7 +1,7 @@
 package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.rocketmq.tags.MemberTagsEnum;
+import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.event.MemberPointChangeEvent;
 import cn.lili.event.MemberRegisterEvent;
 import cn.lili.event.MemberWithdrawalEvent;
diff --git a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java
index fe7a4a21..df5104a8 100644
--- a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java
+++ b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java
@@ -2,8 +2,8 @@ package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.SwitchEnum;
-import cn.lili.common.rocketmq.tags.OtherTagsEnum;
-import cn.lili.common.sms.SmsUtil;
+import cn.lili.rocketmq.tags.OtherTagsEnum;
+import cn.lili.modules.system.sms.SmsUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.vo.MemberSearchVO;
diff --git a/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java b/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java
index 508ec62c..21744c81 100644
--- a/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java
+++ b/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java
@@ -1,8 +1,8 @@
 package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
-import cn.lili.common.rocketmq.tags.MqOrderTagsEnum;
+import cn.lili.cache.Cache;
+import cn.lili.rocketmq.tags.MqOrderTagsEnum;
 import cn.lili.event.OrderStatusChangeEvent;
 import cn.lili.event.TradeEvent;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/EveryDayExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/EveryDayExecute.java
index dd927f90..e5fc9a59 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/EveryDayExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/EveryDayExecute.java
@@ -5,7 +5,7 @@ package cn.lili.timetask.handler;
  * 每日凌晨1点执行
  *
  * @author Chopper
- * @date 2020/12/24 11:52
+ * @since 2020/12/24 11:52
  */
 public interface EveryDayExecute {
 
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/EveryHourExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/EveryHourExecute.java
index 9ebc83d8..46042203 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/EveryHourExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/EveryHourExecute.java
@@ -4,7 +4,7 @@ package cn.lili.timetask.handler;
  * 每小时任务
  *
  * @author Chopper
- * @date 2020/12/24 11:52
+ * @since 2020/12/24 11:52
  */
 public interface EveryHourExecute {
 
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/EveryMinuteExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/EveryMinuteExecute.java
index 4d7e08c8..e1960e24 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/EveryMinuteExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/EveryMinuteExecute.java
@@ -4,7 +4,7 @@ package cn.lili.timetask.handler;
  * 每分钟任务
  *
  * @author Chopper
- * @date 2020/12/24 11:52
+ * @since 2020/12/24 11:52
  */
 public interface EveryMinuteExecute {
 
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java
index c32087ba..f197ab07 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 店铺结算执行
  *
  * @author Bulbasaur
- * @date 2021/2/18 3:45 下午
+ * @since 2021/2/18 3:45 下午
  */
 @Component
 public class BillExecute implements EveryDayExecute {
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java
index 3f3b5c70..69043a2d 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
  * 小程序直播状态获取
  *
  * @author Bulbasaur
- * @date: 2021/5/20 2:52 下午
+ * @since: 2021/5/20 2:52 下午
  */
 @Component
 public class BroadcastExecute implements EveryHourExecute {
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java
index 68a66e98..bb56133c 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
  * 优惠券状态监测
  *
  * @author Bulbasaur
- * @date: 2021/5/24 10:08 上午
+ * @since: 2021/5/24 10:08 上午
  */
 @Component
 public class CouponExecute implements EveryDayExecute {
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java
index 04a3bbca..85a68132 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java
@@ -18,7 +18,7 @@ import java.util.Map;
  * 商品定时器
  *
  * @author Chopper
- * @date 2021/3/18 3:23 下午
+ * @since 2021/3/18 3:23 下午
  */
 @Component
 public class GoodsExecute implements EveryDayExecute {
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/hotwords/HotWordsEveryDayTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/hotwords/HotWordsEveryDayTaskExecute.java
new file mode 100644
index 00000000..a6e99c32
--- /dev/null
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/hotwords/HotWordsEveryDayTaskExecute.java
@@ -0,0 +1,30 @@
+package cn.lili.timetask.handler.impl.hotwords;
+
+import cn.lili.cache.Cache;
+import cn.lili.cache.CachePrefix;
+import cn.lili.timetask.handler.EveryDayExecute;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author paulG
+ * @since 2021/3/11
+ **/
+@Slf4j
+@Component
+public class HotWordsEveryDayTaskExecute implements EveryDayExecute {
+
+    @Autowired
+    private Cache cache;
+
+    /**
+     * 执行每日任务
+     */
+    @Override
+    public void execute() {
+        //移除昨日的热搜词
+        cache.remove(CachePrefix.HOT_WORD.getPrefix());
+    }
+
+}
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java
index 31c5e587..84e34132 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java
@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
  * 订单自动取消（每分钟执行）
  *
  * @author paulG
- * @date 2021/3/11
+ * @since 2021/3/11
  **/
 @Slf4j
 @Component
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
index 482963fb..4b397e38 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
@@ -33,7 +33,7 @@ import java.util.List;
  * 促销活动每日定时器
  *
  * @author Chopper
- * @date 2021/3/18 3:23 下午
+ * @since 2021/3/18 3:23 下午
  */
 @Slf4j
 @Component
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java
index a7d766dc..c939a334 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java
@@ -14,7 +14,7 @@ import java.util.Date;
  * 会员数据统计
  *
  * @author Chopper
- * @date 2021-03-02 14:56
+ * @since 2021-03-02 14:56
  */
 @Slf4j
 @Component
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java
index 2b80be56..0dec275b 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java
@@ -1,9 +1,9 @@
 package cn.lili.timetask.handler.impl.statistics;
 
-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.enums.UserEnums;
-import cn.lili.config.properties.StatisticsProperties;
+import cn.lili.common.properties.StatisticsProperties;
 import cn.lili.modules.statistics.model.vo.OnlineMemberVO;
 import cn.lili.timetask.handler.EveryHourExecute;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +19,7 @@ import java.util.stream.Collectors;
  * 实时在线人数统计
  *
  * @author Chopper
- * @date 2021-02-21 09:47
+ * @since 2021-02-21 09:47
  */
 @Component
 public class OnlineMemberStatistics implements EveryHourExecute {
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java
index 963ae544..d648c6a1 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java
@@ -21,7 +21,7 @@ import java.util.List;
  * 店铺评分
  *
  * @author Chopper
- * @date 2021/3/15 5:30 下午
+ * @since 2021/3/15 5:30 下午
  */
 @Component
 public class StoreRatingExecute implements EveryDayExecute {
diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java
index b39e455f..edd45045 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java
@@ -1,8 +1,8 @@
 package cn.lili.timetask.handler.impl.view;
 
 import cn.hutool.core.convert.Convert;
-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.utils.BeanUtil;
 import cn.lili.modules.statistics.model.dos.PlatformViewData;
 import cn.lili.modules.statistics.service.PlatformViewDataService;
@@ -23,7 +23,7 @@ import java.util.List;
  * 统计 入库
  *
  * @author Chopper
- * @date 2021-01-15 18:20
+ * @since 2021-01-15 18:20
  */
 @Slf4j
 @Component
diff --git a/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java b/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java
index 9ddf2435..2ac74f98 100644
--- a/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java
+++ b/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java
@@ -1,7 +1,7 @@
 package cn.lili.trigger;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.ThreadPoolUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java b/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java
index f0910140..f53371a9 100644
--- a/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java
+++ b/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java
@@ -1,9 +1,9 @@
 package cn.lili.trigger;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.cache.Cache;
+import cn.lili.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.util.DelayQueueTools;
 import cn.lili.common.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
  * 事件触发消费者
  *
  * @author paulG
- * @date 2020/11/17 7:19 下午
+ * @since 2020/11/17 7:19 下午
  */
 @Component
 @Slf4j
diff --git a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
index b421b129..c7d74cf9 100644
--- a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
+++ b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
@@ -1,8 +1,8 @@
 package cn.lili.trigger.executor;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.delayqueue.BroadcastMessage;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.message.BroadcastMessage;
+import cn.lili.trigger.model.TimeExecuteConstant;
 import cn.lili.modules.goods.service.StudioService;
 import cn.lili.trigger.TimeTriggerExecutor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
  * 直播间事件触发
  *
  * @author Bulbasaur
- * @date: 2021/6/1 5:02 下午
+ * @since: 2021/6/1 5:02 下午
  */
 @Slf4j
 @Component(TimeExecuteConstant.BROADCAST_EXECUTOR)
diff --git a/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java
index ddb90e51..bc331eb9 100644
--- a/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java
+++ b/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java
@@ -1,13 +1,13 @@
 package cn.lili.trigger.executor;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.interfaces.TimeTrigger;
 import cn.lili.trigger.TimeTriggerExecutor;
-import cn.lili.common.trigger.message.PintuanOrderMessage;
-import cn.lili.common.trigger.message.PromotionMessage;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.trigger.message.PintuanOrderMessage;
+import cn.lili.trigger.message.PromotionMessage;
+import cn.lili.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeTriggerMsg;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
 import cn.lili.modules.promotion.service.PromotionService;
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Chopper
  * @version v4.1
- * @date 2020/11/17 7:20 下午
+ * @since 2020/11/17 7:20 下午
  */
 @Slf4j
 @Component(TimeExecuteConstant.PROMOTION_EXECUTOR)
diff --git a/consumer/src/main/java/cn/lili/trigger/listen/PromotionDelayQueueListen.java b/consumer/src/main/java/cn/lili/trigger/listen/PromotionDelayQueueListen.java
index 4466aa97..4b2845b0 100644
--- a/consumer/src/main/java/cn/lili/trigger/listen/PromotionDelayQueueListen.java
+++ b/consumer/src/main/java/cn/lili/trigger/listen/PromotionDelayQueueListen.java
@@ -1,9 +1,9 @@
 package cn.lili.trigger.listen;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.trigger.enums.DelayQueueEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.enums.DelayQueueEnums;
+import cn.lili.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.model.TimeTriggerMsg;
 import cn.lili.trigger.AbstractDelayQueueListen;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/consumer/src/main/resources/application.yml b/consumer/src/main/resources/application.yml
index d50be0e6..dd50c558 100644
--- a/consumer/src/main/resources/application.yml
+++ b/consumer/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:
diff --git a/framework/pom.xml b/framework/pom.xml
index ded46f47..9568b25d 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -63,21 +63,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
-        <!-- Thymeleaf -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
         <!-- JPA -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-        <!-- Websocket -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
+<!--        &lt;!&ndash; Websocket &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-websocket</artifactId>-->
+<!--        </dependency>-->
         <!-- MybatisPlus -->
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/framework/src/main/java/cn/lili/common/cache/Cache.java b/framework/src/main/java/cn/lili/cache/Cache.java
similarity index 76%
rename from framework/src/main/java/cn/lili/common/cache/Cache.java
rename to framework/src/main/java/cn/lili/cache/Cache.java
index 25d919ce..cd475d4d 100644
--- a/framework/src/main/java/cn/lili/common/cache/Cache.java
+++ b/framework/src/main/java/cn/lili/cache/Cache.java
@@ -1,4 +1,4 @@
-package cn.lili.common.cache;
+package cn.lili.cache;
 
 
 import org.springframework.data.redis.core.ZSetOperations;
@@ -19,7 +19,7 @@ public interface Cache<T> {
     /**
      * Get an item from the cache, nontransactionally
      *
-     * @param key
+     * @param key 缓存key
      * @return the cached object or <tt>null</tt>
      */
     T get(Object key);
@@ -27,7 +27,7 @@ public interface Cache<T> {
     /**
      * Get an item from the cache, nontransactionally
      *
-     * @param key
+     * @param key 缓存key
      * @return the cached object or <tt>null</tt>
      */
     String getString(Object key);
@@ -37,14 +37,14 @@ public interface Cache<T> {
      * multiGet
      *
      * @param keys 要查询的key集合
-     * @return
+     * @return 集合
      */
     List multiGet(Collection keys);
 
     /**
      * 批量set
      *
-     * @param map
+     * @param map 键值对
      */
     void multiSet(Map map);
 
@@ -60,16 +60,16 @@ public interface Cache<T> {
      * Add an item to the cache, nontransactionally, with
      * failfast semantics
      *
-     * @param key
-     * @param value
+     * @param key   缓存key
+     * @param value 缓存value
      */
     void put(Object key, T value);
 
     /**
      * 往缓存中写入内容
      *
-     * @param key
-     * @param value
+     * @param key   缓存key
+     * @param value 缓存value
      * @param exp   超时时间，单位为秒
      */
     void put(Object key, T value, Long exp);
@@ -77,24 +77,24 @@ public interface Cache<T> {
     /**
      * 往缓存中写入内容
      *
-     * @param key
-     * @param value
-     * @param exp
-     * @param timeUnit 写入单位
+     * @param key      缓存key
+     * @param value    缓存value
+     * @param exp      过期时间
+     * @param timeUnit 过期单位
      */
     void put(Object key, T value, Long exp, TimeUnit timeUnit);
 
     /**
      * 删除
      *
-     * @param key
+     * @param key 缓存key
      */
     void remove(Object key);
 
     /**
      * 删除
      *
-     * @param key
+     * @param key 缓存key
      */
     void vagueDel(Object key);
 
@@ -116,33 +116,33 @@ public interface Cache<T> {
     /**
      * 玩缓存中写入内容
      *
-     * @param key
-     * @param map
+     * @param key 缓存key
+     * @param map map value
      */
     void putAllHash(Object key, Map map);
 
     /**
      * 读取缓存值
      *
-     * @param key
-     * @param hashKey
-     * @return
+     * @param key     缓存key
+     * @param hashKey map value
+     * @return 返回缓存中的数据
      */
     T getHash(Object key, Object hashKey);
 
     /**
      * 读取缓存值
      *
-     * @param key
-     * @return
+     * @param key 缓存key
+     * @return 缓存中的数据
      */
     Map<Object, Object> getHash(Object key);
 
     /**
      * 是否包含
      *
-     * @param key
-     * @return
+     * @param key 缓存key
+     * @return 缓存中的数据
      */
     boolean hasKey(Object key);
 
@@ -150,8 +150,8 @@ public interface Cache<T> {
     /**
      * 模糊匹配key
      *
-     * @param pattern
-     * @return
+     * @param pattern 模糊key
+     * @return 缓存中的数据
      */
     List<String> keys(String pattern);
 
@@ -163,9 +163,9 @@ public interface Cache<T> {
      * 效率较高的 计数器
      * 如需清零，按照普通key 移除即可
      *
-     * @param key
-     * @param value
-     * @return
+     * @param key   key值
+     * @param value 去重统计值
+     * @return 计数器结果
      */
     Long cumulative(Object key, Object value);
 
@@ -175,8 +175,8 @@ public interface Cache<T> {
      * 效率较高的 计数器 统计返回
      * 如需清零，按照普通key 移除即可
      *
-     * @param key
-     * @return
+     * @param key 计数器key
+     * @return 计数器结果
      */
     Long counter(Object key);
 
@@ -184,7 +184,7 @@ public interface Cache<T> {
      * 批量计数
      *
      * @param keys 要查询的key集合
-     * @return
+     * @return 批量计数
      */
     List multiCounter(Collection keys);
 
@@ -194,8 +194,8 @@ public interface Cache<T> {
      * 效率较高的 计数器 统计返回
      * 如需清零，按照普通key 移除即可
      *
-     * @param key
-     * @return
+     * @param key key值
+     * @return 计数器结果
      */
     Long mergeCounter(Object... key);
     //---------------------------------------------------用于特殊场景，redis去重统计-----------------------------------------
@@ -208,7 +208,7 @@ public interface Cache<T> {
      *
      * @param key      为累计的key，同一key每次调用则值 +1
      * @param liveTime 单位秒后失效
-     * @return
+     * @return 计数器结果
      */
     Long incr(String key, long liveTime);
     //-----------------------------------------------redis计数---------------------------------------------
@@ -222,6 +222,16 @@ public interface Cache<T> {
      */
     void incrementScore(String sortedSetName, String keyword);
 
+    /**
+     * 使用Sorted Set记录keyword
+     * zincrby命令，对于一个Sorted Set，存在的就把分数加x(x可自行设定)，不存在就创建一个分数为1的成员
+     *
+     * @param sortedSetName sortedSetName的Sorted Set不用预先创建，不存在会自动创建，存在则向里添加数据
+     * @param keyword       关键词
+     * @param score         分数
+     */
+    void incrementScore(String sortedSetName, String keyword, Integer score);
+
     /**
      * zrevrange命令, 查询Sorted Set中指定范围的值
      * 返回的有序集合中，score大的在前面
@@ -230,7 +240,7 @@ public interface Cache<T> {
      * @param sortedSetName sortedSetName
      * @param start         查询范围开始位置
      * @param end           查询范围结束位置
-     * @return
+     * @return 获取满足条件的集合
      */
     Set<ZSetOperations.TypedTuple<Object>> reverseRangeWithScores(String sortedSetName, Integer start, Integer end);
 
diff --git a/framework/src/main/java/cn/lili/common/cache/CachePrefix.java b/framework/src/main/java/cn/lili/cache/CachePrefix.java
similarity index 98%
rename from framework/src/main/java/cn/lili/common/cache/CachePrefix.java
rename to framework/src/main/java/cn/lili/cache/CachePrefix.java
index 925766b1..ce8cc392 100644
--- a/framework/src/main/java/cn/lili/common/cache/CachePrefix.java
+++ b/framework/src/main/java/cn/lili/cache/CachePrefix.java
@@ -1,7 +1,7 @@
-package cn.lili.common.cache;
+package cn.lili.cache;
 
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 
 /**
  * 缓存前缀
diff --git a/framework/src/main/java/cn/lili/config/mongo/MongoConfig.java b/framework/src/main/java/cn/lili/cache/config/mongo/MongoConfig.java
similarity index 97%
rename from framework/src/main/java/cn/lili/config/mongo/MongoConfig.java
rename to framework/src/main/java/cn/lili/cache/config/mongo/MongoConfig.java
index d2fffd74..9fee65e3 100644
--- a/framework/src/main/java/cn/lili/config/mongo/MongoConfig.java
+++ b/framework/src/main/java/cn/lili/cache/config/mongo/MongoConfig.java
@@ -1,4 +1,4 @@
-package cn.lili.config.mongo;
+package cn.lili.cache.config.mongo;
 
 import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoCredential;
diff --git a/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java b/framework/src/main/java/cn/lili/cache/config/redis/FastJsonRedisSerializer.java
similarity index 95%
rename from framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java
rename to framework/src/main/java/cn/lili/cache/config/redis/FastJsonRedisSerializer.java
index ff54b924..d59e29cf 100644
--- a/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java
+++ b/framework/src/main/java/cn/lili/cache/config/redis/FastJsonRedisSerializer.java
@@ -1,4 +1,4 @@
-package cn.lili.config.cache;
+package cn.lili.cache.config.redis;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
@@ -11,7 +11,6 @@ import java.nio.charset.Charset;
  * 要实现对象的缓存，定义自己的序列化和反序列化器。使用阿里的fastjson来实现的比较多
  *
  * @author Bulbasaur
- * @date: 2021/7/9 12:25 上午
  */
 public class FastJsonRedisSerializer<T> implements RedisSerializer<T> {
     private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
diff --git a/framework/src/main/java/cn/lili/config/cache/RedisConfig.java b/framework/src/main/java/cn/lili/cache/config/redis/RedisConfig.java
similarity index 98%
rename from framework/src/main/java/cn/lili/config/cache/RedisConfig.java
rename to framework/src/main/java/cn/lili/cache/config/redis/RedisConfig.java
index 63271fb8..62d505b2 100644
--- a/framework/src/main/java/cn/lili/config/cache/RedisConfig.java
+++ b/framework/src/main/java/cn/lili/cache/config/redis/RedisConfig.java
@@ -1,4 +1,4 @@
-package cn.lili.config.cache;
+package cn.lili.cache.config.redis;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.parser.ParserConfig;
@@ -36,7 +36,6 @@ import java.util.Map;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2021/3/20 09:37
  */
 
@@ -54,8 +53,8 @@ public class RedisConfig extends CachingConfigurerSupport {
     /**
      * 当有多个管理器的时候，必须使用该注解在一个管理器上注释：表示该管理器为默认的管理器
      *
-     * @param connectionFactory
-     * @return
+     * @param connectionFactory 链接工厂
+     * @return 缓存
      */
     @Bean
     @Primary
diff --git a/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java b/framework/src/main/java/cn/lili/cache/impl/RedisCache.java
similarity index 94%
rename from framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java
rename to framework/src/main/java/cn/lili/cache/impl/RedisCache.java
index ef331665..f34515e5 100644
--- a/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java
+++ b/framework/src/main/java/cn/lili/cache/impl/RedisCache.java
@@ -1,6 +1,6 @@
-package cn.lili.common.cache.impl;
+package cn.lili.cache.impl;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.RedisConnection;
@@ -86,7 +86,7 @@ public class RedisCache implements Cache {
     /**
      * 删除
      *
-     * @param key
+     * @param key 模糊删除key
      */
     @Override
     public void vagueDel(Object key) {
@@ -130,7 +130,7 @@ public class RedisCache implements Cache {
      * 获取符合条件的key
      *
      * @param pattern 表达式
-     * @return
+     * @return 模糊匹配key
      */
     @Override
     public List<String> keys(String pattern) {
@@ -223,9 +223,13 @@ public class RedisCache implements Cache {
      */
     @Override
     public void incrementScore(String sortedSetName, String keyword) {
-        //x 的含义请见本方法的注释
-        double x = 1.0;
-        this.redisTemplate.opsForZSet().incrementScore(sortedSetName, keyword, x);
+        //指向key名为KEY的zset元素
+        redisTemplate.opsForZSet().incrementScore(sortedSetName,keyword, 1);
+    }
+
+    @Override
+    public void incrementScore(String sortedSetName, String keyword, Integer score) {
+        redisTemplate.opsForZSet().incrementScore(sortedSetName, keyword, score);
     }
 
     /**
@@ -236,7 +240,7 @@ public class RedisCache implements Cache {
      * @param sortedSetName sortedSetName
      * @param start         查询范围开始位置
      * @param end           查询范围结束位置
-     * @return
+     * @return 符合排序的集合
      */
     @Override
     public Set<ZSetOperations.TypedTuple<Object>> reverseRangeWithScores(String sortedSetName, Integer start, Integer end) {
diff --git a/framework/src/main/java/cn/lili/common/aop/limiter/annotation/LimitPoint.java b/framework/src/main/java/cn/lili/cache/limit/annotation/LimitPoint.java
similarity index 88%
rename from framework/src/main/java/cn/lili/common/aop/limiter/annotation/LimitPoint.java
rename to framework/src/main/java/cn/lili/cache/limit/annotation/LimitPoint.java
index cee99c07..182bb506 100644
--- a/framework/src/main/java/cn/lili/common/aop/limiter/annotation/LimitPoint.java
+++ b/framework/src/main/java/cn/lili/cache/limit/annotation/LimitPoint.java
@@ -1,7 +1,7 @@
-package cn.lili.common.aop.limiter.annotation;
+package cn.lili.cache.limit.annotation;
 
 
-import cn.lili.common.aop.limiter.LimitType;
+import cn.lili.cache.limit.enums.LimitTypeEnums;
 
 import java.lang.annotation.*;
 
@@ -60,5 +60,5 @@ public @interface LimitPoint {
      *
      * @return LimitType
      */
-    LimitType limitType() default LimitType.IP;
+    LimitTypeEnums limitType() default LimitTypeEnums.IP;
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/common/aop/limiter/LimitType.java b/framework/src/main/java/cn/lili/cache/limit/enums/LimitTypeEnums.java
similarity index 78%
rename from framework/src/main/java/cn/lili/common/aop/limiter/LimitType.java
rename to framework/src/main/java/cn/lili/cache/limit/enums/LimitTypeEnums.java
index 110f2195..50b060bc 100644
--- a/framework/src/main/java/cn/lili/common/aop/limiter/LimitType.java
+++ b/framework/src/main/java/cn/lili/cache/limit/enums/LimitTypeEnums.java
@@ -1,4 +1,4 @@
-package cn.lili.common.aop.limiter;
+package cn.lili.cache.limit.enums;
 
 
 /**
@@ -8,7 +8,7 @@ package cn.lili.common.aop.limiter;
  * @since 2018年2月02日 下午4:58:52
  */
 
-public enum LimitType {
+public enum LimitTypeEnums {
     /**
      * 自定义key(即全局限流)
      */
diff --git a/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java b/framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java
similarity index 93%
rename from framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java
rename to framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java
index f6e5397d..465cfc08 100644
--- a/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java
+++ b/framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java
@@ -1,6 +1,7 @@
-package cn.lili.common.aop.limiter;
+package cn.lili.cache.limit.interceptor;
 
-import cn.lili.common.aop.limiter.annotation.LimitPoint;
+import cn.lili.cache.limit.enums.LimitTypeEnums;
+import cn.lili.cache.limit.annotation.LimitPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import com.google.common.collect.ImmutableList;
@@ -43,12 +44,12 @@ public class LimitInterceptor {
 
     @Before("@annotation(limitPointAnnotation)")
     public void interceptor(LimitPoint limitPointAnnotation) {
-        LimitType limitType = limitPointAnnotation.limitType();
+        LimitTypeEnums limitTypeEnums = limitPointAnnotation.limitType();
         String name = limitPointAnnotation.name();
         String key;
         int limitPeriod = limitPointAnnotation.period();
         int limitCount = limitPointAnnotation.limit();
-        switch (limitType) {
+        switch (limitTypeEnums) {
             case CUSTOMER:
                 key = limitPointAnnotation.key();
                 break;
diff --git a/framework/src/main/java/cn/lili/common/utils/RedisUtil.java b/framework/src/main/java/cn/lili/cache/util/RedisUtil.java
similarity index 92%
rename from framework/src/main/java/cn/lili/common/utils/RedisUtil.java
rename to framework/src/main/java/cn/lili/cache/util/RedisUtil.java
index ece32671..98516a63 100644
--- a/framework/src/main/java/cn/lili/common/utils/RedisUtil.java
+++ b/framework/src/main/java/cn/lili/cache/util/RedisUtil.java
@@ -1,4 +1,4 @@
-package cn.lili.common.utils;
+package cn.lili.cache.util;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +29,7 @@ public class RedisUtil {
      *
      * @param key  键
      * @param time 时间(秒)
-     * @return
+     * @return 操作结果
      */
     public boolean expire(String key, long time) {
         try {
@@ -133,7 +133,7 @@ public class RedisUtil {
      *
      * @param key   键
      * @param value 值
-     * @return
+     * @return 操作结果
      */
     public boolean lSet(String key, Object value) {
         try {
@@ -151,7 +151,7 @@ public class RedisUtil {
      * @param key   键
      * @param value 值
      * @param time  时间(秒)
-     * @return
+     * @return 操作结果
      */
     public boolean lSet(String key, Object value, long time) {
         try {
@@ -171,7 +171,7 @@ public class RedisUtil {
      *
      * @param key   键
      * @param value 值
-     * @return
+     * @return 操作结果
      */
     public boolean lSet(String key, List<Object> value) {
         try {
@@ -190,7 +190,7 @@ public class RedisUtil {
      * @param key   键
      * @param value 值
      * @param time  时间(秒)
-     * @return
+     * @return 操作结果
      */
     public boolean lSet(String key, List<Object> value, long time) {
         try {
@@ -211,10 +211,10 @@ public class RedisUtil {
     /**
      * 向Zset里添加成员
      *
-     * @param key
-     * @param score
-     * @param value
-     * @return
+     * @param key 键
+     * @param score 分数
+     * @param value 值
+     * @return 操作结果
      */
     public boolean zadd(String key, long score, String value) {
         return redisTemplate.opsForZSet().add(key, value, score);
@@ -225,10 +225,10 @@ public class RedisUtil {
     /**
      * 获取 某key 下 某一分值区间的队列
      *
-     * @param key
-     * @param from
-     * @param to
-     * @return
+     * @param key 键
+     * @param from 起始位置
+     * @param to 结束为止
+     * @return 符合条件的结果集
      */
     public Set<DefaultTypedTuple> zrangeByScoreWithScores(String key, int from, long to) {
         Set<DefaultTypedTuple> set = redisTemplate.opsForZSet().rangeByScoreWithScores(key, from, to);
@@ -238,9 +238,9 @@ public class RedisUtil {
     /**
      * 移除 Zset队列值
      *
-     * @param key
-     * @param value
-     * @return
+     * @param key 键
+     * @param value 值集合
+     * @return 移除数量
      */
     public Long zremove(String key, String... value) {
         return redisTemplate.opsForZSet().remove(key, value);
diff --git a/framework/src/main/java/cn/lili/common/cache/MybatisRedisCache.java b/framework/src/main/java/cn/lili/common/cache/MybatisRedisCache.java
deleted file mode 100644
index e47185bd..00000000
--- a/framework/src/main/java/cn/lili/common/cache/MybatisRedisCache.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package cn.lili.common.cache;
-
-import cn.lili.common.utils.SpringContextUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.cache.Cache;
-import org.springframework.data.redis.connection.RedisServerCommands;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.util.CollectionUtils;
-
-import java.util.Set;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-/**
- * MybatisRedisCache
- *
- * @author Chopper
- * @version v1.0
- * @since
- * 2020-04-01 2:59 下午
- * 不赞成使用此方式注解，统一使用Cacheable 更为合适
- *
- * 使用方法 @CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
- */
-@Deprecated
-@Slf4j
-public class MybatisRedisCache implements Cache {
-
-    private final ReadWriteLock readWriteLock = new ReentrantReadWriteLock(true);
-
-
-    private RedisTemplate<Object, Object> getRedisTemplate() {
-        return (RedisTemplate<Object, Object>) SpringContextUtil.getBean("redisTemplate");
-    }
-
-    private final String id;
-
-    public MybatisRedisCache(final String id) {
-        if (id == null) {
-            throw new IllegalArgumentException("Cache instances require an ID");
-        }
-        this.id = id;
-    }
-
-    @Override
-    public String getId() {
-        return this.id;
-    }
-
-    @Override
-    public void putObject(Object key, Object value) {
-        try {
-            if (value != null) {
-                log.info("写入缓存：" + key.toString()+"----"+value.toString());
-                getRedisTemplate().opsForValue().set(key.toString(), value);
-            }
-        } catch (Exception e) {
-            log.error("写入mybatis缓存异常 ", e);
-        }
-    }
-
-    @Override
-    public Object getObject(Object key) {
-        try {
-            if (key != null) {
-                log.info("获取缓存：" + key);
-                return getRedisTemplate().opsForValue().get(key.toString());
-            }
-        } catch (Exception e) {
-            log.error("mybatis缓存获取异常 ", e);
-        }
-        return null;
-    }
-
-    @Override
-    public Object removeObject(Object key) {
-        if (key != null) {
-            getRedisTemplate().delete(key.toString());
-        }
-        return null;
-    }
-
-    @Override
-    public void clear() {
-        Set<Object> keys = getRedisTemplate().keys("*:" + this.id + "*");
-        if (!CollectionUtils.isEmpty(keys)) {
-            getRedisTemplate().delete(keys);
-        }
-    }
-
-    @Override
-    public int getSize() {
-        Long size = getRedisTemplate().execute(RedisServerCommands::dbSize);
-        return size.intValue();
-    }
-
-    @Override
-    public ReadWriteLock getReadWriteLock() {
-        return this.readWriteLock;
-    }
-}
diff --git a/framework/src/main/java/cn/lili/config/context/ContextConfiguration.java b/framework/src/main/java/cn/lili/common/context/ContextConfiguration.java
similarity index 94%
rename from framework/src/main/java/cn/lili/config/context/ContextConfiguration.java
rename to framework/src/main/java/cn/lili/common/context/ContextConfiguration.java
index ed5d42ee..a0d71275 100644
--- a/framework/src/main/java/cn/lili/config/context/ContextConfiguration.java
+++ b/framework/src/main/java/cn/lili/common/context/ContextConfiguration.java
@@ -1,4 +1,4 @@
-package cn.lili.config.context;
+package cn.lili.common.context;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
diff --git a/framework/src/main/java/cn/lili/config/context/ThreadContextHolder.java b/framework/src/main/java/cn/lili/common/context/ThreadContextHolder.java
similarity index 97%
rename from framework/src/main/java/cn/lili/config/context/ThreadContextHolder.java
rename to framework/src/main/java/cn/lili/common/context/ThreadContextHolder.java
index 60bcc797..87007ac4 100644
--- a/framework/src/main/java/cn/lili/config/context/ThreadContextHolder.java
+++ b/framework/src/main/java/cn/lili/common/context/ThreadContextHolder.java
@@ -1,4 +1,4 @@
-package cn.lili.config.context;
+package cn.lili.common.context;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java b/framework/src/main/java/cn/lili/common/context/ThreadContextHolderInterceptorAdapter.java
similarity index 76%
rename from framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java
rename to framework/src/main/java/cn/lili/common/context/ThreadContextHolderInterceptorAdapter.java
index a8cb28e1..5e3342d0 100644
--- a/framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java
+++ b/framework/src/main/java/cn/lili/common/context/ThreadContextHolderInterceptorAdapter.java
@@ -1,4 +1,4 @@
-package cn.lili.config.context;
+package cn.lili.common.context;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/12/9 10:44
  */
 public class ThreadContextHolderInterceptorAdapter extends HandlerInterceptorAdapter {
@@ -21,11 +20,11 @@ public class ThreadContextHolderInterceptorAdapter extends HandlerInterceptorAda
     /**
      * 拦截request和response并放到上下文中
      *
-     * @param request
-     * @param response
-     * @param handler
-     * @return
-     * @throws Exception
+     * @param request 请求
+     * @param response 响应
+     * @param handler 处理程序
+     * @return 处理结果
+     * @throws Exception 未知异常
      */
     @Override
     public boolean preHandle(HttpServletRequest request,
@@ -41,11 +40,11 @@ public class ThreadContextHolderInterceptorAdapter extends HandlerInterceptorAda
     /**
      * 从上下文中移除 request 和response
      *
-     * @param request
-     * @param response
-     * @param handler
-     * @param ex
-     * @throws Exception
+     * @param request 请求
+     * @param response 响应
+     * @param handler 处理程序
+     * @param ex 异常
+     * @throws Exception 完成之前处理异常
      */
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable Exception ex) throws Exception {
diff --git a/framework/src/main/java/cn/lili/config/interceptor/RequestInterceptorAdapter.java b/framework/src/main/java/cn/lili/common/context/interceptor/RequestInterceptorAdapter.java
similarity index 93%
rename from framework/src/main/java/cn/lili/config/interceptor/RequestInterceptorAdapter.java
rename to framework/src/main/java/cn/lili/common/context/interceptor/RequestInterceptorAdapter.java
index 17e7f37a..42348795 100644
--- a/framework/src/main/java/cn/lili/config/interceptor/RequestInterceptorAdapter.java
+++ b/framework/src/main/java/cn/lili/common/context/interceptor/RequestInterceptorAdapter.java
@@ -1,6 +1,6 @@
-package cn.lili.config.interceptor;
+package cn.lili.common.context.interceptor;
 
-import cn.lili.config.context.ThreadContextHolder;
+import cn.lili.common.context.ThreadContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.ModelAndView;
diff --git a/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java b/framework/src/main/java/cn/lili/common/context/interceptor/UrlConfiguration.java
similarity index 91%
rename from framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java
rename to framework/src/main/java/cn/lili/common/context/interceptor/UrlConfiguration.java
index f943c75e..593ec06b 100644
--- a/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java
+++ b/framework/src/main/java/cn/lili/common/context/interceptor/UrlConfiguration.java
@@ -1,6 +1,6 @@
-package cn.lili.config.interceptor;
+package cn.lili.common.context.interceptor;
 
-import cn.lili.config.properties.IgnoredUrlsProperties;
+import cn.lili.common.properties.IgnoredUrlsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
@@ -32,7 +32,8 @@ public class UrlConfiguration implements WebMvcConfigurer {
 
     /**
      * 开放资源 这里配置swagger可以在前端访问
-     * @param registry
+     *
+     * @param registry 资源处理
      */
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
diff --git a/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java b/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java
index 3a216470..78bbdf75 100644
--- a/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java
+++ b/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java
@@ -5,7 +5,7 @@ package cn.lili.common.enums;
  * 客户端类型
  *
  * @author Chopper
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 
 public enum ClientTypeEnum {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionTypeEnum.java b/framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java
similarity index 93%
rename from framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionTypeEnum.java
rename to framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java
index 67a99a33..d2698984 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionTypeEnum.java
+++ b/framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java
@@ -1,11 +1,11 @@
-package cn.lili.modules.promotion.entity.enums;
+package cn.lili.common.enums;
 
 
 /**
  * 促销分类枚举
  *
  * @author Chopper
- * @date 2021/2/1 19:32
+ * @since 2021/2/1 19:32
  */
 public enum PromotionTypeEnum {
     /**
diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
index 5ac32ded..dd66819a 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
@@ -5,7 +5,7 @@ package cn.lili.common.enums;
  * 第一位 1:商品；2:用户；3:交易,4:促销,5:店铺,6:页面,7:设置,8:其他
  *
  * @author Chopper
- * @date 2020/4/8 1:36 下午
+ * @since 2020/4/8 1:36 下午
  */
 public enum ResultCode {
 
@@ -201,6 +201,7 @@ public enum ResultCode {
     AFTER_SALES_LOGISTICS_ERROR(33005, "物流公司错误，请重新选择"),
     AFTER_STATUS_ERROR(33006, "售后状态错误，请刷新页面"),
     RETURN_MONEY_OFFLINE_BANK_ERROR(33007, "当账号类型为银行转账时，银行信息不能为空"),
+    AFTER_SALES_PRICE_ERROR(33004, "申请退款金额错误"),
 
     /**
      * 投诉
@@ -219,6 +220,7 @@ public enum ResultCode {
     WALLET_NOT_EXIT_ERROR(34000, "钱包不存在，请联系管理员"),
     WALLET_INSUFFICIENT(34001, "余额不足以支付订单，请充值!"),
     WALLET_WITHDRAWAL_INSUFFICIENT(34002, "可提现金额不足！"),
+    WALLET_WITHDRAWAL_FROZEN_AMOUNT_INSUFFICIENT(34006, "冻结金额不足，无法处理提现申请请求！"),
     WALLET_ERROR_INSUFFICIENT(34003, "零钱提现失败！"),
     WALLET_REMARK_ERROR(34004, "请填写审核备注！"),
     WALLET_APPLY_ERROR(34005, "提现申请异常！"),
@@ -246,11 +248,12 @@ public enum ResultCode {
     /**
      * 优惠券
      */
+    COUPON_LIMIT_ERROR(41000, "超出领取限制"),
     COUPON_EDIT_STATUS_SUCCESS(41001, "修改状态成功！"),
     COUPON_CANCELLATION_SUCCESS(41002, "会员优惠券作废成功"),
     COUPON_EXPIRED(41003, "优惠券已使用/已过期，不能使用"),
     COUPON_EDIT_STATUS_ERROR(41004, "优惠券修改状态失败！"),
-    COUPON_RECEIVE_ERROR(41005, "当前优惠券状态不可领取"),
+    COUPON_RECEIVE_ERROR(41005, "当前优惠券已经被领取完了，下次要早点来哦"),
     COUPON_NUM_INSUFFICIENT_ERROR(41006, "优惠券剩余领取数量不足"),
     COUPON_NOT_EXIST(41007, "当前优惠券不存在"),
     COUPON_LIMIT_NUM_LESS_THAN_0(41008, "领取限制数量不能为负数"),
diff --git a/framework/src/main/java/cn/lili/common/enums/ResultUtil.java b/framework/src/main/java/cn/lili/common/enums/ResultUtil.java
index b4883e5a..e7076480 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultUtil.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultUtil.java
@@ -33,8 +33,8 @@ public class ResultUtil<T> {
     /**
      * 返回数据
      *
-     * @param t
-     * @return
+     * @param t 范型
+     * @return 消息
      */
     public ResultMessage<T> setData(T t) {
         this.resultMessage.setResult(t);
@@ -58,9 +58,9 @@ public class ResultUtil<T> {
 
     /**
      * 抽象静态方法，返回结果集
-     * @param t
-     * @param <T>
-     * @return
+     * @param t 范型
+     * @param <T>  范型
+     * @return 消息
      */
     public static <T> ResultMessage<T> data(T t) {
         return new ResultUtil<T>().setData(t);
@@ -70,6 +70,7 @@ public class ResultUtil<T> {
      * 返回成功
      *
      * @param resultCode 返回状态码
+     * @return 消息
      */
     public static <T> ResultMessage<T> success(ResultCode resultCode) {
         return new ResultUtil<T>().setSuccessMsg(resultCode);
@@ -77,6 +78,7 @@ public class ResultUtil<T> {
 
     /**
      * 返回成功
+     * @return 消息
      */
     public static <T> ResultMessage<T> success() {
         return new ResultUtil<T>().setSuccessMsg(ResultCode.SUCCESS);
@@ -86,6 +88,7 @@ public class ResultUtil<T> {
      * 返回失败
      *
      * @param resultCode 返回状态码
+     * @return 消息
      */
     public static <T> ResultMessage<T> error(ResultCode resultCode) {
         return new ResultUtil<T>().setErrorMsg(resultCode);
@@ -96,6 +99,7 @@ public class ResultUtil<T> {
      *
      * @param code 状态码
      * @param msg  返回消息
+     * @return 消息
      */
     public static <T> ResultMessage<T> error(Integer code, String msg) {
         return new ResultUtil<T>().setErrorMsg(code, msg);
@@ -103,8 +107,8 @@ public class ResultUtil<T> {
 
     /**
      * 服务器异常 追加状态码
-     *
      * @param resultCode 返回码
+     * @return 消息
      */
     public ResultMessage<T> setErrorMsg(ResultCode resultCode) {
         this.resultMessage.setSuccess(false);
@@ -118,6 +122,7 @@ public class ResultUtil<T> {
      *
      * @param code 状态码
      * @param msg  返回消息
+     * @return 消息
      */
     public ResultMessage<T> setErrorMsg(Integer code, String msg) {
         this.resultMessage.setSuccess(false);
diff --git a/framework/src/main/java/cn/lili/common/exception/ServiceException.java b/framework/src/main/java/cn/lili/common/exception/ServiceException.java
index 20e856f0..3b7b3fc5 100644
--- a/framework/src/main/java/cn/lili/common/exception/ServiceException.java
+++ b/framework/src/main/java/cn/lili/common/exception/ServiceException.java
@@ -24,7 +24,7 @@ public class ServiceException extends RuntimeException {
     private ResultCode resultCode;
 
     public ServiceException(String msg) {
-        super(msg);
+        this.resultCode = ResultCode.ERROR;
         this.msg = msg;
     }
 
diff --git a/framework/src/main/java/cn/lili/config/properties/ApiProperties.java b/framework/src/main/java/cn/lili/common/properties/ApiProperties.java
similarity index 94%
rename from framework/src/main/java/cn/lili/config/properties/ApiProperties.java
rename to framework/src/main/java/cn/lili/common/properties/ApiProperties.java
index 806c891d..9a584dde 100644
--- a/framework/src/main/java/cn/lili/config/properties/ApiProperties.java
+++ b/framework/src/main/java/cn/lili/common/properties/ApiProperties.java
@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/framework/src/main/java/cn/lili/config/properties/DomainProperties.java b/framework/src/main/java/cn/lili/common/properties/DomainProperties.java
similarity index 94%
rename from framework/src/main/java/cn/lili/config/properties/DomainProperties.java
rename to framework/src/main/java/cn/lili/common/properties/DomainProperties.java
index 7a56f007..0f7675f4 100644
--- a/framework/src/main/java/cn/lili/config/properties/DomainProperties.java
+++ b/framework/src/main/java/cn/lili/common/properties/DomainProperties.java
@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/framework/src/main/java/cn/lili/config/properties/IgnoredUrlsProperties.java b/framework/src/main/java/cn/lili/common/properties/IgnoredUrlsProperties.java
similarity index 93%
rename from framework/src/main/java/cn/lili/config/properties/IgnoredUrlsProperties.java
rename to framework/src/main/java/cn/lili/common/properties/IgnoredUrlsProperties.java
index 097fdee6..b3ffc857 100644
--- a/framework/src/main/java/cn/lili/config/properties/IgnoredUrlsProperties.java
+++ b/framework/src/main/java/cn/lili/common/properties/IgnoredUrlsProperties.java
@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/framework/src/main/java/cn/lili/config/properties/JWTTokenProperties.java b/framework/src/main/java/cn/lili/common/properties/JWTTokenProperties.java
similarity index 92%
rename from framework/src/main/java/cn/lili/config/properties/JWTTokenProperties.java
rename to framework/src/main/java/cn/lili/common/properties/JWTTokenProperties.java
index b542694c..d56293cf 100644
--- a/framework/src/main/java/cn/lili/config/properties/JWTTokenProperties.java
+++ b/framework/src/main/java/cn/lili/common/properties/JWTTokenProperties.java
@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/framework/src/main/java/cn/lili/config/rocketmq/RocketmqCustomProperties.java b/framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java
similarity index 97%
rename from framework/src/main/java/cn/lili/config/rocketmq/RocketmqCustomProperties.java
rename to framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java
index daedfe43..934057ac 100644
--- a/framework/src/main/java/cn/lili/config/rocketmq/RocketmqCustomProperties.java
+++ b/framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java
@@ -1,4 +1,4 @@
-package cn.lili.config.rocketmq;
+package cn.lili.common.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java b/framework/src/main/java/cn/lili/common/properties/SmsTemplateProperties.java
similarity index 90%
rename from framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java
rename to framework/src/main/java/cn/lili/common/properties/SmsTemplateProperties.java
index 5c05732d..55dbf7ae 100644
--- a/framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java
+++ b/framework/src/main/java/cn/lili/common/properties/SmsTemplateProperties.java
@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
 @Data
 @Configuration
 @ConfigurationProperties(prefix = "lili.sms")
-public class SmsTemplateSetting {
+public class SmsTemplateProperties {
     /**
      * 登录
      */
diff --git a/framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java b/framework/src/main/java/cn/lili/common/properties/StatisticsProperties.java
similarity index 94%
rename from framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java
rename to framework/src/main/java/cn/lili/common/properties/StatisticsProperties.java
index a2e69777..30cd2ba3 100644
--- a/framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java
+++ b/framework/src/main/java/cn/lili/common/properties/StatisticsProperties.java
@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -9,7 +9,6 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2021/2/21 10:19
  */
 @Data
diff --git a/framework/src/main/java/cn/lili/config/properties/SystemSetting.java b/framework/src/main/java/cn/lili/common/properties/SystemSettingProperties.java
similarity index 88%
rename from framework/src/main/java/cn/lili/config/properties/SystemSetting.java
rename to framework/src/main/java/cn/lili/common/properties/SystemSettingProperties.java
index 17186884..7391fe52 100644
--- a/framework/src/main/java/cn/lili/config/properties/SystemSetting.java
+++ b/framework/src/main/java/cn/lili/common/properties/SystemSettingProperties.java
@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
 @Data
 @Configuration
 @ConfigurationProperties(prefix = "lili.system")
-public class SystemSetting {
+public class SystemSettingProperties {
 
 
     /**
diff --git a/framework/src/main/java/cn/lili/config/properties/ThreadProperties.java b/framework/src/main/java/cn/lili/common/properties/ThreadProperties.java
similarity index 95%
rename from framework/src/main/java/cn/lili/config/properties/ThreadProperties.java
rename to framework/src/main/java/cn/lili/common/properties/ThreadProperties.java
index b58c7826..df57a9c2 100644
--- a/framework/src/main/java/cn/lili/config/properties/ThreadProperties.java
+++ b/framework/src/main/java/cn/lili/common/properties/ThreadProperties.java
@@ -1,4 +1,4 @@
-package cn.lili.config.properties;
+package cn.lili.common.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/framework/src/main/java/cn/lili/common/security/context/AuthenticationHandler.java b/framework/src/main/java/cn/lili/common/security/context/AuthenticationHandler.java
deleted file mode 100644
index 0a7b8c55..00000000
--- a/framework/src/main/java/cn/lili/common/security/context/AuthenticationHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cn.lili.common.security.context;
-
-import cn.lili.common.security.AuthUser;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
-
-/**
- * 获取用户信息 处理
- *
- * @author Chopper
- * @version v4.0
- * @Description:
- * @since 2020/11/14 20:35
- */
-@Component
-public class AuthenticationHandler {
-
-    /**
-     * 获取当前用户信息
-     *
-     * @return
-     */
-    public AuthUser getAuthUser() {
-        //获取spring security 权限信息，如果token有权限，在这里就会得到内容
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (authentication == null) {
-            return null;
-        }
-        Object object = authentication.getDetails();
-        if (object instanceof AuthUser) {
-            return (AuthUser) authentication.getDetails();
-        }
-        return null;
-    }
-}
diff --git a/framework/src/main/java/cn/lili/common/security/context/UserContext.java b/framework/src/main/java/cn/lili/common/security/context/UserContext.java
index af1c4623..534afdc2 100644
--- a/framework/src/main/java/cn/lili/common/security/context/UserContext.java
+++ b/framework/src/main/java/cn/lili/common/security/context/UserContext.java
@@ -1,11 +1,11 @@
 package cn.lili.common.security.context;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
-import cn.lili.common.token.SecretKeyUtil;
+import cn.lili.common.security.token.SecretKeyUtil;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
@@ -19,7 +19,6 @@ import javax.servlet.http.HttpServletRequest;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/11/14 20:27
  */
 public class UserContext {
@@ -27,7 +26,7 @@ public class UserContext {
     /**
      * 根据request获取用户信息
      *
-     * @return
+     * @return 授权用户
      */
     public static AuthUser getCurrentUser() {
         if (RequestContextHolder.getRequestAttributes() != null) {
@@ -44,7 +43,7 @@ public class UserContext {
      *
      * @param cache       缓存
      * @param accessToken token
-     * @return
+     * @return 授权用户
      */
     public static AuthUser getAuthUser(Cache cache, String accessToken) {
         try {
@@ -61,7 +60,7 @@ public class UserContext {
      * 根据jwt获取token重的用户信息
      *
      * @param accessToken token
-     * @return
+     * @return 授权用户
      */
     public static AuthUser getAuthUser(String accessToken) {
         try {
diff --git a/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java b/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java
deleted file mode 100644
index f6dbaa1d..00000000
--- a/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cn.lili.common.security.context;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.stereotype.Component;
-
-/**
- * 给予用户上下文，初始化参数
- *
- * @author Chopper
- * @version v4.0
- * @Description:
- * @since 2020/11/14 20:30
- */
-@Component
-public class UserContextInit implements ApplicationRunner {
-
-    /**
-     * 用户信息holder，认证信息的获取者
-     */
-    @Autowired
-    private AuthenticationHandler authenticationHandler;
-
-    /**
-     * 在项目加载时指定认证信息获取者
-     * 默认是由spring 安全上下文中获取
-     *
-     * @param args
-     * @throws Exception
-     */
-    @Override
-    public void run(ApplicationArguments args) {
-        //UserContext.setHolder(authenticationHandler);
-    }
-}
diff --git a/framework/src/main/java/cn/lili/common/token/PermissionEnum.java b/framework/src/main/java/cn/lili/common/security/enums/PermissionEnum.java
similarity index 80%
rename from framework/src/main/java/cn/lili/common/token/PermissionEnum.java
rename to framework/src/main/java/cn/lili/common/security/enums/PermissionEnum.java
index be6e1d28..a9007eb9 100644
--- a/framework/src/main/java/cn/lili/common/token/PermissionEnum.java
+++ b/framework/src/main/java/cn/lili/common/security/enums/PermissionEnum.java
@@ -1,11 +1,10 @@
-package cn.lili.common.token;
+package cn.lili.common.security.enums;
 
 /**
  * 权限枚举值
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/11/25 09:21
  */
 
diff --git a/framework/src/main/java/cn/lili/common/security/enums/UserEnums.java b/framework/src/main/java/cn/lili/common/security/enums/UserEnums.java
index cb30323c..07d86b64 100644
--- a/framework/src/main/java/cn/lili/common/security/enums/UserEnums.java
+++ b/framework/src/main/java/cn/lili/common/security/enums/UserEnums.java
@@ -5,7 +5,6 @@ package cn.lili.common.security.enums;
  *
  * @author Chopper
  * @version v1.0
- * @Description:
  * @since 2020/8/18 15:23
  */
 public enum UserEnums {
diff --git a/framework/src/main/java/cn/lili/common/token/SecretKeyUtil.java b/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java
similarity index 94%
rename from framework/src/main/java/cn/lili/common/token/SecretKeyUtil.java
rename to framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java
index a87f4a8c..e5fe970c 100644
--- a/framework/src/main/java/cn/lili/common/token/SecretKeyUtil.java
+++ b/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java
@@ -1,4 +1,4 @@
-package cn.lili.common.token;
+package cn.lili.common.security.token;
 
 import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64;
 import io.jsonwebtoken.io.Decoders;
diff --git a/framework/src/main/java/cn/lili/common/token/Token.java b/framework/src/main/java/cn/lili/common/security/token/Token.java
similarity index 87%
rename from framework/src/main/java/cn/lili/common/token/Token.java
rename to framework/src/main/java/cn/lili/common/security/token/Token.java
index 94be6fb3..81286345 100644
--- a/framework/src/main/java/cn/lili/common/token/Token.java
+++ b/framework/src/main/java/cn/lili/common/security/token/Token.java
@@ -1,4 +1,4 @@
-package cn.lili.common.token;
+package cn.lili.common.security.token;
 
 import lombok.Data;
 
diff --git a/framework/src/main/java/cn/lili/common/token/TokenUtil.java b/framework/src/main/java/cn/lili/common/security/token/TokenUtil.java
similarity index 94%
rename from framework/src/main/java/cn/lili/common/token/TokenUtil.java
rename to framework/src/main/java/cn/lili/common/security/token/TokenUtil.java
index fbf85423..47bd0585 100644
--- a/framework/src/main/java/cn/lili/common/token/TokenUtil.java
+++ b/framework/src/main/java/cn/lili/common/security/token/TokenUtil.java
@@ -1,13 +1,13 @@
-package cn.lili.common.token;
+package cn.lili.common.security.token;
 
-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.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.config.properties.JWTTokenProperties;
+import cn.lili.common.properties.JWTTokenProperties;
 import com.google.gson.Gson;
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.SignatureException;
@@ -37,7 +37,8 @@ public class TokenUtil {
      * @param username 主体
      * @param claim    私有声明
      * @param longTerm 长时间特殊token 如：移动端，微信小程序等
-     * @return
+     * @param userEnums 用户枚举
+     * @return TOKEN
      */
     public Token createToken(String username, Object claim, boolean longTerm, UserEnums userEnums) {
         Token token = new Token();
@@ -61,6 +62,7 @@ public class TokenUtil {
      * 刷新token
      *
      * @param oldRefreshToken 刷新token
+     * @param userEnums 用户枚举
      * @return token
      */
     public Token refreshToken(String oldRefreshToken, UserEnums userEnums) {
@@ -118,7 +120,7 @@ public class TokenUtil {
      * @param username       主体
      * @param claim          私有神明内容
      * @param expirationTime 过期时间（分钟）
-     * @return
+     * @return token字符串
      */
     private String createToken(String username, Object claim, Long expirationTime) {
         //JWT 生成
diff --git a/framework/src/main/java/cn/lili/common/token/base/AbstractTokenGenerate.java b/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java
similarity index 85%
rename from framework/src/main/java/cn/lili/common/token/base/AbstractTokenGenerate.java
rename to framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java
index ff22fd0c..48418b65 100644
--- a/framework/src/main/java/cn/lili/common/token/base/AbstractTokenGenerate.java
+++ b/framework/src/main/java/cn/lili/common/security/token/base/AbstractTokenGenerate.java
@@ -1,7 +1,7 @@
-package cn.lili.common.token.base;
+package cn.lili.common.security.token.base;
 
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 
 /**
  * AbstractToken
@@ -18,7 +18,7 @@ public abstract class AbstractTokenGenerate {
      *
      * @param username 用户名
      * @param longTerm 是否长时间有效
-     * @return
+     * @return TOKEN对象
      */
     public abstract Token createToken(String username, Boolean longTerm);
 
diff --git a/framework/src/main/java/cn/lili/config/swagger/Swagger2Config.java b/framework/src/main/java/cn/lili/common/swagger/Swagger2Config.java
similarity index 99%
rename from framework/src/main/java/cn/lili/config/swagger/Swagger2Config.java
rename to framework/src/main/java/cn/lili/common/swagger/Swagger2Config.java
index a9bdf631..e604498b 100644
--- a/framework/src/main/java/cn/lili/config/swagger/Swagger2Config.java
+++ b/framework/src/main/java/cn/lili/common/swagger/Swagger2Config.java
@@ -1,4 +1,4 @@
-package cn.lili.config.swagger;
+package cn.lili.common.swagger;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/framework/src/main/java/cn/lili/common/test/BaseTest.java b/framework/src/main/java/cn/lili/common/test/BaseTest.java
deleted file mode 100644
index a9ed9b69..00000000
--- a/framework/src/main/java/cn/lili/common/test/BaseTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cn.lili.common.test;
-
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestContext;
-import org.springframework.test.context.TestExecutionListener;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * BaseTest
- *
- * @author Chopper
- * @version v1.0
- * @since
- * 2020-06-13 12:17
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@Transactional(rollbackFor = Exception.class)
-@Rollback()
-@ContextConfiguration
-@Configuration
-@ComponentScan("cn.lili")
-public class BaseTest implements TestExecutionListener {
-    @Override
-    public void beforeTestClass(TestContext testContext) throws Exception {
-        //设置环境变量 解决es冲突
-        System.setProperty("es.set.netty.runtime.available.processors", "false");
-    }
-
-}
diff --git a/framework/src/main/java/cn/lili/config/thread/ThreadConfig.java b/framework/src/main/java/cn/lili/common/thread/ThreadConfig.java
similarity index 94%
rename from framework/src/main/java/cn/lili/config/thread/ThreadConfig.java
rename to framework/src/main/java/cn/lili/common/thread/ThreadConfig.java
index e3943a34..f6aa1d88 100644
--- a/framework/src/main/java/cn/lili/config/thread/ThreadConfig.java
+++ b/framework/src/main/java/cn/lili/common/thread/ThreadConfig.java
@@ -1,6 +1,6 @@
-package cn.lili.config.thread;
+package cn.lili.common.thread;
 
-import cn.lili.config.properties.ThreadProperties;
+import cn.lili.common.properties.ThreadProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.AsyncConfigurer;
diff --git a/framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java b/framework/src/main/java/cn/lili/common/utils/Base64Utils.java
similarity index 89%
rename from framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java
rename to framework/src/main/java/cn/lili/common/utils/Base64Utils.java
index e2854775..38dcf13c 100644
--- a/framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java
+++ b/framework/src/main/java/cn/lili/common/utils/Base64Utils.java
@@ -1,9 +1,5 @@
-package cn.lili.modules.connect.util;
+package cn.lili.common.utils;
 
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
-
-import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
@@ -236,29 +232,4 @@ public class Base64Utils {
         return new String(data, charset);
     }
 
-
-    /**
-     * 二进制流转Base64字符串
-     *
-     * @param data 二进制流
-     * @return data
-     * @throws IOException 异常
-     */
-    public static String getImageString(byte[] data) throws IOException {
-        BASE64Encoder encoder = new BASE64Encoder();
-        return data != null ? encoder.encode(data) : "";
-    }
-
-
-    /**
-     * Base64字符串转 二进制流
-     *
-     * @param base64String Base64
-     * @return base64String
-     * @throws IOException 异常
-     */
-    public static byte[] getStringImage(String base64String) throws IOException {
-        BASE64Decoder decoder = new sun.misc.BASE64Decoder();
-        return base64String != null ? decoder.decodeBuffer(base64String) : null;
-    }
 }
diff --git a/framework/src/main/java/cn/lili/common/utils/BeanUtil.java b/framework/src/main/java/cn/lili/common/utils/BeanUtil.java
index 849f89d3..55eda005 100644
--- a/framework/src/main/java/cn/lili/common/utils/BeanUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/BeanUtil.java
@@ -15,8 +15,8 @@ public class BeanUtil {
     /**
      * 复制属性
      *
-     * @param objectFrom
-     * @param objectTo
+     * @param objectFrom 源自对象
+     * @param objectTo 复制给对象
      */
     public static void copyProperties(Object objectFrom, Object objectTo) {
         BeanUtils.copyProperties(objectFrom, objectTo);
@@ -25,6 +25,8 @@ public class BeanUtil {
 
     /**
      * 获取属性名数组
+     * @param o 获取字段的对象
+     * @return 返回各个字段
      */
     public static String[] getFiledName(Object o) {
         Field[] fields = o.getClass().getDeclaredFields();
@@ -67,6 +69,8 @@ public class BeanUtil {
     /**
      * 将对象转换为key value
      * A=a&B=b&C=c 格式
+     * @param object 对象
+     * @return 格式化结果
      */
     public static String formatKeyValuePair(Object object) {
         //准备接受的字符串
@@ -91,6 +95,10 @@ public class BeanUtil {
     /**
      * key value键值对 转换为 对象
      * A=a&B=b&C=c 格式 转换为对象
+     * @param str 对象字符串
+     * @param t 范型
+     * @param <T> 范型
+     * @return 格式化结果
      */
     public static <T> T formatKeyValuePair(String str, T t) {
         //填写对参数键值对
diff --git a/framework/src/main/java/cn/lili/common/utils/CommonUtil.java b/framework/src/main/java/cn/lili/common/utils/CommonUtil.java
index e6c8e0e8..65c82bc8 100644
--- a/framework/src/main/java/cn/lili/common/utils/CommonUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/CommonUtil.java
@@ -11,8 +11,8 @@ public class CommonUtil {
 
     /**
      * 以UUID重命名
-     * @param fileName
-     * @return
+     * @param fileName 文件名称
+     * @return 格式化名称
      */
     public static String rename(String fileName) {
         String extName = fileName.substring(fileName.lastIndexOf("."));
@@ -32,20 +32,4 @@ public class CommonUtil {
         return str;
     }
 
-    /**
-     * 批量递归删除时 判断target是否在ids中 避免重复删除
-     * @param target
-     * @param ids
-     * @return
-     */
-    public static Boolean judgeIds(String target, String[] ids){
-        Boolean flag = false;
-        for(String id : ids){
-            if(id.equals(target)){
-                flag = true;
-                break;
-            }
-        }
-        return flag;
-    }
 }
diff --git a/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java b/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java
index b860d68e..d16bd544 100644
--- a/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java
@@ -6,7 +6,7 @@ import java.math.BigDecimal;
  * 金额计算工具
  *
  * @author Bulbasaur
- * @date: 2021/7/9 1:40 上午
+ * @since: 2021/7/9 1:40 上午
  */
 public final class CurrencyUtil {
     /**
@@ -130,8 +130,8 @@ public final class CurrencyUtil {
     /**
      * 金额转分
      *
-     * @param money
-     * @return
+     * @param money 金额
+     * @return 转换单位为分
      */
     public static Integer fen(Double money) {
         double price = mul(money, 100);
@@ -141,15 +141,11 @@ public final class CurrencyUtil {
     /**
      * 金额转分
      *
-     * @param money
-     * @return
+     * @param money 金额
+     * @return double类型分
      */
     public static double reversalFen(Double money) {
         double price = div(money, 100);
         return price;
     }
-
-    public static void main(String[] args) {
-        System.out.println(fen(23.4324));
-    }
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/common/utils/DateUtil.java b/framework/src/main/java/cn/lili/common/utils/DateUtil.java
index 7a3db41c..769c312f 100644
--- a/framework/src/main/java/cn/lili/common/utils/DateUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/DateUtil.java
@@ -23,7 +23,7 @@ public class DateUtil {
     /**
      * 当天的开始时间
      *
-     * @return
+     * @return 今天开始时间
      */
     public static Date startOfTodDayTime() {
         Calendar calendar = Calendar.getInstance();
@@ -36,8 +36,8 @@ public class DateUtil {
 
     /**
      * 当天的开始时间
-     *
-     * @return
+     * @param date 时间
+     * @return 根据传入的时间获取开始时间
      */
     public static Date startOfTodDayTime(Date date) {
         Calendar calendar = Calendar.getInstance();
@@ -51,7 +51,7 @@ public class DateUtil {
     /**
      * 当天的开始时间
      *
-     * @return
+     * @return 今天开始时间
      */
     public static long startOfTodDay() {
         Calendar calendar = Calendar.getInstance();
@@ -63,14 +63,10 @@ public class DateUtil {
         return date.getTime() / 1000;
     }
 
-    public static void main(String[] args) {
-
-    }
-
     /**
      * 当天的结束时间
      *
-     * @return
+     * @return 今天结束时间
      */
     public static Date endOfDate() {
         Calendar calendar = Calendar.getInstance();
@@ -83,8 +79,8 @@ public class DateUtil {
 
     /**
      * 当天的结束时间
-     *
-     * @return
+     * @param date 传入日期
+     * @return 获得传入日期当天结束时间
      */
     public static Date endOfDate(Date date) {
         if (date == null) {
@@ -125,7 +121,7 @@ public class DateUtil {
      *
      * @param date    字符串日期
      * @param pattern 日期格式
-     * @return
+     * @return date
      */
     public static Date toDate(String date, String pattern) {
         if ("".equals("" + date)) {
@@ -148,7 +144,7 @@ public class DateUtil {
     /**
      * 获取上个月的开始结束时间
      *
-     * @return
+     * @return 上个月的开始结束时间
      */
     public static Long[] getLastMonth() {
         //取得系统当前时间
@@ -198,7 +194,7 @@ public class DateUtil {
      * 把日期转换成字符串型
      *
      * @param date 日期
-     * @return
+     * @return 字符串时间
      */
     public static String toString(Date date) {
         return toString(date, STANDARD_FORMAT);
@@ -207,8 +203,8 @@ public class DateUtil {
     /**
      * 把日期转换成字符串型
      *
-     * @param Long 日期
-     * @return
+     * @param date 日期
+     * @return 字符串时间
      */
     public static String toString(Long date) {
         return toString(date, STANDARD_FORMAT);
@@ -219,7 +215,7 @@ public class DateUtil {
      *
      * @param date    日期
      * @param pattern 类型
-     * @return
+     * @return 字符串时间
      */
     public static String toString(Date date, String pattern) {
         if (date == null) {
@@ -243,7 +239,7 @@ public class DateUtil {
      *
      * @param time    时间戳
      * @param pattern 格式
-     * @return
+     * @return 字符串时间
      */
     public static String toString(Long time, String pattern) {
         if (time > 0) {
@@ -251,8 +247,7 @@ public class DateUtil {
                 time = time * 1000;
             }
             Date date = new Date(time);
-            String str = DateUtil.toString(date, pattern);
-            return str;
+            return DateUtil.toString(date, pattern);
         }
         return "";
     }
@@ -321,7 +316,7 @@ public class DateUtil {
      * 获取几个月之前的日期时间戳
      *
      * @param beforeMonth 几个月之前
-     * @return
+     * @return 时间戳
      */
     public static long getBeforeMonthDateline(int beforeMonth) {
         SimpleDateFormat format = new SimpleDateFormat(STANDARD_FORMAT);
diff --git a/framework/src/main/java/cn/lili/common/utils/HibernateProxyTypeAdapter.java b/framework/src/main/java/cn/lili/common/utils/HibernateProxyTypeAdapter.java
deleted file mode 100644
index d4f75e5d..00000000
--- a/framework/src/main/java/cn/lili/common/utils/HibernateProxyTypeAdapter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package cn.lili.common.utils;
-
-import com.google.gson.Gson;
-import com.google.gson.TypeAdapter;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import org.hibernate.Hibernate;
-import org.hibernate.proxy.HibernateProxy;
-
-import java.io.IOException;
-
-/**
- * 代理对象实例化
- * @author Chopper
- */
-public class HibernateProxyTypeAdapter extends TypeAdapter<HibernateProxy> {
-
-    public static final TypeAdapterFactory FACTORY = new TypeAdapterFactory() {
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
-            return (HibernateProxy.class.isAssignableFrom(type.getRawType()) ? (TypeAdapter<T>) new HibernateProxyTypeAdapter(gson) : null);
-        }
-    };
-    private final Gson context;
-
-    private HibernateProxyTypeAdapter(Gson context) {
-        this.context = context;
-    }
-
-    @Override
-    public HibernateProxy read(JsonReader in) throws IOException {
-        throw new UnsupportedOperationException("Not supported");
-    }
-
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    @Override
-    public void write(JsonWriter out, HibernateProxy value) throws IOException {
-        if (value == null) {
-            out.nullValue();
-            return;
-        }
-        //Retrieve the original (not proxy) class
-        Class<?> baseType = Hibernate.getClass(value);
-        //Get the TypeAdapter of the original class, to delegate the serialization
-        TypeAdapter delegate = context.getAdapter(TypeToken.get(baseType));
-        //Get a filled instance of the original class
-        Object unproxiedValue = ((HibernateProxy) value).getHibernateLazyInitializer()
-                .getImplementation();
-        //Serialize the value
-        delegate.write(out, unproxiedValue);
-    }
-}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/common/utils/HttpClientUtils.java b/framework/src/main/java/cn/lili/common/utils/HttpClientUtils.java
index dccbb6cf..18f17fba 100644
--- a/framework/src/main/java/cn/lili/common/utils/HttpClientUtils.java
+++ b/framework/src/main/java/cn/lili/common/utils/HttpClientUtils.java
@@ -35,7 +35,7 @@ import java.util.Map;
  * HttpClientUtils
  *
  * @author Bulbasaur
- * @date: 2021/7/9 1:40 上午
+ * @since: 2021/7/9 1:40 上午
  */
 @Slf4j
 public class HttpClientUtils {
diff --git a/framework/src/main/java/cn/lili/modules/connect/util/HttpUtils.java b/framework/src/main/java/cn/lili/common/utils/HttpUtils.java
similarity index 98%
rename from framework/src/main/java/cn/lili/modules/connect/util/HttpUtils.java
rename to framework/src/main/java/cn/lili/common/utils/HttpUtils.java
index e70a2b4e..4f8e7a3e 100644
--- a/framework/src/main/java/cn/lili/modules/connect/util/HttpUtils.java
+++ b/framework/src/main/java/cn/lili/common/utils/HttpUtils.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.connect.util;
+package cn.lili.common.utils;
 
 import com.xkcoding.http.HttpUtil;
 import com.xkcoding.http.config.HttpConfig;
diff --git a/framework/src/main/java/cn/lili/common/utils/IpHelper.java b/framework/src/main/java/cn/lili/common/utils/IpHelper.java
index 7c5a136e..23fd6d95 100644
--- a/framework/src/main/java/cn/lili/common/utils/IpHelper.java
+++ b/framework/src/main/java/cn/lili/common/utils/IpHelper.java
@@ -4,7 +4,6 @@ package cn.lili.common.utils;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.http.HttpUtil;
-import cn.lili.modules.connect.util.IpUtils;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import lombok.extern.slf4j.Slf4j;
@@ -40,8 +39,8 @@ public class IpHelper {
     /**
      * 获取IP返回地理信息
      *
-     * @param
-     * @return
+     * @param request 请求参数
+     * @return 城市信息
      */
     public String getIpCity(HttpServletRequest request) {
 
diff --git a/framework/src/main/java/cn/lili/modules/connect/util/IpUtils.java b/framework/src/main/java/cn/lili/common/utils/IpUtils.java
similarity index 97%
rename from framework/src/main/java/cn/lili/modules/connect/util/IpUtils.java
rename to framework/src/main/java/cn/lili/common/utils/IpUtils.java
index 8b343fa6..2a31a4ba 100644
--- a/framework/src/main/java/cn/lili/modules/connect/util/IpUtils.java
+++ b/framework/src/main/java/cn/lili/common/utils/IpUtils.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.connect.util;
+package cn.lili.common.utils;
 
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/framework/src/main/java/cn/lili/common/utils/JasyptUtil.java b/framework/src/main/java/cn/lili/common/utils/JasyptUtil.java
index d1b7ced3..b756fcef 100644
--- a/framework/src/main/java/cn/lili/common/utils/JasyptUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/JasyptUtil.java
@@ -14,29 +14,32 @@ public class JasyptUtil {
      * Jasypt生成加密结果
      * @param password 配置文件中设定的加密密码 jasypt.encryptor.password
      * @param value 待加密值
-     * @return
+     * @return 加密字符串
      */
-    public static String encyptPwd(String password,String value){
+    public static String encryptPwd(String password, String value){
         PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
-        encryptor.setConfig(cryptor(password));
-        String result = encryptor.encrypt(value);
-        return result;
+        encryptor.setConfig(encryptor(password));
+        return encryptor.encrypt(value);
     }
     /**
      * 解密
      * @param password 配置文件中设定的加密密码 jasypt.encryptor.password
      * @param value 待解密密文
-     * @return
+     * @return 揭秘字符串
      */
-    public static String decyptPwd(String password,String value){
+    public static String decryptPwd(String password, String value){
         PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
-        encryptor.setConfig(cryptor(password));
+        encryptor.setConfig(encryptor(password));
         encryptor.decrypt(value);
-        String result = encryptor.decrypt(value);
-        return result;
+        return encryptor.decrypt(value);
     }
 
-    public static SimpleStringPBEConfig cryptor(String password){
+    /**
+     * 加密处理
+     * @param password 密码
+     * @return 加密字符串
+     */
+    public static SimpleStringPBEConfig encryptor(String password){
         SimpleStringPBEConfig config = new SimpleStringPBEConfig();
         config.setPassword(password);
         config.setAlgorithm("PBEWITHHMACSHA512ANDAES_256");
@@ -52,8 +55,8 @@ public class JasyptUtil {
     public static void main(String[] args){
 
         //加密 若修改了第一个参数加密password记得在配置文件同步修改
-        System.out.println(encyptPwd("jasypt.encryptor.password","123456"));
+        System.out.println(encryptPwd("jasypt.encryptor.password","123456"));
         //解密
-        System.out.println(decyptPwd("jasypt.encryptor.password","PYVnAYh+j5C3jkMV1d+myj6JzDaUk7pcfTWUaYsvQdEVkuvIVf7Y0mOU9XkffxT8"));
+        System.out.println(decryptPwd("jasypt.encryptor.password","PYVnAYh+j5C3jkMV1d+myj6JzDaUk7pcfTWUaYsvQdEVkuvIVf7Y0mOU9XkffxT8"));
     }
 }
diff --git a/framework/src/main/java/cn/lili/common/utils/StringUtils.java b/framework/src/main/java/cn/lili/common/utils/StringUtils.java
index d7307f78..bad8dbe6 100644
--- a/framework/src/main/java/cn/lili/common/utils/StringUtils.java
+++ b/framework/src/main/java/cn/lili/common/utils/StringUtils.java
@@ -1,6 +1,5 @@
 package cn.lili.common.utils;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 
 import java.beans.BeanInfo;
@@ -10,7 +9,6 @@ import java.lang.reflect.Method;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.regex.Matcher;
@@ -49,99 +47,6 @@ public class StringUtils extends StrUtil {
         return result.toString();
     }
 
-    /**
-     * 将object转为数字
-     *
-     * @param obj     需要转object的对象
-     * @param checked 如果为true格式不正确抛出异常
-     * @return
-     */
-    public static int toInt(Object obj, boolean checked) {
-        int value = 0;
-        if (obj == null) {
-            return 0;
-        }
-        try {
-            value = Convert.toInt(obj.toString());
-        } catch (Exception ex) {
-            if (checked) {
-                throw new RuntimeException("整型数字格式不正确");
-            } else {
-                return 0;
-            }
-        }
-        return value;
-    }
-
-    /**
-     * 将一个字串转为long，如果无空，则返回默认值
-     *
-     * @param str          要转换的数字字串
-     * @param defaultValue 默认值
-     * @return
-     */
-    public static Long toLong(String str, Long defaultValue) {
-        Long value = defaultValue;
-        if (str == null || "".equals(str)) {
-            return defaultValue;
-        }
-        try {
-            value = Long.parseLong(str);
-        } catch (Exception ex) {
-            return defaultValue;
-        }
-        return value;
-    }
-
-    /**
-     * 将一个object转为double 如果object 为 null 则返回0；
-     *
-     * @param obj     需要转成Double的对象
-     * @param checked 如果为true格式不正确抛出异常
-     * @return
-     */
-    public static Double toDouble(Object obj, boolean checked) {
-        Double value = 0d;
-        if (obj == null) {
-            if (checked) {
-                throw new RuntimeException("数字格式不正确");
-            } else {
-                return 0D;
-            }
-        }
-        try {
-            value = Double.valueOf(obj.toString());
-        } catch (Exception ex) {
-            if (checked) {
-                throw new RuntimeException("数字格式不正确");
-            } else {
-                return 0D;
-            }
-        }
-        return value;
-    }
-
-    /**
-     * 将一个字串转为Double，如果无空，则返回默认值
-     *
-     * @param str          要转换的数字字串
-     * @param defaultValue 默认值
-     * @return
-     */
-    public static Double toDouble(String str, Double defaultValue) {
-        Double value = defaultValue;
-        if (str == null || "".equals(str)) {
-            return 0d;
-        }
-        try {
-            value = Double.valueOf(str);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            value = defaultValue;
-        }
-        return value;
-    }
-
     /**
      * 获取随机数
      *
@@ -158,18 +63,6 @@ public class StringUtils extends StrUtil {
         return sRand;
     }
 
-
-    /**
-     * 判断一个数组是否为空，并且长度大于0
-     *
-     * @param list
-     * @return true 不空/false 空
-     */
-    public static boolean isNotEmpty(List list) {
-
-        return list != null && list.size() > 0;
-    }
-
     /**
      * 切个字符串，如果超出长度则切割
      *
diff --git a/framework/src/main/java/cn/lili/common/validation/impl/MobileValidator.java b/framework/src/main/java/cn/lili/common/validation/impl/MobileValidator.java
index 63d673ba..c27656f6 100644
--- a/framework/src/main/java/cn/lili/common/validation/impl/MobileValidator.java
+++ b/framework/src/main/java/cn/lili/common/validation/impl/MobileValidator.java
@@ -12,7 +12,7 @@ import java.util.regex.Pattern;
  * 支持手机号+电话同时校验
  *
  * @author Bulbasaur
- * @date: 2021/7/9 1:41 上午
+ * @since: 2021/7/9 1:41 上午
  */
 public class MobileValidator implements ConstraintValidator<Mobile, String> {
 
diff --git a/framework/src/main/java/cn/lili/common/validation/impl/PhoneValidator.java b/framework/src/main/java/cn/lili/common/validation/impl/PhoneValidator.java
index ad0d9885..8e95ebf9 100644
--- a/framework/src/main/java/cn/lili/common/validation/impl/PhoneValidator.java
+++ b/framework/src/main/java/cn/lili/common/validation/impl/PhoneValidator.java
@@ -11,7 +11,7 @@ import java.util.regex.Pattern;
  * 手机号校验
  *
  * @author Bulbasaur
- * @date: 2021/7/9 1:42 上午
+ * @since: 2021/7/9 1:42 上午
  */
 public class PhoneValidator implements ConstraintValidator<Phone, String> {
 
diff --git a/framework/src/main/java/cn/lili/common/vo/PageVO.java b/framework/src/main/java/cn/lili/common/vo/PageVO.java
index cc379fae..6d7fca44 100644
--- a/framework/src/main/java/cn/lili/common/vo/PageVO.java
+++ b/framework/src/main/java/cn/lili/common/vo/PageVO.java
@@ -10,7 +10,6 @@ import java.io.Serializable;
  * 查询参数
  *
  * @author Chopper
- * @date 2020/11/26 14:43
  */
 @Data
 public class PageVO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/common/vo/ResultMessage.java b/framework/src/main/java/cn/lili/common/vo/ResultMessage.java
index 6990ab9f..2268ef23 100644
--- a/framework/src/main/java/cn/lili/common/vo/ResultMessage.java
+++ b/framework/src/main/java/cn/lili/common/vo/ResultMessage.java
@@ -9,7 +9,6 @@ import java.io.Serializable;
  * 前后端交互VO
  *
  * @author Chopper
- * @date 2020/11/26 14:40
  */
 @Data
 public class ResultMessage<T> implements Serializable {
diff --git a/framework/src/main/java/cn/lili/common/vo/SearchVO.java b/framework/src/main/java/cn/lili/common/vo/SearchVO.java
index 9664098c..d0d6c818 100644
--- a/framework/src/main/java/cn/lili/common/vo/SearchVO.java
+++ b/framework/src/main/java/cn/lili/common/vo/SearchVO.java
@@ -15,7 +15,6 @@ import java.util.Date;
  * 日期搜索参数
  *
  * @author Chopper
- * @date 2020/11/26 14:43
  */
 @Data
 @AllArgsConstructor
diff --git a/framework/src/main/java/cn/lili/common/vo/SerializableStream.java b/framework/src/main/java/cn/lili/common/vo/SerializableStream.java
index ddeb0cc9..20f10cf1 100644
--- a/framework/src/main/java/cn/lili/common/vo/SerializableStream.java
+++ b/framework/src/main/java/cn/lili/common/vo/SerializableStream.java
@@ -10,7 +10,6 @@ import java.io.InputStream;
  * 序列化的input stream
  *
  * @author Chopper
- * @date 2021-03-25 16:32
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/config/websocket/WebSocketStompConfig.java b/framework/src/main/java/cn/lili/config/websocket/WebSocketStompConfig.java
deleted file mode 100644
index 63100a8e..00000000
--- a/framework/src/main/java/cn/lili/config/websocket/WebSocketStompConfig.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package cn.lili.config.websocket;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.messaging.simp.config.MessageBrokerRegistry;
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
-import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
-
-/**
- * @author Chopper
- */
-@Configuration
-@EnableWebSocketMessageBroker
-public class WebSocketStompConfig implements WebSocketMessageBrokerConfigurer {
-
-    /**
-     * 注册stomp端点
-     * @param registry
-     */
-    @Override
-    public void registerStompEndpoints(StompEndpointRegistry registry) {
-
-        //允许使用socketJs方式访问 即可通过http://IP:PORT/manager/ws来和服务端websocket连接
-        registry.addEndpoint("/ws").setAllowedOrigins("*").withSockJS();
-    }
-
-    /**
-     * 配置信息代理
-     * @param registry
-     */
-    @Override
-    public void configureMessageBroker(MessageBrokerRegistry registry) {
-
-        //订阅Broker名称 user点对点 topic广播即群发
-        registry.enableSimpleBroker("/user","/topic");
-        //全局(客户端)使用的消息前缀
-        registry.setApplicationDestinationPrefixes("/app");
-        //点对点使用的前缀 无需配置 默认/user
-        registry.setUserDestinationPrefix("/user");
-    }
-}
diff --git a/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java b/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java
similarity index 99%
rename from framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java
rename to framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java
index a133da67..dc04ee94 100644
--- a/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java
+++ b/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java
@@ -1,7 +1,7 @@
-package cn.lili.common.elasticsearch;
+package cn.lili.elasticsearch;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.lili.config.elasticsearch.ElasticsearchProperties;
+import cn.lili.elasticsearch.config.ElasticsearchProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.api.Assertions;
 import org.elasticsearch.ElasticsearchException;
@@ -335,7 +335,7 @@ public abstract class BaseElasticsearchService {
      * @param index index名
      * @return boolean
      * @author fanxb
-     * @date 2019/7/24 14:57
+     * @since 2019/7/24 14:57
      */
     public boolean indexExist(String index) {
         try {
diff --git a/framework/src/main/java/cn/lili/common/elasticsearch/EsSuffix.java b/framework/src/main/java/cn/lili/elasticsearch/EsSuffix.java
similarity index 84%
rename from framework/src/main/java/cn/lili/common/elasticsearch/EsSuffix.java
rename to framework/src/main/java/cn/lili/elasticsearch/EsSuffix.java
index e7fe6f8e..528f28c6 100644
--- a/framework/src/main/java/cn/lili/common/elasticsearch/EsSuffix.java
+++ b/framework/src/main/java/cn/lili/elasticsearch/EsSuffix.java
@@ -1,4 +1,4 @@
-package cn.lili.common.elasticsearch;
+package cn.lili.elasticsearch;
 
 /**
  * elasticsearch 索引后缀
diff --git a/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java
similarity index 99%
rename from framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java
rename to framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java
index f5b08948..0c78f88a 100644
--- a/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java
+++ b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java
@@ -1,4 +1,4 @@
-package cn.lili.config.elasticsearch;
+package cn.lili.elasticsearch.config;
 
 import cn.hutool.core.convert.Convert;
 import lombok.RequiredArgsConstructor;
diff --git a/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchProperties.java b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java
similarity index 98%
rename from framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchProperties.java
rename to framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java
index b6e66fbf..b4dfc18c 100644
--- a/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchProperties.java
+++ b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java
@@ -1,4 +1,4 @@
-package cn.lili.config.elasticsearch;
+package cn.lili.elasticsearch.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuth.java b/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuth.java
index 179373e9..d0d13e5a 100644
--- a/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuth.java
+++ b/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuth.java
@@ -9,7 +9,6 @@ import cn.lili.modules.connect.exception.AuthException;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/12/4 12:17
  */
 public interface ConnectAuth {
diff --git a/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java b/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java
index 7004313f..1e6facdb 100644
--- a/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java
+++ b/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java
@@ -6,7 +6,6 @@ package cn.lili.modules.connect.config;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/12/4 14:10
  */
 public enum ConnectAuthEnum implements ConnectAuth {
diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java b/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java
index 238b5fc9..2851df9c 100644
--- a/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java
+++ b/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java
@@ -48,7 +48,7 @@ public class Connect implements Serializable {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java b/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java
index b32d62e6..a6c1bd3e 100644
--- a/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java
+++ b/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.connect.entity;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.connect.entity.enums.ConnectConfigEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthToken.java b/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthToken.java
index 0581745d..63fbf623 100644
--- a/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthToken.java
+++ b/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthToken.java
@@ -12,7 +12,6 @@ import java.io.Serializable;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/12/4 23:48
  */
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java b/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java
index 51b12411..1103a9c8 100644
--- a/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java
+++ b/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java
@@ -5,7 +5,6 @@ package cn.lili.modules.connect.entity.enums;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/11/25 18:20
  */
 public enum ConnectEnum {
diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthAlipayRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthAlipayRequest.java
index 53dd69af..10da2098 100644
--- a/framework/src/main/java/cn/lili/modules/connect/request/AuthAlipayRequest.java
+++ b/framework/src/main/java/cn/lili/modules/connect/request/AuthAlipayRequest.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.request;
 
 import cn.hutool.core.convert.Convert;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;
diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthDefaultRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthDefaultRequest.java
index 22b3fdad..8ecd0e1b 100644
--- a/framework/src/main/java/cn/lili/modules/connect/request/AuthDefaultRequest.java
+++ b/framework/src/main/java/cn/lili/modules/connect/request/AuthDefaultRequest.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.connect.request;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;
@@ -12,7 +12,7 @@ import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.connect.entity.enums.AuthResponseStatus;
 import cn.lili.modules.connect.exception.AuthException;
 import cn.lili.modules.connect.util.AuthChecker;
-import cn.lili.modules.connect.util.HttpUtils;
+import cn.lili.common.utils.HttpUtils;
 import cn.lili.modules.connect.util.UuidUtils;
 import com.xkcoding.http.util.UrlUtil;
 import lombok.extern.slf4j.Slf4j;
diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthQQRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthQQRequest.java
index 15299731..69bb075f 100644
--- a/framework/src/main/java/cn/lili/modules/connect/request/AuthQQRequest.java
+++ b/framework/src/main/java/cn/lili/modules/connect/request/AuthQQRequest.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.request;
 
 import cn.hutool.core.convert.Convert;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;
@@ -14,7 +14,7 @@ import cn.lili.modules.connect.entity.enums.AuthResponseStatus;
 import cn.lili.modules.connect.entity.enums.AuthUserGender;
 import cn.lili.modules.connect.exception.AuthException;
 import cn.lili.modules.connect.util.GlobalAuthUtils;
-import cn.lili.modules.connect.util.HttpUtils;
+import cn.lili.common.utils.HttpUtils;
 import com.alibaba.fastjson.JSONObject;
 
 import java.util.Map;
diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatPCRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatPCRequest.java
index e0c3bd2e..8a8b564d 100644
--- a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatPCRequest.java
+++ b/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatPCRequest.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.connect.request;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;
 import cn.lili.modules.connect.config.ConnectAuthEnum;
@@ -11,7 +11,7 @@ import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.connect.entity.enums.AuthResponseStatus;
 import cn.lili.modules.connect.entity.enums.AuthUserGender;
 import cn.lili.modules.connect.exception.AuthException;
-import cn.lili.modules.connect.util.HttpUtils;
+import cn.lili.common.utils.HttpUtils;
 import com.alibaba.fastjson.JSONObject;
 
 /**
diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatRequest.java
index bc1655fd..e9086636 100644
--- a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatRequest.java
+++ b/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatRequest.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.connect.request;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;
 import cn.lili.modules.connect.config.ConnectAuthEnum;
@@ -12,7 +12,7 @@ import cn.lili.modules.connect.entity.enums.AuthResponseStatus;
 import cn.lili.modules.connect.entity.enums.AuthUserGender;
 import cn.lili.modules.connect.exception.AuthException;
 import cn.lili.modules.connect.util.GlobalAuthUtils;
-import cn.lili.modules.connect.util.HttpUtils;
+import cn.lili.common.utils.HttpUtils;
 import com.alibaba.fastjson.JSONObject;
 
 /**
diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeiboRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthWeiboRequest.java
index b3284e76..fa00225b 100644
--- a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeiboRequest.java
+++ b/framework/src/main/java/cn/lili/modules/connect/request/AuthWeiboRequest.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.request;
 
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.utils.UrlBuilder;
 import cn.lili.modules.connect.config.AuthConfig;
@@ -13,8 +13,8 @@ import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.connect.entity.enums.AuthResponseStatus;
 import cn.lili.modules.connect.entity.enums.AuthUserGender;
 import cn.lili.modules.connect.exception.AuthException;
-import cn.lili.modules.connect.util.HttpUtils;
-import cn.lili.modules.connect.util.IpUtils;
+import cn.lili.common.utils.HttpUtils;
+import cn.lili.common.utils.IpUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.xkcoding.http.support.HttpHeader;
 
diff --git a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
index 61e7487d..7a33b102 100644
--- a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
+++ b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.service;
 
-import cn.lili.common.cache.CachePrefix;
-import cn.lili.common.token.Token;
+import cn.lili.cache.CachePrefix;
+import cn.lili.common.security.token.Token;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.connect.entity.dto.WechatMPLoginParams;
diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
index e54a3f8f..527fe185 100644
--- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
@@ -2,17 +2,17 @@ package cn.lili.modules.connect.serviceimpl;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-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.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.token.Token;
-import cn.lili.common.token.base.generate.MemberTokenGenerate;
+import cn.lili.common.security.token.Token;
+import cn.lili.modules.member.token.MemberTokenGenerate;
 import cn.lili.common.utils.CookieUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.config.context.ThreadContextHolder;
+import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
diff --git a/framework/src/main/java/cn/lili/modules/connect/util/AuthChecker.java b/framework/src/main/java/cn/lili/modules/connect/util/AuthChecker.java
index 838cbe90..fb23837f 100644
--- a/framework/src/main/java/cn/lili/modules/connect/util/AuthChecker.java
+++ b/framework/src/main/java/cn/lili/modules/connect/util/AuthChecker.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.connect.util;
 
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.modules.connect.config.AuthConfig;
 import cn.lili.modules.connect.config.ConnectAuth;
 import cn.lili.modules.connect.config.ConnectAuthEnum;
diff --git a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
index 814a3e7b..9b9516b0 100644
--- a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
+++ b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
@@ -1,15 +1,15 @@
 package cn.lili.modules.connect.util;
 
 import cn.hutool.json.JSONUtil;
-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.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.config.properties.ApiProperties;
-import cn.lili.config.properties.DomainProperties;
+import cn.lili.common.properties.ApiProperties;
+import cn.lili.common.properties.DomainProperties;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.connect.config.AuthConfig;
 import cn.lili.modules.connect.config.ConnectAuthEnum;
diff --git a/framework/src/main/java/cn/lili/modules/connect/util/GlobalAuthUtils.java b/framework/src/main/java/cn/lili/modules/connect/util/GlobalAuthUtils.java
index e4a7a256..2b1868b9 100644
--- a/framework/src/main/java/cn/lili/modules/connect/util/GlobalAuthUtils.java
+++ b/framework/src/main/java/cn/lili/modules/connect/util/GlobalAuthUtils.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.connect.util;
 
+import cn.lili.common.utils.Base64Utils;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.connect.exception.AuthException;
 import com.alibaba.fastjson.JSON;
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java
index 7615e194..8014ae87 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.distribution.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.modules.distribution.entity.dto.DistributionApplyDTO;
 import cn.lili.modules.distribution.entity.enums.DistributionStatusEnum;
@@ -19,7 +19,7 @@ import javax.validation.constraints.Size;
  * 分销员对象
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
index 9bfa342b..65e612f3 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.distribution.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.distribution.entity.enums.DistributionCashStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -20,7 +20,7 @@ import java.util.Date;
  * 分销佣金
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @Data
 @Entity
@@ -48,7 +48,7 @@ public class DistributionCash extends BaseEntity {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "支付时间")
     private Date payTime;
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java
index 5e823d9e..67f6361c 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java
@@ -30,7 +30,7 @@ import java.util.Map;
  * 分销商品
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @Data
 @Entity
@@ -56,7 +56,7 @@ public class DistributionGoods {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java
index 85902f6b..acc692df 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java
@@ -24,7 +24,7 @@ import java.util.Date;
  * 分销订单
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @Data
 @Entity
@@ -45,7 +45,7 @@ public class DistributionOrder {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java
index 620f6e90..37887f1b 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java
@@ -17,7 +17,7 @@ import javax.persistence.Table;
  * 分销员已选择分销商品
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionApplyDTO.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionApplyDTO.java
index b98026de..c9f5ec1a 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionApplyDTO.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionApplyDTO.java
@@ -9,7 +9,7 @@ import javax.validation.constraints.Size;
 /**
  * 分销员申请DTO
  * @author Bulbasaur
- * @date: 2021/6/30 11:07 上午
+ * @since: 2021/6/30 11:07 上午
  *
  */
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionGoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionGoodsSearchParams.java
index 70cead14..bd6f0214 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionGoodsSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionGoodsSearchParams.java
@@ -11,7 +11,7 @@ import lombok.Data;
  * 分销员商品查询条件
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @Data
 public class DistributionGoodsSearchParams extends PageVO {
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionSearchParams.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionSearchParams.java
index 49d0b226..4233113e 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionSearchParams.java
@@ -9,7 +9,7 @@ import lombok.Data;
  * 分销查询参数
  *
  * @author Chopper
- * @date 2021/3/20 10:13
+ * @since 2021/3/20 10:13
  */
 @Data
 public class DistributionSearchParams {
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java
index 56e0a137..ff1cc2ca 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.distribution.entity.enums;
  * 分销佣金状态
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 public enum DistributionCashStatusEnum {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionOrderStatusEnum.java b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionOrderStatusEnum.java
index dfc0266a..16c6fdc0 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionOrderStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionOrderStatusEnum.java
@@ -4,7 +4,6 @@ package cn.lili.modules.distribution.entity.enums;
  * 分销员订单状态
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
  */
 public enum DistributionOrderStatusEnum {
     //待结算（冻结）
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionStatusEnum.java b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionStatusEnum.java
index fc02eab0..302ad4f1 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.distribution.entity.enums;
  * 分销员状态
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 public enum DistributionStatusEnum {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionCashSearchParams.java b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionCashSearchParams.java
index 71302248..4373e307 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionCashSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionCashSearchParams.java
@@ -10,7 +10,7 @@ import lombok.Data;
  * 分销佣金查询信息
  *
  * @author pikachu
- * @date 2020-03-26 09:04:53
+ * @since 2020-03-26 09:04:53
  */
 @Data
 public class DistributionCashSearchParams extends PageVO {
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java
index 07d266d1..a7a786ea 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java
@@ -12,7 +12,7 @@ import java.util.Date;
  * 分销商品信息
  *
  * @author pikachu
- * @date 2020-03-26 09:04:53
+ * @since 2020-03-26 09:04:53
  */
 @Data
 public class DistributionGoodsVO {
@@ -52,7 +52,7 @@ public class DistributionGoodsVO {
     private Double commission;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "添加时间")
     private Date createTime;
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java
index befe4480..a2343493 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * 分销员对象
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @Data
 @ApiModel(value = "分销订单查询对象")
@@ -40,12 +40,12 @@ public class DistributionOrderSearchParams extends PageVO {
     private String storeId;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
     private Date startTime;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "结束时间")
     private Date endTime;
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionCashMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionCashMapper.java
index ec21ecf1..5a3c9a4a 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionCashMapper.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionCashMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 分销佣金数据处理层
  *
  * @author pikachu
- * @date 2020-03-26 18:45:56
+ * @since 2020-03-26 18:45:56
  */
 public interface DistributionCashMapper extends BaseMapper<DistributionCash> {
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionGoodsMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionGoodsMapper.java
index 2ee3d579..e20a95fa 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionGoodsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionGoodsMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select;
  * 分销商品数据处理层
  *
  * @author pikachu
- * @date 2020-03-24 23:04:56
+ * @since 2020-03-24 23:04:56
  */
 public interface DistributionGoodsMapper extends BaseMapper<DistributionGoods> {
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java
index 56d49e27..ccc87296 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java
@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Update;
  * 分销员数据处理层
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 public interface DistributionMapper extends BaseMapper<Distribution> {
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java
index 973c7041..3a5b273e 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java
@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Update;
  * 分销订单数据处理层
  *
  * @author pikachu
- * @date 2020-03-15 10:45:56
+ * @since 2020-03-15 10:45:56
  */
 public interface DistributionOrderMapper extends BaseMapper<DistributionOrder> {
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionSelectedGoodsMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionSelectedGoodsMapper.java
index e104a837..6b4335da 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionSelectedGoodsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionSelectedGoodsMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 选择分销商品数据处理层
  *
  * @author pikachu
- * @date 2020-03-15 10:45:56
+ * @since 2020-03-15 10:45:56
  */
 public interface DistributionSelectedGoodsMapper extends BaseMapper<DistributionSelectedGoods> {
 }
diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionCashService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionCashService.java
index fad9793f..b5e75c01 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionCashService.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionCashService.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * 分销佣金业务层
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 public interface DistributionCashService extends IService<DistributionCash> {
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionGoodsService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionGoodsService.java
index 868d35da..21c456e0 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionGoodsService.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionGoodsService.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 分销商品业务层
  *
  * @author pikachu
- * @date 2020-03-24 10:46:33
+ * @since 2020-03-24 10:46:33
  */
 public interface DistributionGoodsService extends IService<DistributionGoods> {
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java
index 894773a6..ee789adb 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 分销订单业务层
  *
  * @author pikachu
- * @date 2020-03-15 10:46:33
+ * @since 2020-03-15 10:46:33
  */
 public interface DistributionOrderService extends IService<DistributionOrder> {
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionSelectedGoodsService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionSelectedGoodsService.java
index 994d5d8a..86534f3b 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionSelectedGoodsService.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionSelectedGoodsService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 分销选择商品业务层
  *
  * @author pikachu
- * @date 2020-03-24 10:46:33
+ * @since 2020-03-24 10:46:33
  */
 public interface DistributionSelectedGoodsService extends IService<DistributionSelectedGoods> {
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java
index c1d8c4e3..8b42b066 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 分销员业务层
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 public interface DistributionService extends IService<Distribution> {
 
diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
index 7a0bef76..dc46f394 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
@@ -2,13 +2,13 @@ package cn.lili.modules.distribution.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.MemberTagsEnum;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.common.utils.CurrencyUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.distribution.entity.dos.Distribution;
 import cn.lili.modules.distribution.entity.dos.DistributionCash;
 import cn.lili.modules.distribution.entity.enums.DistributionCashStatusEnum;
@@ -37,7 +37,7 @@ import java.util.Date;
  * 分销佣金业务层实现
  *
  * @author pikachu
- * @date 2020-03-126 18:04:56
+ * @since 2020-03-126 18:04:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -84,6 +84,7 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
                 memberWithdrawalMessage.setMemberId(distribution.getMemberId());
                 memberWithdrawalMessage.setPrice(applyMoney);
                 memberWithdrawalMessage.setDestination(MemberWithdrawalDestinationEnum.WALLET.name());
+                memberWithdrawalMessage.setStatus(DistributionCashStatusEnum.APPLY.name());
                 String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_WITHDRAWAL.name();
                 rocketMQTemplate.asyncSend(destination, memberWithdrawalMessage, RocketmqSendCallbackBuilder.commonCallback());
                 return true;
@@ -122,8 +123,10 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
             //获取分销员
             Distribution distribution = distributionService.getById(distributorCash.getDistributionId());
             if (distribution != null && distributorCash != null && distribution.getDistributionStatus().equals(DistributionStatusEnum.PASS.name())) {
+                MemberWithdrawalMessage memberWithdrawalMessage = new MemberWithdrawalMessage();
                 //审核通过
                 if (result.equals(DistributionCashStatusEnum.PASS.name())) {
+                    memberWithdrawalMessage.setStatus(DistributionCashStatusEnum.PASS.name());
                     //审核通过需要校验冻结金额不足情况
                     if (distribution.getCommissionFrozen() < distributorCash.getPrice()) {
                         throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_INSUFFICIENT);
@@ -136,6 +139,7 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
                     //提现到余额
                     memberWalletService.increase(distributorCash.getPrice(), distribution.getMemberId(), "分销佣金提现到余额", DepositServiceTypeEnum.WALLET_COMMISSION.name());
                 } else {
+                    memberWithdrawalMessage.setStatus(DistributionCashStatusEnum.REFUSE.name());
                     //分销员佣金解冻
                     distribution.setCommissionFrozen(CurrencyUtil.sub(distribution.getCommissionFrozen(), distributorCash.getPrice()));
                     //分销员可提现金额退回
@@ -145,7 +149,15 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
                 //分销员金额相关处理
                 distributionService.updateById(distribution);
                 //修改分销提现申请
-                this.updateById(distributorCash);
+                boolean bool = this.updateById(distributorCash);
+                if (bool) {
+                    //组织会员提现审核消息
+                    memberWithdrawalMessage.setMemberId(distribution.getMemberId());
+                    memberWithdrawalMessage.setPrice(distributorCash.getPrice());
+                    memberWithdrawalMessage.setDestination(MemberWithdrawalDestinationEnum.WALLET.name());
+                    String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_WITHDRAWAL.name();
+                    rocketMQTemplate.asyncSend(destination, memberWithdrawalMessage, RocketmqSendCallbackBuilder.commonCallback());
+                }
                 return distributorCash;
             }
             throw new ServiceException(ResultCode.DISTRIBUTION_NOT_EXIST);
diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java
index 73ddee8c..11a049ff 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java
@@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.modules.distribution.entity.dos.Distribution;
 import cn.lili.modules.distribution.entity.dos.DistributionGoods;
 import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams;
@@ -28,7 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 分销商品接口实现
  *
  * @author pikachu
- * @date 2020-03-24 23:04:56
+ * @since 2020-03-24 23:04:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java
index 7837e10c..7bef10f3 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java
@@ -4,7 +4,7 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.utils.CurrencyUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.modules.distribution.entity.dos.Distribution;
 import cn.lili.modules.distribution.entity.dos.DistributionOrder;
 import cn.lili.modules.distribution.entity.enums.DistributionOrderStatusEnum;
@@ -36,7 +36,7 @@ import java.util.List;
  * 分销订单接口实现
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java
index 1c2f0f59..972bc944 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java
@@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 分销选择商品接口实现
  *
  * @author pikachu
- * @date 2020-03-24 23:04:56
+ * @since 2020-03-24 23:04:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java
index 7a255e05..6d474f82 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java
@@ -1,13 +1,13 @@
 package cn.lili.modules.distribution.serviceimpl;
 
 import cn.hutool.json.JSONUtil;
-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.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.distribution.entity.dos.Distribution;
 import cn.lili.modules.distribution.entity.dto.DistributionApplyDTO;
@@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit;
  * 分销员接口实现
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/file/entity/File.java b/framework/src/main/java/cn/lili/modules/file/entity/File.java
index 5ad4ad11..453f8c0c 100644
--- a/framework/src/main/java/cn/lili/modules/file/entity/File.java
+++ b/framework/src/main/java/cn/lili/modules/file/entity/File.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.file.entity;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -15,7 +15,7 @@ import javax.persistence.Table;
  * 文件系统
  *
  * @author Chopper
- * @date 2020/11/26 15:35
+ * @since 2020/11/26 15:35
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java b/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java
index cf2cbefc..396d28df 100644
--- a/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java
+++ b/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java
@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
  * 文件查询所属者参数对象
  *
  * @author Chopper
- * @date 2021-02-22 17:20
+ * @since 2021-02-22 17:20
  */
 @Data
 @AllArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/file/mapper/FileMapper.java b/framework/src/main/java/cn/lili/modules/file/mapper/FileMapper.java
index b16e8862..0a817110 100644
--- a/framework/src/main/java/cn/lili/modules/file/mapper/FileMapper.java
+++ b/framework/src/main/java/cn/lili/modules/file/mapper/FileMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 文件管理数据处理层
  *
  * @author Chopper
- * @date 2021-02-22 17:20
+ * @since 2021-02-22 17:20
  */
 public interface FileMapper extends BaseMapper<File> {
 
diff --git a/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java b/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java
index f16e90fd..7aacc714 100644
--- a/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java
@@ -7,7 +7,6 @@ import java.util.List;
  * 文件管理插件
  *
  * @author Chopper
- * @date 2020/11/26 17:50
  */
 public interface FileManagerPlugin {
 
diff --git a/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java b/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java
index 763780e6..e28bfc88 100644
--- a/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java
@@ -27,7 +27,6 @@ import java.util.List;
  * 阿里oss 文件操作
  *
  * @author Chopper
- * @date 2020/11/26 17:50
  */
 
 @Component
diff --git a/framework/src/main/java/cn/lili/modules/file/service/FileService.java b/framework/src/main/java/cn/lili/modules/file/service/FileService.java
index de729174..0760096e 100644
--- a/framework/src/main/java/cn/lili/modules/file/service/FileService.java
+++ b/framework/src/main/java/cn/lili/modules/file/service/FileService.java
@@ -14,7 +14,6 @@ import java.util.List;
  * 文件管理业务层
  *
  * @author Chopper
- * @date 2020/11/26 17:50
  */
 public interface FileService extends IService<File> {
 
diff --git a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java
index 52931040..57cc5036 100644
--- a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java
@@ -3,7 +3,7 @@ package cn.lili.modules.file.serviceimpl;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.SearchVO;
@@ -26,7 +26,7 @@ import java.util.List;
  * 文件管理业务层实现
  *
  * @author Chopper
- * @date 2020/11/26 17:50
+ * @since 2020/11/26 17:50
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java
index 934c0493..8c2d51f8 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty;
  * 商品品牌
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java
index d7653ea7..4dc0933e 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,7 +19,7 @@ import java.util.Date;
  * 商品分类
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java
index 5ac1f8c1..b724c696 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java
@@ -25,7 +25,7 @@ import java.util.Date;
  * 分类品牌关联
  *
  * @author pikachu
- * @date 2020-03-02 09:34:02
+ * @since 2020-03-02 09:34:02
  */
 @Data
 @Entity
@@ -52,7 +52,7 @@ public class CategoryBrand  implements Serializable {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java
index 3737862d..f88d6359 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull;
  * 分类参数组关联
  *
  * @author pikachu
- * @date 2020-02-26 10:34:02
+ * @since 2020-02-26 10:34:02
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java
index d286db1a..7efbb531 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -16,7 +16,7 @@ import javax.persistence.Table;
  * 分类参数组关联
  *
  * @author pikachu
- * @date 2020-02-26 10:34:02
+ * @since 2020-02-26 10:34:02
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java
index 5d053995..41ce6c9b 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import javax.persistence.Table;
 /**
  * 小程序直播商品
  * @author Bulbasaur
- * @date: 2021/5/17 9:34 上午
+ * @since: 2021/5/17 9:34 上午
  *
  */
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java
index df07486c..b1c6880d 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.goods.entity.enums.DraftGoodsSaveType;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,7 +20,7 @@ import javax.validation.constraints.Max;
  * 草稿商品
  *
  * @author pikachu
- * @date 2020-02-23 9:14:33
+ * @since 2020-02-23 9:14:33
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
index a0982129..6e92ee79 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
@@ -2,7 +2,7 @@ package cn.lili.modules.goods.entity.dos;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.json.JSONUtil;
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.goods.entity.dto.GoodsOperationDTO;
@@ -26,7 +26,7 @@ import java.util.Map;
  * 商品
  *
  * @author pikachu
- * @date 2020-02-23 9:14:33
+ * @since 2020-02-23 9:14:33
  */
 @Data
 @Entity
@@ -222,6 +222,7 @@ public class Goods extends BaseEntity {
         this.intro = goodsOperationDTO.getIntro();
         this.mobileIntro = goodsOperationDTO.getMobileIntro();
         this.cost = goodsOperationDTO.getCost();
+        this.goodsVideo = goodsOperationDTO.getGoodsVideo();
         if (goodsOperationDTO.getGoodsParamsDTOList() != null && goodsOperationDTO.getGoodsParamsDTOList().isEmpty()) {
             this.params = JSONUtil.toJsonStr(goodsOperationDTO.getGoodsParamsDTOList());
         }
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java
index 4063bdba..c63b2342 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java
@@ -19,7 +19,7 @@ import java.io.Serializable;
  * 商品相册
  *
  * @author pikachu
- * @date 2020-02-23 9:14:33
+ * @since 2020-02-23 9:14:33
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
index 056e587d..beff2494 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,7 +20,7 @@ import java.util.Date;
  * 商品sku
  *
  * @author pikachu
- * @date 2020-02-23 9:14:33
+ * @since 2020-02-23 9:14:33
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java
index f8d7d72a..e0685a01 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty;
  * 商品计量单位
  *
  * @author Bulbasaur
- * @date: 2020/11/26 16:08
+ * @since: 2020/11/26 16:08
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java
index 02579a78..073ffd8c 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +15,7 @@ import javax.persistence.Table;
  * 商品关键字
  *
  * @author paulG
- * @date 2020/10/15
+ * @since 2020/10/15
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java
index 96fcc1f8..776891c8 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java
@@ -1,17 +1,13 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.IdEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import cn.lili.mybatis.IdEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
@@ -22,7 +18,7 @@ import javax.validation.constraints.NotNull;
  * 商品参数
  *
  * @author pikachu
- * @date 2020-02-23 9:14:33
+ * @since 2020-02-23 9:14:33
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java
index b4e8a272..f57a7707 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.IdEntity;
+import cn.lili.mybatis.IdEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotEmpty;
  * 商品规格项
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java
index 90dcdd73..a0809f51 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +13,7 @@ import javax.persistence.Table;
  * 小程序直播间
  *
  * @author Bulbasaur
- * @date: 2021/5/17 9:47 上午
+ * @since: 2021/5/17 9:47 上午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java
index 19c16c43..c041b4c6 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java
@@ -17,7 +17,7 @@ import javax.persistence.Table;
  * 直播商品
  *
  * @author Bulbasaur
- * @date: 2021/5/18 5:42 下午
+ * @since: 2021/5/18 5:42 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/BrandPageDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/BrandPageDTO.java
index 05f85f94..15f07a97 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/BrandPageDTO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/BrandPageDTO.java
@@ -11,7 +11,7 @@ import lombok.Data;
  * 商品品牌dto
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @Data
 @JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class)
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/CategorySearchParams.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/CategorySearchParams.java
index 03e6543c..01921d86 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/CategorySearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/CategorySearchParams.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
  * 分类查询参数
  *
  * @author paulG
- * @date 2020/12/1
+ * @since 2020/12/1
  **/
 @Data
 public class CategorySearchParams {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java
index daf86bd5..286ccf33 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 用于获取直播商品状态时使用
  *
  * @author Bulbasaur
- * @date: 2021/5/25 12:12 下午
+ * @since: 2021/5/25 12:12 下午
  */
 @Data
 public class CommodityDTO {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/DraftGoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/DraftGoodsSearchParams.java
index d146fa51..d22a583b 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/DraftGoodsSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/DraftGoodsSearchParams.java
@@ -10,7 +10,7 @@ import lombok.Data;
  * 草稿商品搜索对象
  *
  * @author paulG
- * @date 2020/12/21
+ * @since 2020/12/21
  **/
 @Data
 public class DraftGoodsSearchParams extends GoodsSearchParams {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsCompleteMessage.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsCompleteMessage.java
index 0ff1826c..6dab4d05 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsCompleteMessage.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsCompleteMessage.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 商品购买完成信息
  *
  * @author paulG
- * @date 2021/3/24
+ * @since 2021/3/24
  **/
 @Data
 public class GoodsCompleteMessage {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java
index c43b04cd..95dfb90d 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java
@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
  * 微信小程序直播商品DTO
  *
  * @author Bulbasaur
- * @date: 2021/5/17 11:03 上午
+ * @since: 2021/5/17 11:03 上午
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
index 3a646a86..a6039d8b 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
@@ -18,7 +18,7 @@ import java.util.Map;
  * 商品编辑DTO
  *
  * @author pikachu
- * @date 2020-02-24 19:27:20
+ * @since 2020-02-24 19:27:20
  */
 @Data
 @ToString
@@ -120,6 +120,12 @@ public class GoodsOperationDTO implements Serializable {
     @ApiModelProperty(value = "商品类型")
     private String goodsType;
 
+    /**
+     * 商品视频
+     */
+    @ApiModelProperty(value = "商品视频")
+    private String goodsVideo;
+
 
 
 }
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsParamsDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsParamsDTO.java
index 09be40e0..77bc42b3 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsParamsDTO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsParamsDTO.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 商品关联参数
  *
  * @author pikachu
- * @date 2020-02-23 9:14:33
+ * @since 2020-02-23 9:14:33
  */
 @Data
 @ApiModel(value = "商品参数分组")
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java
index de388d32..6e891b89 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java
@@ -12,7 +12,7 @@ import lombok.Data;
  * 商品查询条件
  *
  * @author pikachu
- * @date 2020-02-24 19:27:20
+ * @since 2020-02-24 19:27:20
  */
 @Data
 public class GoodsSearchParams extends PageVO {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuSearchParams.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuSearchParams.java
index 7139e103..39d01981 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuSearchParams.java
@@ -9,7 +9,7 @@ import lombok.Data;
  * 规格商品查询条件
  *
  * @author paulG
- * @date 2020/12/15
+ * @since 2020/12/15
  **/
 @Data
 public class GoodsSkuSearchParams extends GoodsSearchParams {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java
index d6d4841d..694df3c9 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 商品库存DTO
  *
  * @author paulG
- * @date 2020/12/23
+ * @since 2020/12/23
  **/
 @Data
 public class GoodsSkuStockDTO {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java
index 0e1bdecf..5430503f 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java
@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 用于直播间前台使用的直播间商品DTO
  *
  * @author Bulbasaur
- * @date: 2021/5/20 2:34 下午
+ * @since: 2021/5/20 2:34 下午
  */
 public class SimpleCommodity {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/DraftGoodsSaveType.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/DraftGoodsSaveType.java
index e957c8bf..f210acf4 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/DraftGoodsSaveType.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/DraftGoodsSaveType.java
@@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums;
  * 草稿商品保存类型
  *
  * @author paulG
- * @date 2020/12/21
+ * @since 2020/12/21
  **/
 public enum DraftGoodsSaveType {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsAuthEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsAuthEnum.java
index ff5a9d63..2576a85f 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsAuthEnum.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsAuthEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums;
  * 商品审核
  *
  * @author pikachu
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 public enum GoodsAuthEnum {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsOperate.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsOperate.java
index 73b11585..89ff2822 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsOperate.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsOperate.java
@@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums;
  * 商品操作枚举
  *
  * @author pikachu
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 public enum GoodsOperate {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java
index ed6361d6..2cabe2c7 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums;
  * 商品审核
  *
  * @author pikachu
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 public enum GoodsSalesModeEnum {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsStatusEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsStatusEnum.java
index 7ea1a0cf..4f666422 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums;
  * 商品类型枚举
  *
  * @author pikachu
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 public enum GoodsStatusEnum {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsTypeEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsTypeEnum.java
index a81f870c..30a5557b 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums;
  * 商品类型
  *
  * @author Bulbasaur
- * @date: 2021/5/28 4:23 下午
+ * @since: 2021/5/28 4:23 下午
  */
 public enum GoodsTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java
index b3510524..77a11e81 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java
@@ -5,7 +5,7 @@ package cn.lili.modules.goods.entity.enums;
  * 直播间状态
  *
  * @author Bulbasaur
- * @date: 2021/5/31 10:32 上午
+ * @since: 2021/5/31 10:32 上午
  */
 public enum StudioStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/BrandVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/BrandVO.java
index beab43a5..354c473d 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/BrandVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/BrandVO.java
@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
  * 品牌VO
  *
  * @author pikachu
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 @Data
 public class BrandVO extends Brand {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryBrandVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryBrandVO.java
index c30a694f..3e413833 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryBrandVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryBrandVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 分类品牌VO
  *
  * @author pikachu
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 @Data
 public class CategoryBrandVO {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryVO.java
index e03b16a5..3f298e26 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryVO.java
@@ -17,7 +17,7 @@ import java.util.List;
  * 分类VO
  *
  * @author paulG
- * @date 2020/12/1
+ * @since 2020/12/1
  **/
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java
index 3e3ff8d9..a4b94178 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 直播商品VO
  *
  * @author Bulbasaur
- * @date: 2021/5/26 6:09 下午
+ * @since: 2021/5/26 6:09 下午
  */
 @Data
 public class CommodityVO extends Commodity {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/DraftGoodsVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/DraftGoodsVO.java
index 2bf39fad..ad1a47ce 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/DraftGoodsVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/DraftGoodsVO.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 草稿商品VO
  *
  * @author pikachu
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 @Data
 public class DraftGoodsVO extends DraftGoods {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/ExchangeVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/ExchangeVO.java
index 1be9128d..0c9f87b7 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/ExchangeVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/ExchangeVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 兑换VO
  *
  * @author pikachu
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 @Data
 public class ExchangeVO {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsOperateAllowable.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsOperateAllowable.java
index 7ea76081..e7b85e01 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsOperateAllowable.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsOperateAllowable.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * 商品操作允许的范围
  *
  * @author Bulbasaur
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 @Data
 @AllArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java
index 18d0a9d5..c3807097 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 商品参数vo
  *
  * @author pikachu
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 @Data
 public class GoodsParamsGroupVO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java
index 8b9a41e4..75928656 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java
@@ -9,7 +9,7 @@ import lombok.Data;
  * 商品关联参数的VO
  *
  * @author pikachu
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 @Data
 public class GoodsParamsVO extends GoodsParamsDTO {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuSpecVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuSpecVO.java
index 3fe8a9e7..70b980b3 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuSpecVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuSpecVO.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 商品规格VO
  *
  * @author paulG
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 @Data
 public class GoodsSkuSpecVO {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuVO.java
index bd526f81..32f3a030 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuVO.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 商品规格VO
  *
  * @author paulG
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsVO.java
index ebb31251..804940a3 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsVO.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 商品VO
  *
  * @author pikachu
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 @Data
 public class GoodsVO extends Goods {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/ParameterGroupVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/ParameterGroupVO.java
index 52b9059e..ee3c7045 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/ParameterGroupVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/ParameterGroupVO.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 参数组vo
  *
  * @author pikachu
- * @date 2020年03月02日 16:55:21
+ * @since 2020年03月02日 16:55:21
  */
 @ApiModel
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java
index 81bbc39b..89a9d540 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 规格值
  *
  * @author Chopper
- * @date 2020-02-26 23:24:13
+ * @since 2020-02-26 23:24:13
  */
 @Data
 public class SpecValueVO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/StockWarningVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StockWarningVO.java
index 4175772a..dadf68ee 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/StockWarningVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StockWarningVO.java
@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
  * 库存警告封装类
  *
  * @author paulG
- * @date 2020/12/24
+ * @since 2020/12/24
  **/
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java
index 8e69a784..d0be8433 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 直播间VO
  *
  * @author Bulbasaur
- * @date: 2021/5/31 11:58 上午
+ * @since: 2021/5/31 11:58 上午
  */
 @Data
 public class StudioVO extends Studio {
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/BrandMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/BrandMapper.java
index ded9fee8..fd04b50c 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/BrandMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/BrandMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 商品品牌数据处理层
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 public interface BrandMapper extends BaseMapper<Brand> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryBrandMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryBrandMapper.java
index daee3eb8..189d5b76 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryBrandMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryBrandMapper.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 商品分类品牌数据处理层
  *
  * @author pikachu
- * @date 2020-02-26 18:12:56
+ * @since 2020-02-26 18:12:56
  */
 public interface CategoryBrandMapper extends BaseMapper<CategoryBrand> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryMapper.java
index 2a518778..f6f837ee 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryMapper.java
@@ -1,30 +1,15 @@
 package cn.lili.modules.goods.mapper;
 
 import cn.lili.modules.goods.entity.dos.Category;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
 
 
 /**
  * 商品分类数据处理层
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 public interface CategoryMapper extends BaseMapper<Category> {
 
-    /**
-     * 获取分类名称列表
-     *
-     * @param queryWrapper 查询条件
-     * @return 分类名称列表
-     */
-    @Select("SELECT name FROM li_category ${ew.customSqlSegment} ")
-    List<String> getNamesByIds(@Param(Constants.WRAPPER) Wrapper<Category> queryWrapper);
-
 }
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryParameterGroupMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryParameterGroupMapper.java
index 7bedb837..e0427cd6 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryParameterGroupMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryParameterGroupMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 分类绑定参数组数据处理层
  *
  * @author pikachu
- * @date 2020-03-02 16:44:56
+ * @since 2020-03-02 16:44:56
  */
 public interface CategoryParameterGroupMapper extends BaseMapper<CategoryParameterGroup> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java
index 703ac95e..8667be9d 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 商品分类规格数据处理层
  *
  * @author pikachu
- * @date 2020-02-27 15:18:56
+ * @since 2020-02-27 15:18:56
  */
 public interface CategorySpecificationMapper extends BaseMapper<CategorySpecification> {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java
index a2d2f58f..da1559a8 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java
@@ -15,7 +15,7 @@ import java.util.List;
  * 直播商品数据层
  *
  * @author Bulbasaur
- * @date: 2021/5/17 9:56 上午
+ * @since: 2021/5/17 9:56 上午
  */
 public interface CommodityMapper extends BaseMapper<Commodity> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/DraftGoodsMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/DraftGoodsMapper.java
index 0e1137f5..d08bb376 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/DraftGoodsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/DraftGoodsMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 草稿商品数据处理层
  *
  * @author paulG
- * @date 2020/12/19
+ * @since 2020/12/19
  **/
 public interface DraftGoodsMapper extends BaseMapper<DraftGoods> {
 }
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsGalleryMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsGalleryMapper.java
index 5ce5232f..1289d21b 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsGalleryMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsGalleryMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 商品相册数据处理层
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 public interface GoodsGalleryMapper extends BaseMapper<GoodsGallery> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsMapper.java
index 561bf9c3..9c1b5259 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsMapper.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 规格项数据处理层
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 public interface GoodsMapper extends BaseMapper<Goods> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java
index 285ac23d..304b8cd9 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 规格项数据处理层
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 public interface GoodsSkuMapper extends BaseMapper<GoodsSku> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsUnitMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsUnitMapper.java
index 912c5a52..53b3b040 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsUnitMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsUnitMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 商品计量单位数据处理层
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:11
+ * @since 2020/11/26 16:11
  */
 public interface GoodsUnitMapper extends BaseMapper<GoodsUnit> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsWordsMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsWordsMapper.java
index f34e4fa3..3308b384 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsWordsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsWordsMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 商品关键字数据处理层
  *
  * @author paulG
- * @date 2020/10/15
+ * @since 2020/10/15
  **/
 public interface GoodsWordsMapper extends BaseMapper<GoodsWords> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/ParametersMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/ParametersMapper.java
index c57dc7d5..bb9010b7 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/ParametersMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/ParametersMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 商品参数数据处理层
  *
  * @author pikachu
- * @date 2020-03-02 17:27:56
+ * @since 2020-03-02 17:27:56
  */
 public interface ParametersMapper extends BaseMapper<Parameters> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/SpecificationMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/SpecificationMapper.java
index 609f4cd1..8c554d83 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/SpecificationMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/SpecificationMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 规格数据处理层
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 public interface SpecificationMapper extends BaseMapper<Specification> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java
index 32fa0e7c..00d7c77a 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 直播间-商品关联持久层
  * @author Bulbasaur
- * @date: 2021/5/17 3:14 下午
+ * @since: 2021/5/17 3:14 下午
  *
  */
 public interface StudioCommodityMapper extends BaseMapper<StudioCommodity> {
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java
index de5c6522..d7509194 100644
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java
+++ b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 直播间数据层
  *
  * @author Bulbasaur
- * @date: 2021/5/17 9:56 上午
+ * @since: 2021/5/17 9:56 上午
  */
 public interface StudioMapper extends BaseMapper<Studio> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/BrandService.java b/framework/src/main/java/cn/lili/modules/goods/service/BrandService.java
index 45d3f2c3..622d735d 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/BrandService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/BrandService.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 商品品牌业务层
  *
  * @author pikachu
- * @date 2020-02-18 16:18:56
+ * @since 2020-02-18 16:18:56
  */
 public interface BrandService extends IService<Brand> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/CategoryBrandService.java b/framework/src/main/java/cn/lili/modules/goods/service/CategoryBrandService.java
index 8ef40842..95703167 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/CategoryBrandService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/CategoryBrandService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 商品分类品牌业务层
  *
  * @author pikachu
- * @date 2020-02-26 16:18:56
+ * @since 2020-02-26 16:18:56
  */
 public interface CategoryBrandService extends IService<CategoryBrand> {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/CategoryParameterGroupService.java b/framework/src/main/java/cn/lili/modules/goods/service/CategoryParameterGroupService.java
index a870b4b8..ededf284 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/CategoryParameterGroupService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/CategoryParameterGroupService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 分类绑定参数组业务层
  *
  * @author pikachu
- * @date 2020-03-02 16:44:56
+ * @since 2020-03-02 16:44:56
  */
 public interface CategoryParameterGroupService extends IService<CategoryParameterGroup> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java b/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java
index 29aa26d0..abc9e479 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 商品分类业务层
  *
  * @author pikachu
- * @date 2020-03-02 16:44:56
+ * @since 2020-03-02 16:44:56
  */
 public interface CategoryService extends IService<Category> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/CategorySpecificationService.java b/framework/src/main/java/cn/lili/modules/goods/service/CategorySpecificationService.java
index c0a24f78..e560255e 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/CategorySpecificationService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/CategorySpecificationService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 商品分类规格业务层
  *
  * @author pikachu
- * @date 2020-02-26 16:18:56
+ * @since 2020-02-26 16:18:56
  */
 public interface CategorySpecificationService extends IService<CategorySpecification> {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java b/framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java
index 669215e5..46437a39 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 直播商品业务层
  *
  * @author Bulbasaur
- * @date: 2021/5/17 10:39 上午
+ * @since: 2021/5/17 10:39 上午
  */
 public interface CommodityService extends IService<Commodity> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java
index c041e523..f38cc1d2 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java
@@ -15,7 +15,7 @@ import java.util.List;
  * 商品业务层
  *
  * @author pikachu
- * @date 2020-02-23 16:18:56
+ * @since 2020-02-23 16:18:56
  */
 public interface GoodsService extends IService<Goods> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java
index c2976aaa..e758a1a6 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java
@@ -1,11 +1,10 @@
 package cn.lili.modules.goods.service;
 
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsSearchParams;
 import cn.lili.modules.goods.entity.dto.GoodsSkuStockDTO;
-import cn.lili.modules.goods.entity.vos.GoodsSkuSpecVO;
 import cn.lili.modules.goods.entity.vos.GoodsSkuVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,7 +16,7 @@ import java.util.Map;
  * 商品sku业务层
  *
  * @author pikachu
- * @date 2020-02-24 16:18:56
+ * @since 2020-02-24 16:18:56
  */
 public interface GoodsSkuService extends IService<GoodsSku> {
 
@@ -82,14 +81,6 @@ public interface GoodsSkuService extends IService<GoodsSku> {
      */
     Map<String, Object> getGoodsSkuDetail(String goodsId, String skuId);
 
-    /**
-     * 根据商品分组商品sku及其规格信息
-     *
-     * @param goodsId 商品id
-     * @return 分组后的商品sku及其规格信息
-     */
-    List<GoodsSkuSpecVO> groupBySkuAndSpec(String goodsId);
-
     /**
      * 批量从redis中获取商品SKU信息
      *
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsUnitService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsUnitService.java
index 3b4e2cf3..b29da3b0 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/GoodsUnitService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/GoodsUnitService.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 商品计量单位业务层
  *
  * @author Bulbasaur
- * @date: 2020/11/26 16:12
+ * @since: 2020/11/26 16:12
  */
 public interface GoodsUnitService extends IService<GoodsUnit> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/ParametersService.java b/framework/src/main/java/cn/lili/modules/goods/service/ParametersService.java
index 6c438b22..3a390f36 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/ParametersService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/ParametersService.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 商品参数业务层
  *
  * @author pikachu
- * @date 2020-03-02 16:18:56
+ * @since 2020-03-02 16:18:56
  */
 public interface ParametersService extends IService<Parameters> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/SpecificationService.java b/framework/src/main/java/cn/lili/modules/goods/service/SpecificationService.java
index b6e436a6..8ebdfc00 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/SpecificationService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/SpecificationService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 规格业务层
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 public interface SpecificationService extends IService<Specification> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java b/framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java
index ced678fb..aee3a2f7 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 直播间-商品关联业务层
  *
  * @author Bulbasaur
- * @date: 2021/5/17 3:19 下午
+ * @since: 2021/5/17 3:19 下午
  */
 public interface StudioCommodityService extends IService<StudioCommodity> {
 }
diff --git a/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java b/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java
index d102dd7a..80b3fc0b 100644
--- a/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java
+++ b/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.goods.service;
 
-import cn.lili.common.delayqueue.BroadcastMessage;
+import cn.lili.trigger.message.BroadcastMessage;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.Studio;
 import cn.lili.modules.goods.entity.vos.StudioVO;
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 直播间业务层
  *
  * @author Bulbasaur
- * @date: 2021/5/17 10:02 上午
+ * @since: 2021/5/17 10:02 上午
  */
 public interface StudioService extends IService<Studio> {
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java
index e90a8757..5e5abf99 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java
@@ -2,7 +2,7 @@ package cn.lili.modules.goods.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.modules.goods.entity.dos.Brand;
 import cn.lili.modules.goods.entity.dos.CategoryBrand;
 import cn.lili.modules.goods.entity.dto.BrandPageDTO;
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
  * 商品品牌业务层实现
  *
  * @author pikachu
- * @date 2020-02-18 16:18:56
+ * @since 2020-02-18 16:18:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java
index 34b2ef23..622ebd20 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java
@@ -18,7 +18,7 @@ import java.util.List;
  * 规格项业务层实现
  *
  * @author pikachu
- * @date 2020-02-18 16:18:56
+ * @since 2020-02-18 16:18:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java
index bc102fca..fcf3a41f 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java
@@ -1,8 +1,8 @@
 package cn.lili.modules.goods.serviceimpl;
 
 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.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.goods.entity.dos.Category;
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
  * 商品分类业务层实现
  *
  * @author pikachu
- * @date 2020-02-23 15:18:56
+ * @since 2020-02-23 15:18:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -144,9 +144,8 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
      */
     @Override
     public List<String> getCategoryNameByIds(List<String> ids) {
-        LambdaQueryWrapper<Category> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(Category::getId, ids);
-        return this.baseMapper.getNamesByIds(queryWrapper);
+        List<String> categoryVOS = categoryTree().stream().filter(item -> ids.contains(item.getId())).map(Category::getName).collect(Collectors.toList());
+        return categoryVOS;
     }
 
     @Override
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java
index 7a76119a..49b0a82b 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java
@@ -15,7 +15,7 @@ import java.util.List;
  * 商品分类规格业务层实现
  *
  * @author pikachu
- * @date 2020-02-23 15:18:56
+ * @since 2020-02-23 15:18:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java
index 088ffc6b..2555e053 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java
@@ -8,7 +8,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.Commodity;
 import cn.lili.modules.goods.entity.dto.CommodityDTO;
@@ -33,7 +33,7 @@ import java.util.List;
  * 直播商品业务层实现
  *
  * @author Bulbasaur
- * @date: 2021/5/17 11:16 上午
+ * @since: 2021/5/17 11:16 上午
  */
 @Service
 public class CommodityServiceImpl extends ServiceImpl<CommodityMapper, Commodity> implements CommodityService {
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
index 5d7b054b..79699953 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
@@ -1,11 +1,14 @@
 package cn.lili.modules.goods.serviceimpl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.utils.PageUtil;
-import cn.lili.common.utils.StringUtils;
-import cn.lili.modules.goods.entity.dos.*;
+import cn.lili.modules.goods.entity.dos.Category;
+import cn.lili.modules.goods.entity.dos.DraftGoods;
+import cn.lili.modules.goods.entity.dos.GoodsGallery;
+import cn.lili.modules.goods.entity.dos.GoodsSku;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.modules.goods.entity.dto.DraftGoodsDTO;
 import cn.lili.modules.goods.entity.dto.DraftGoodsSearchParams;
 import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
@@ -135,16 +138,16 @@ public class DraftGoodsServiceImpl extends ServiceImpl<DraftGoodsMapper, DraftGo
                     sku.setSn(m.getValue() != null ? m.getValue().toString() : "");
                     break;
                 case "cost":
-                    sku.setCost(StringUtils.toDouble(m.getValue(), false));
+                    sku.setCost(Convert.toDouble(m.getValue()));
                     break;
                 case "price":
-                    sku.setPrice(StringUtils.toDouble(m.getValue(), false));
+                    sku.setPrice(Convert.toDouble(m.getValue()));
                     break;
                 case "quantity":
-                    sku.setQuantity(StringUtils.toInt(m.getValue(), false));
+                    sku.setQuantity(Convert.toInt(m.getValue()));
                     break;
                 case "weight":
-                    sku.setWeight(StringUtils.toDouble(m.getValue(), false));
+                    sku.setWeight(Convert.toDouble(m.getValue()));
                     break;
                 default:
                     specMap.put(m.getKey(), m.getValue());
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
index 35232459..9b04f350 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
@@ -6,13 +6,13 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.Category;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dos.GoodsGallery;
@@ -46,6 +46,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -57,10 +60,11 @@ import java.util.List;
  * 商品业务层实现
  *
  * @author pikachu
- * @date 2020-02-23 15:18:56
+ * @since 2020-02-23 15:18:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
+@CacheConfig(cacheNames = "{goods}")
 public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
 
 
@@ -153,6 +157,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
 
     @Override
+    @CachePut(key = "#goodsId")
     public void editGoods(GoodsOperationDTO goodsOperationDTO, String goodsId) {
         Goods goods = new Goods(goodsOperationDTO);
         goods.setId(goodsId);
@@ -176,6 +181,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
+    @Cacheable(key = "#goodsId")
     public GoodsVO getGoodsVO(String goodsId) {
         //查询商品信息
         Goods goods = this.getById(goodsId);
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
index 0948d00f..bfbe6ff5 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
@@ -2,17 +2,17 @@ package cn.lili.modules.goods.serviceimpl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
-import cn.lili.common.utils.StringUtils;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.mybatis.util.PageUtil;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
@@ -53,7 +53,7 @@ import java.util.stream.Collectors;
  * 商品sku业务层实现
  *
  * @author pikachu
- * @date 2020-02-23 15:18:56
+ * @since 2020-02-23 15:18:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -97,10 +97,12 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
     /**
      * 商品
      */
+    @Autowired
     private GoodsService goodsService;
     /**
      * 商品索引
      */
+    @Autowired
     private EsGoodsIndexService goodsIndexService;
 
     @Override
@@ -179,7 +181,9 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
 
     @Override
     public GoodsSku getGoodsSkuByIdFromCache(String id) {
+        //获取缓存中的sku
         GoodsSku goodsSku = cache.get(GoodsSkuService.getCacheKeys(id));
+        //如果缓存中没有信息，则查询数据库，然后写入缓存
         if (goodsSku == null) {
             goodsSku = this.getById(id);
             if (goodsSku == null) {
@@ -187,30 +191,27 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
             }
             cache.put(GoodsSkuService.getCacheKeys(id), goodsSku);
         }
-        String quantity = stringRedisTemplate.opsForValue().get(GoodsSkuService.getStockCacheKey(id));
-        if (quantity != null) {
-            if (goodsSku.getQuantity().equals(Convert.toInt(quantity))) {
-                goodsSku.setQuantity(Convert.toInt(quantity));
-                this.updateById(goodsSku);
-            }
-        } else {
-            stringRedisTemplate.opsForValue().set(GoodsSkuService.getStockCacheKey(id), goodsSku.getQuantity().toString());
-        }
 
+        //获取商品库存
+        String quantity = stringRedisTemplate.opsForValue().get(GoodsSkuService.getStockCacheKey(id));
+
+        //如果sku缓存的库存与库存缓存不符则按照库存缓存进行
+        if (StrUtil.isNotEmpty(quantity)) {
+            goodsSku.setQuantity(Convert.toInt(quantity));
+            cache.put(GoodsSkuService.getCacheKeys(goodsSku.getId()), goodsSku);
+        }
         return goodsSku;
     }
 
     @Override
     public Map<String, Object> getGoodsSkuDetail(String goodsId, String skuId) {
         Map<String, Object> map = new HashMap<>(16);
+        //获取商品VO
+        GoodsVO goodsVO = goodsService.getGoodsVO(goodsId);
+        //从缓存拿商品Sku
         GoodsSku goodsSku = this.getGoodsSkuByIdFromCache(skuId);
 
-        GoodsVO goodsVO = goodsService.getGoodsVO(goodsId);
-        if (goodsVO == null || !goodsVO.getMarketEnable().equals(GoodsStatusEnum.UPPER.name())
-                || !goodsVO.getIsAuth().equals(GoodsAuthEnum.PASS.name())
-                || Boolean.TRUE.equals(goodsVO.getDeleteFlag())) {
-            throw new ServiceException(ResultCode.GOODS_NOT_EXIST);
-        }
+
         //如果规格为空则使用商品ID进行查询
         if (goodsSku == null) {
             skuId = goodsVO.getSkuList().get(0).getId();
@@ -220,11 +221,20 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
                 throw new ServiceException(ResultCode.GOODS_NOT_EXIST);
             }
         }
+
+        //商品为空||商品下架||商品未审核通过||商品删除，则提示：商品已下架
+        if (goodsVO == null || goodsVO.getMarketEnable().equals(GoodsStatusEnum.DOWN.name())
+                || !goodsVO.getIsAuth().equals(GoodsAuthEnum.PASS.name())
+                || Boolean.TRUE.equals(goodsVO.getDeleteFlag())) {
+            throw new ServiceException(ResultCode.GOODS_NOT_EXIST);
+        }
+
         //获取当前商品的索引信息
         EsGoodsIndex goodsIndex = goodsIndexService.findById(skuId);
         if (goodsIndex == null) {
             goodsIndex = goodsIndexService.resetEsGoodsIndex(goodsSku, goodsVO.getGoodsParamsDTOList());
         }
+
         //商品规格
         GoodsSkuVO goodsSkuDetail = this.getGoodsSkuVO(goodsSku);
 
@@ -239,7 +249,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         map.put("categoryName", categoryService.getCategoryNameByIds(Arrays.asList(split)));
 
         //获取规格信息
-        map.put("specs", this.groupBySkuAndSpec(goodsSkuDetail.getGoodsId()));
+        map.put("specs", this.groupBySkuAndSpec(goodsVO.getSkuList()));
         map.put("promotionMap", goodsIndex.getPromotionMap());
 
         //获取参数信息
@@ -256,20 +266,6 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         return map;
     }
 
-    @Override
-    public List<GoodsSkuSpecVO> groupBySkuAndSpec(String goodsId) {
-        List<GoodsSkuVO> goodsListByGoodsId = this.getGoodsListByGoodsId(goodsId);
-        List<GoodsSkuSpecVO> skuSpecVOList = new ArrayList<>();
-        for (GoodsSkuVO goodsSkuVO : goodsListByGoodsId) {
-            GoodsSkuSpecVO specVO = new GoodsSkuSpecVO();
-            specVO.setSkuId(goodsSkuVO.getId());
-            specVO.setSpecValues(goodsSkuVO.getSpecList());
-            specVO.setQuantity(goodsSkuVO.getQuantity());
-            skuSpecVOList.add(specVO);
-        }
-        return skuSpecVOList;
-    }
-
     /**
      * 更新商品sku状态
      *
@@ -340,7 +336,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
 
     @Override
     public GoodsSkuVO getGoodsSkuVO(GoodsSku goodsSku) {
-        //厨师还商品
+        //初始化商品
         GoodsSkuVO goodsSkuVO = new GoodsSkuVO(goodsSku);
         //获取sku信息
         JSONObject jsonObject = JSONUtil.parseObj(goodsSku.getSpecs());
@@ -434,7 +430,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
                     quantity += goodsSku.getQuantity();
                 }
             }
-            //保存商品库存结果     这里在for循环中调用数据库保存不太好，需要优化
+            //保存商品库存结果
             goodsService.updateStock(goodsId, quantity);
         }
 
@@ -641,7 +637,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
                     }
                     //设置规格商品缩略图
                     //如果规格没有图片，则用商品图片复盖。有则增加规格图片，放在商品图片集合之前
-                    if (spec.getValue() != null && StringUtils.isNotEmpty(spec.getValue().toString())) {
+                    if (spec.getValue() != null && StrUtil.isNotEmpty(spec.getValue().toString())) {
                         thumbnail = goodsGalleryService.getGoodsGallery(images.get(0).get("url")).getThumbnail();
                         small = goodsGalleryService.getGoodsGallery(images.get(0).get("url")).getSmall();
                     }
@@ -676,13 +672,23 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         }
     }
 
-    @Autowired
-    public void setGoodsService(GoodsService goodsService) {
-        this.goodsService = goodsService;
+    /**
+     * 根据商品分组商品sku及其规格信息
+     *
+     * @param goodsSkuVOList 商品VO列表
+     * @return 分组后的商品sku及其规格信息
+     */
+    private List<GoodsSkuSpecVO> groupBySkuAndSpec(List<GoodsSkuVO> goodsSkuVOList) {
+
+        List<GoodsSkuSpecVO> skuSpecVOList = new ArrayList<>();
+        for (GoodsSkuVO goodsSkuVO : goodsSkuVOList) {
+            GoodsSkuSpecVO specVO = new GoodsSkuSpecVO();
+            specVO.setSkuId(goodsSkuVO.getId());
+            specVO.setSpecValues(goodsSkuVO.getSpecList());
+            specVO.setQuantity(goodsSkuVO.getQuantity());
+            skuSpecVOList.add(specVO);
+        }
+        return skuSpecVOList;
     }
 
-    @Autowired
-    public void setGoodsIndexService(EsGoodsIndexService goodsIndexService) {
-        this.goodsIndexService = goodsIndexService;
-    }
 }
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java
index 83655296..f7c689c4 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java
@@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 计量单位业务层实现
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:13
+ * @since 2020/11/26 16:13
  */
 @Service
 public class GoodsUnitServiceImpl extends ServiceImpl<GoodsUnitMapper, GoodsUnit> implements GoodsUnitService {
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java
index 1316a719..c468b0a7 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java
@@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 商品参数业务层实现
  *
  * @author pikachu
- * @date 2020-03-02 16:18:56
+ * @since 2020-03-02 16:18:56
  */
 @Service
 public class ParametersServiceImpl extends ServiceImpl<ParametersMapper, Parameters> implements ParametersService {
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecificationServiceImpl.java
index ea1b5575..e1c645d4 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecificationServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecificationServiceImpl.java
@@ -21,7 +21,7 @@ import java.util.List;
  * 商品规格业务层实现
  *
  * @author pikachu
- * @date 2020-02-18 16:18:56
+ * @since 2020-02-18 16:18:56
  */
 @Service
 public class SpecificationServiceImpl extends ServiceImpl<SpecificationMapper, Specification> implements SpecificationService {
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java
index 8111b8c7..9ff349a1 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
  * 直播间-商品关联业务层实现
  *
  * @author Bulbasaur
- * @date: 2021/5/17 3:20 下午
+ * @since: 2021/5/17 3:20 下午
  */
 @Service
 public class StudioCommodityServiceImpl extends ServiceImpl<StudioCommodityMapper, StudioCommodity> implements StudioCommodityService {
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java
index aa487b98..393a0c26 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java
@@ -2,21 +2,21 @@ package cn.lili.modules.goods.serviceimpl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.delayqueue.BroadcastMessage;
+import cn.lili.trigger.message.BroadcastMessage;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.util.DelayQueueTools;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.DateUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.Studio;
 import cn.lili.modules.goods.entity.dos.StudioCommodity;
 import cn.lili.modules.goods.entity.enums.StudioStatusEnum;
@@ -41,7 +41,7 @@ import java.util.Map;
  * 小程序直播间业务层实现
  *
  * @author Bulbasaur
- * @date: 2021/5/17 10:04 上午
+ * @since: 2021/5/17 10:04 上午
  */
 @Service
 public class StudioServiceImpl extends ServiceImpl<StudioMapper, Studio> implements StudioService {
diff --git a/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java b/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java
index 7c19170f..6dd97a8f 100644
--- a/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java
+++ b/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java
@@ -20,7 +20,7 @@ import java.util.Map;
  * 微信小程序直播工具类
  *
  * @author Bulbasaur
- * @date: 2021/5/17 10:16 上午
+ * @since: 2021/5/17 10:16 上午
  */
 @Slf4j
 @Component
diff --git a/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java b/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java
index 6053b7f3..686fa51f 100644
--- a/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java
+++ b/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java
@@ -17,7 +17,7 @@ import java.net.URL;
  * 微信媒体工具
  *
  * @author Bulbasaur
- * @date: 2021/5/19 8:02 下午
+ * @since: 2021/5/19 8:02 下午
  */
 @Slf4j
 @Component
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java b/framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java
index 61b3d1a6..2eb036f2 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java
@@ -7,7 +7,7 @@ import java.lang.annotation.*;
  * 会员积分操作aop
  *
  * @author pikachu
- * @date 2020/11/17 7:22 下午
+ * @since 2020/11/17 7:22 下午
  */
 @Target({ElementType.PARAMETER, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java
index 6699442f..bc9dc56b 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
  * 积分操作切面
  *
  * @author Chopper
- * @date 2020/11/17 7:22 下午
+ * @since 2020/11/17 7:22 下午
  */
 @Slf4j
 @Aspect
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java
index 9c68a425..f87f0472 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +15,7 @@ import javax.persistence.Table;
  * 浏览历史
  *
  * @author Chopper
- * @date 2020/11/17 7:22 下午
+ * @since 2020/11/17 7:22 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java
index 749a97c4..d0569475 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java
@@ -22,7 +22,7 @@ import java.util.Date;
  * 会员商品收藏
  *
  * @author Chopper
- * @date 2020/11/18 3:31 下午
+ * @since 2020/11/18 3:31 下午
  */
 @Data
 @Entity
@@ -41,7 +41,7 @@ public class GoodsCollection {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java
index 6b95367d..d78d1189 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.enums.ClientTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -20,7 +20,7 @@ import java.util.Date;
  * 会员
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
@@ -46,7 +46,7 @@ public class Member extends BaseEntity {
     private Integer sex;
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "会员生日")
     private Date birthday;
 
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java
index ad78c35b..115ea94e 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.validation.Phone;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotEmpty;
  * 会员地址
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java
index 7e9f35c0..c6b3bd18 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
@@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull;
  * 会员商品评价
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java
index e65abef7..1048a6ec 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
  * 会员等级
  *
  * @author Bulbasaur
- * @date 2021/5/14 5:43 下午
+ * @since 2021/5/14 5:43 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java
index 12fdb810..4ca4513a 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java
@@ -1,11 +1,10 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -14,7 +13,7 @@ import javax.persistence.Table;
  * 会员站内信
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java
index 44dfe402..1bc250a0 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -17,7 +17,7 @@ import java.util.Date;
  * 会员消息
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
@@ -63,7 +63,7 @@ public class MemberNoticeLog extends BaseEntity {
     @Column(name = "send_time")
     @ApiModelProperty(value = "发送时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
     private Date sendTime;
     /**
      * 发送类型
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java
index e7c8d4c8..b7196aba 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.persistence.Table;
  * 会员消息
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java
index 8da788be..97519e06 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java
@@ -25,7 +25,7 @@ import java.util.Date;
  * 会员积分历史
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
@@ -50,7 +50,7 @@ public class MemberPointsHistory {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java
index b8ef4538..a912ce41 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java
@@ -21,7 +21,7 @@ import java.util.Date;
  * 会员发票
  *
  * @author Chopper
- * @date 2021-03-29 14:10:16
+ * @since 2021-03-29 14:10:16
  */
 @Data
 @Entity
@@ -70,7 +70,7 @@ public class MemberReceipt {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java
index 2691fedd..aa27d31c 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java
@@ -21,7 +21,7 @@ import java.util.Date;
  * 会员签到
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
@@ -41,7 +41,7 @@ public class MemberSign {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java
index cf7c3a35..e83edce2 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +13,7 @@ import javax.persistence.Table;
  * 会员预存款
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java
index 5d3a779c..c5ab2f1a 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -18,7 +18,7 @@ import java.util.Date;
  * 会员提现申请
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
@@ -46,7 +46,7 @@ public class MemberWithdrawApply extends BaseEntity {
 
     @ApiModelProperty(value="审核时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     private Date inspectTime;
 
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java
index 09aba9b8..e00ce3b2 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +15,7 @@ import javax.persistence.Table;
  * 会员店铺收藏
  *
  * @author Chopper
- * @date 2020/11/18 3:32 下午
+ * @since 2020/11/18 3:32 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java
index 5ff36340..28fb21f8 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java
@@ -12,7 +12,7 @@ import lombok.Data;
  * 评价查询条件
  *
  * @author Bulbasaur
- * @date 2020/11/30 14:52
+ * @since 2020/11/30 14:52
  */
 @Data
 public class EvaluationQueryParams extends PageVO {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java
index 1e2987a7..6b021869 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java
@@ -16,7 +16,7 @@ import java.util.Date;
  * 用于后台的用户信息修改
  *
  * @author Bulbasaur
- * @date 2020/12/15 9:57
+ * @since 2020/12/15 9:57
  */
 @Data
 public class ManagerMemberEditDTO {
@@ -45,7 +45,7 @@ public class ManagerMemberEditDTO {
     private Integer sex;
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "会员生日")
     private Date birthday;
 
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java
index 4389e2af..6d54c0a9 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java
@@ -11,7 +11,7 @@ import javax.validation.constraints.Size;
  * 添加会员DTO
  *
  * @author Bulbasaur
- * @date 2020/12/14 16:31
+ * @since 2020/12/14 16:31
  */
 @Data
 public class MemberAddDTO {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddressDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddressDTO.java
index ad07b84b..dd77a186 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddressDTO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddressDTO.java
@@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty;
  * 会员地址DTO
  *
  * @author Bulbasaur
- * @date 2020/12/14 16:31
+ * @since 2020/12/14 16:31
  */
 @Data
 public class MemberAddressDTO {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEditDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEditDTO.java
index f07866cd..37aa56df 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEditDTO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEditDTO.java
@@ -15,7 +15,7 @@ import java.util.Date;
  * 会员信息修改DTO
  *
  * @author Bulbasaur
- * @date 2020/12/11 14:39
+ * @since 2020/12/11 14:39
  */
 @Data
 public class MemberEditDTO {
@@ -38,7 +38,7 @@ public class MemberEditDTO {
     private Integer sex;
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "会员生日")
     private Date birthday;
 
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEvaluationDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEvaluationDTO.java
index 825944a3..ceef0503 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEvaluationDTO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEvaluationDTO.java
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotEmpty;
  * 会员评价DTO
  *
  * @author Chopper
- * @date 2020/11/29 11:13 下午
+ * @since 2020/11/29 11:13 下午
  */
 @Data
 public class MemberEvaluationDTO {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberPointMessage.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberPointMessage.java
index 439bff9f..02eccd08 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberPointMessage.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberPointMessage.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 会员积分
  *
  * @author Bulbasaur
- * @date 2020/12/14 16:31
+ * @since 2020/12/14 16:31
  */
 @Data
 public class MemberPointMessage {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java
index c12fc573..2e468323 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 会员提现消息
  *
  * @author Bulbasaur
- * @date 2020/12/14 16:31
+ * @since 2020/12/14 16:31
  */
 @Data
 public class MemberWithdrawalMessage {
@@ -18,6 +18,9 @@ public class MemberWithdrawalMessage {
     @ApiModelProperty(value = "会员id")
     private String memberId;
 
+    @ApiModelProperty(value = "提现状态")
+    private String status;
+
     /**
      * @see cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum
      */
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/EvaluationGradeEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/EvaluationGradeEnum.java
index a6a0758b..61f3a051 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/enums/EvaluationGradeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/EvaluationGradeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums;
  * 评价枚举
  *
  * @author Chopper
- * @date 2021/3/20 10:44
+ * @since 2021/3/20 10:44
  */
 
 public enum EvaluationGradeEnum {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberReceiptEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberReceiptEnum.java
index 9e846658..d483d896 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberReceiptEnum.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberReceiptEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums;
  * 发票类型
  *
  * @author Chopper
- * @date 2021-03-29 14:10:16
+ * @since 2021-03-29 14:10:16
  */
 public enum MemberReceiptEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java
index bdbbedee..bfcbaa0a 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums;
  * 会员提现到哪里 枚举
  *
  * @author Chopper
- * @date 2021/3/20 10:44
+ * @since 2021/3/20 10:44
  */
 
 public enum MemberWithdrawalDestinationEnum {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java
index 3f965ae5..3c456c40 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums;
  * 积分类型枚举
  *
  * @author Chopper
- * @date 2021/3/20 10:44
+ * @since 2021/3/20 10:44
  */
 
 public enum PointTypeEnum {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/SendTypeEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/SendTypeEnum.java
index f34f30a1..36ec9f86 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/enums/SendTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/SendTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums;
  * 发送类型
  *
  * @author Chopper
- * @date 2020-03-10 11:35 上午
+ * @since 2020-03-10 11:35 上午
  */
 public enum SendTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java
index bb4ea569..53b96e94 100755
--- a/framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums;
  * 提现申请状态枚举类
  *
  * @author pikachu
- * @date 2020-11-06
+ * @since 2020-11-06
  */
 public enum WithdrawStatusEnum {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java
index 9993b449..152bee47 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 评价数量VO
  *
  * @author Chopper
- * @date 2021/1/27 10:41 上午
+ * @since 2021/1/27 10:41 上午
  */
 @Data
 public class EvaluationNumberVO {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/GoodsCollectionVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/GoodsCollectionVO.java
index e0478568..a885c758 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/GoodsCollectionVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/GoodsCollectionVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 会员商品收藏VO
  *
  * @author Chopper
- * @date 2021/1/27 10:41 上午
+ * @since 2021/1/27 10:41 上午
  */
 @Data
 public class GoodsCollectionVO {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberDistributionVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberDistributionVO.java
index 3b02e2dc..c272cfe3 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberDistributionVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberDistributionVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 会员分布VO
  *
  * @author Chopper
- * @date 2021-02-26 17:25
+ * @since 2021-02-26 17:25
  */
 @Data
 public class MemberDistributionVO {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java
index ae6408a9..b7887db2 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * 会员评价VO
  *
  * @author Bulbasaur
- * @date 2020/11/30 15:00
+ * @since 2020/11/30 15:00
  */
 @Data
 public class MemberEvaluationListVO {
@@ -39,7 +39,7 @@ public class MemberEvaluationListVO {
 
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationVO.java
index 1806d0e4..db0dbe26 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationVO.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 会员评价VO
  *
  * @author Bulbasaur
- * @date 2020/11/30 15:00
+ * @since 2020/11/30 15:00
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberPointsHistoryVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberPointsHistoryVO.java
index 04b43ada..d5272b2a 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberPointsHistoryVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberPointsHistoryVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 会员积分VO
  *
  * @author Chopper
- * @date 2021/2/25 9:52 上午
+ * @since 2021/2/25 9:52 上午
  */
 @Data
 public class MemberPointsHistoryVO {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptAddVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptAddVO.java
index 4c3d030f..eaf5f049 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptAddVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptAddVO.java
@@ -9,7 +9,7 @@ import lombok.Data;
  * 会员发票添加VO
  *
  * @author Chopper
- * @date 2021-03-29 14:10:16
+ * @since 2021-03-29 14:10:16
  */
 @Data
 @ApiModel(value = "会员发票")
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptVO.java
index 9de46587..fb9ae9d7 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptVO.java
@@ -12,7 +12,7 @@ import lombok.Data;
  * 会员发票查询VO
  *
  * @author Chopper
- * @date 2021-03-29 14:10:16
+ * @since 2021-03-29 14:10:16
  */
 @Data
 @ApiModel(value = "会员发票")
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberSearchVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberSearchVO.java
index f40e5eba..caae52d6 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberSearchVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberSearchVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 会员搜索VO
  *
  * @author Bulbasaur
- * @date 2020/12/15 10:48
+ * @since 2020/12/15 10:48
  */
 @Data
 public class MemberSearchVO {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java
index 257d7cbe..774084ea 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java
@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
  * 会员预存款VO
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @ApiModel(value = "会员预存款")
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java
index c3fd1e1c..e5c72401 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java
@@ -12,7 +12,7 @@ import java.io.Serializable;
  * 余额提现记录查询条件
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @ApiModel(value = "余额提现记录查询条件")
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreCollectionVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreCollectionVO.java
index 1068bb1b..903fcd12 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreCollectionVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreCollectionVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 会员店铺收藏VO
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 public class StoreCollectionVO {
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreRatingVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreRatingVO.java
index e455e1f7..2410eeda 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreRatingVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreRatingVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 评分VO
  *
  * @author Chopper
- * @date 2021/3/15 5:55 下午
+ * @since 2021/3/15 5:55 下午
  */
 @Data
 public class StoreRatingVO {
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java
index d85a0525..ecfee4c7 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java
@@ -15,7 +15,7 @@ import java.util.List;
  * 浏览历史数据处理层
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface FootprintMapper extends BaseMapper<FootPrint> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/GoodsCollectionMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/GoodsCollectionMapper.java
index 651d4439..f7a83fa7 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/GoodsCollectionMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/GoodsCollectionMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select;
  * 会员收藏数据处理层
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface GoodsCollectionMapper extends BaseMapper<GoodsCollection> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberAddressMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberAddressMapper.java
index 525d768d..45561976 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberAddressMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberAddressMapper.java
@@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dos.MemberAddress;
  * 会员地址数据处理层
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberAddressMapper extends BaseMapper<MemberAddress> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java
index 2f6c9afa..f6b88ce2 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java
@@ -17,7 +17,7 @@ import java.util.Map;
  * 会员商品评价数据处理层
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberEvaluationMapper extends BaseMapper<MemberEvaluation> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberGradeMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberGradeMapper.java
index 64073199..60814123 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberGradeMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberGradeMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 会员等级数据层
  *
  * @author Bulbasaur
- * @date: 2021/5/14 5:57 下午
+ * @since: 2021/5/14 5:57 下午
  */
 public interface MemberGradeMapper extends BaseMapper<MemberGrade> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java
index 4dde7577..d25516dd 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 会员数据处理层
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberMapper extends BaseMapper<Member> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeLogMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeLogMapper.java
index 4c806c27..74c70076 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeLogMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeLogMapper.java
@@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dos.MemberNoticeLog;
  * 会员消息数据处理层
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberNoticeLogMapper extends BaseMapper<MemberNoticeLog> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeMapper.java
index a13a70cd..7d325a89 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeMapper.java
@@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dos.MemberNotice;
  * 会员站内信数据处理层
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberNoticeMapper extends BaseMapper<MemberNotice> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeSenterMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeSenterMapper.java
index 44ed0c07..0508f4b4 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeSenterMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeSenterMapper.java
@@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dos.MemberNoticeSenter;
  * 会员消息数据处理层
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberNoticeSenterMapper extends BaseMapper<MemberNoticeSenter> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java
index 37d4e8fb..e9e8f906 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java
@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Select;
  * 会员积分历史数据处理层
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberPointsHistoryMapper extends BaseMapper<MemberPointsHistory> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberReceiptMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberReceiptMapper.java
index c197f018..27dba0ac 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberReceiptMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberReceiptMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 会员发票数据层
  *
  * @author Chopper
- * @date 2021-03-29 14:10:16
+ * @since 2021-03-29 14:10:16
  */
 public interface MemberReceiptMapper extends BaseMapper<MemberReceipt> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberSignMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberSignMapper.java
index 257e506c..14454e3c 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberSignMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberSignMapper.java
@@ -14,7 +14,7 @@ import java.util.List;
  * 会员签到数据处理层
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberSignMapper extends BaseMapper<MemberSign> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java
index 32290f8a..eec4d70f 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 会员预存款数据处理层
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberWalletMapper extends BaseMapper<MemberWallet> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java
index 7ebbf646..8ed446b2 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 会员提现申请数据处理层
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberWithdrawApplyMapper extends BaseMapper<MemberWithdrawApply> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/StoreCollectionMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/StoreCollectionMapper.java
index d0ebd514..ed874f43 100644
--- a/framework/src/main/java/cn/lili/modules/member/mapper/StoreCollectionMapper.java
+++ b/framework/src/main/java/cn/lili/modules/member/mapper/StoreCollectionMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select;
  * 会员收藏数据处理层
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface StoreCollectionMapper extends BaseMapper<StoreCollection> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java b/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java
index 3dd22c24..624683d5 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 会员浏览历史业务层
  *
  * @author Chopper
- * @date 2020/11/18 10:46 上午
+ * @since 2020/11/18 10:46 上午
  */
 public interface FootprintService extends IService<FootPrint> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/GoodsCollectionService.java b/framework/src/main/java/cn/lili/modules/member/service/GoodsCollectionService.java
index 9847f86f..fa855d82 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/GoodsCollectionService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/GoodsCollectionService.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 商品收藏业务层
  *
  * @author Chopper
- * @date 2020/11/18 2:25 下午
+ * @since 2020/11/18 2:25 下午
  */
 public interface GoodsCollectionService extends IService<GoodsCollection> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java
index 052ae723..7c5792df 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java
@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 会员商品评价业务层
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberEvaluationService extends IService<MemberEvaluation> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberGradeService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberGradeService.java
index 44002848..bbc28ded 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberGradeService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberGradeService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * 会员等级业务层
  * @author Bulbasaur
- * @date: 2021/5/14 5:57 下午
+ * @since: 2021/5/14 5:57 下午
  *
  */
 public interface MemberGradeService extends IService<MemberGrade> {
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeLogService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeLogService.java
index 89902c0c..af034ad8 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeLogService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeLogService.java
@@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dos.MemberNoticeLog;
  * 会员消息业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:44 下午
+ * @since 2020/11/17 3:44 下午
  */
 public interface MemberNoticeLogService extends IService<MemberNoticeLog> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeSenterService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeSenterService.java
index e4372c75..d783f423 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeSenterService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeSenterService.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 会员消息业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:44 下午
+ * @since 2020/11/17 3:44 下午
  */
 public interface MemberNoticeSenterService extends IService<MemberNoticeSenter> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeService.java
index 045e47f2..07e06f30 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeService.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 会员站内信业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:44 下午
+ * @since 2020/11/17 3:44 下午
  */
 public interface MemberNoticeService extends IService<MemberNotice> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java
index 0597d871..ce523a6f 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 会员积分历史业务层
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberPointsHistoryService extends IService<MemberPointsHistory> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberReceiptService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberReceiptService.java
index 601178e9..99815390 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberReceiptService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberReceiptService.java
@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 会员发票业务层
  *
  * @author Chopper
- * @date 2021-03-29 14:10:16
+ * @since 2021-03-29 14:10:16
  */
 public interface MemberReceiptService extends IService<MemberReceipt> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
index 6f6ed6b5..20ee42e8 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.member.service;
 
 
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.member.entity.dos.Member;
@@ -19,7 +19,7 @@ import java.util.List;
  * 会员业务层
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberService extends IService<Member> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberSignService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberSignService.java
index 268aa9c3..de3e0fbc 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberSignService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberSignService.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 会员签到业务层
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberSignService extends IService<MemberSign> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java
index cc5bf418..effcc319 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 会员预存款业务层
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberWalletService extends IService<MemberWallet> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java
index cc4fecf6..ae9ac2b5 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 会员提现申请业务层
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberWithdrawApplyService extends IService<MemberWithdrawApply> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/service/StoreCollectionService.java b/framework/src/main/java/cn/lili/modules/member/service/StoreCollectionService.java
index df2d12a4..7e9e60f8 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/StoreCollectionService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/StoreCollectionService.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 店铺收藏业务层
  *
  * @author Chopper
- * @date 2020/11/18 2:52 下午
+ * @since 2020/11/18 2:52 下午
  */
 public interface StoreCollectionService extends IService<StoreCollection> {
 
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java
index df895f66..c9c0be86 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.member.serviceimpl;
 
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.FootPrint;
 import cn.lili.modules.member.mapper.FootprintMapper;
@@ -23,7 +23,7 @@ import java.util.Objects;
  * 会员浏览历史业务层实现
  *
  * @author Chopper
- * @date 2020/11/18 10:46 上午
+ * @since 2020/11/18 10:46 上午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java
index 4aa7f925..692a4b74 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java
@@ -3,12 +3,12 @@ package cn.lili.modules.member.serviceimpl;
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.member.entity.dos.GoodsCollection;
 import cn.lili.modules.member.entity.vo.GoodsCollectionVO;
 import cn.lili.modules.member.mapper.GoodsCollectionMapper;
@@ -29,7 +29,7 @@ import java.util.Optional;
  * 会员收藏业务层实现
  *
  * @author Chopper
- * @date 2020/11/18 2:25 下午
+ * @since 2020/11/18 2:25 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java
index 34aab3fb..532b21ed 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java
@@ -6,13 +6,13 @@ import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.member.entity.dos.Member;
@@ -53,7 +53,7 @@ import java.util.Map;
  * 会员商品评价业务层实现
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberGradeServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberGradeServiceImpl.java
index 0152e4da..4aa78f02 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberGradeServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberGradeServiceImpl.java
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
  * 会员等级业务层实现
  *
  * @author Bulbasaur
- * @date: 2021/5/14 5:58 下午
+ * @since: 2021/5/14 5:58 下午
  */
 @Service
 public class MemberGradeServiceImpl extends ServiceImpl<MemberGradeMapper, MemberGrade> implements MemberGradeService {
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeLogServiceImpl.java
index ad0d24a0..98dedbbb 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeLogServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeLogServiceImpl.java
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
  * 会员消息业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:44 下午
+ * @since 2020/11/17 3:44 下午
  */
 @Service
 public class MemberNoticeLogServiceImpl extends ServiceImpl<MemberNoticeLogMapper, MemberNoticeLog> implements MemberNoticeLogService {
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java
index b42bc6ea..934a5495 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java
@@ -24,7 +24,7 @@ import java.util.List;
  * 会员消息业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:44 下午
+ * @since 2020/11/17 3:44 下午
  */
 @Service
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = java.lang.Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeServiceImpl.java
index 1444b14e..c2668d0b 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeServiceImpl.java
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
  * 会员站内信业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:44 下午
+ * @since 2020/11/17 3:44 下午
  */
 @Service
 public class MemberNoticeServiceImpl extends ServiceImpl<MemberNoticeMapper, MemberNotice> implements MemberNoticeService {
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java
index 638dbd88..15111ca4 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.member.serviceimpl;
 
 
-import cn.lili.common.utils.PageUtil;
+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.MemberPointsHistory;
@@ -12,13 +12,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 会员积分历史业务层实现
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Service
 public class MemberPointsHistoryServiceImpl extends ServiceImpl<MemberPointsHistoryMapper, MemberPointsHistory> implements MemberPointsHistoryService {
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java
index 7cec3001..78329374 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java
@@ -4,7 +4,7 @@ package cn.lili.modules.member.serviceimpl;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dos.MemberReceipt;
@@ -17,10 +17,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -29,7 +27,7 @@ import java.util.List;
  * 会员发票业务层实现
  *
  * @author Chopper
- * @date 2021-03-29 14:10:16
+ * @since 2021-03-29 14:10:16
  */
 @Service
 public class MemberReceiptServiceImpl extends ServiceImpl<MemberReceiptMapper, MemberReceipt> implements MemberReceiptService {
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index f8fb9bcd..05a8f2b5 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -2,22 +2,23 @@ package cn.lili.modules.member.serviceimpl;
 
 
 import cn.hutool.core.convert.Convert;
-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.enums.ResultCode;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.MemberTagsEnum;
+import cn.lili.mybatis.util.PageUtil;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.token.Token;
-import cn.lili.common.token.base.generate.MemberTokenGenerate;
-import cn.lili.common.token.base.generate.StoreTokenGenerate;
+import cn.lili.common.security.token.Token;
+import cn.lili.modules.member.token.MemberTokenGenerate;
+import cn.lili.modules.member.token.StoreTokenGenerate;
 import cn.lili.common.utils.*;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.context.ThreadContextHolder;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.context.ThreadContextHolder;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.connect.config.ConnectAuthEnum;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
@@ -57,7 +58,7 @@ import java.util.List;
  * 会员接口业务层实现
  *
  * @author Chopper
- * @date 2021-03-29 14:10:16
+ * @since 2021-03-29 14:10:16
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java
index 5fccdd4c..ce1ec547 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java
@@ -2,14 +2,14 @@ package cn.lili.modules.member.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.MemberTagsEnum;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.common.utils.DateUtil;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.member.entity.dos.MemberSign;
 import cn.lili.modules.member.mapper.MemberSignMapper;
 import cn.lili.modules.member.service.MemberService;
@@ -33,7 +33,7 @@ import java.util.Map;
  * 会员签到业务层实现
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Service
 public class MemberSignServiceImpl extends ServiceImpl<MemberSignMapper, MemberSign> implements MemberSignService {
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java
index 1cdf7af9..e4451089 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java
@@ -39,7 +39,7 @@ import java.util.Date;
  * 会员预存款业务层实现
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -154,7 +154,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
         if (0 > CurrencyUtil.sub(memberWallet.getMemberWallet(), money)) {
             throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_INSUFFICIENT);
         }
-        memberWallet.setMemberWallet(CurrencyUtil.sub(memberWallet.getMemberWallet(), money));
+        memberWallet.setMemberFrozenWallet(CurrencyUtil.sub(memberWallet.getMemberFrozenWallet(), money));
         this.updateById(memberWallet);
         //新增预存款日志
         WalletLog walletLog = new WalletLog(memberWallet.getMemberId(), memberWallet.getMemberName(), -money, "提现金额已冻结，审核通过提现成功", serviceType);
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java
index 9813925f..7faba804 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java
@@ -3,7 +3,8 @@ package cn.lili.modules.member.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.common.utils.DateUtil;
+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;
@@ -28,7 +29,7 @@ import java.util.Date;
  * 会员提现申请业务层实现
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -45,22 +46,23 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawAp
         //查询申请记录
         MemberWithdrawApply memberWithdrawApply = this.getById(applyId);
         memberWithdrawApply.setInspectRemark(remark);
+        memberWithdrawApply.setInspectTime(new Date());
         if (memberWithdrawApply != null) {
-            //写入备注
-            memberWithdrawApply.setInspectRemark(remark);
+           //获取账户余额
+            MemberWalletVO memberWalletVO = memberWalletService.getMemberWallet(memberWithdrawApply.getMemberId());
+            //校验金额是否满足提现，因为是从冻结金额扣减，所以校验的是冻结金额
+            if (memberWalletVO.getMemberFrozenWallet() < memberWithdrawApply.getApplyMoney()) {
+                throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_FROZEN_AMOUNT_INSUFFICIENT);
+            }
             //如果审核通过 则微信直接提现，反之则记录审核状态
             if (result) {
-                //校验金额是否满足提现，因为是从冻结金额扣减，所以校验的是冻结金额
-                MemberWalletVO memberWalletVO = memberWalletService.getMemberWallet(memberWithdrawApply.getMemberId());
-                if (memberWalletVO.getMemberFrozenWallet() < memberWithdrawApply.getApplyMoney()) {
-                    throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_INSUFFICIENT);
-                }
                 memberWithdrawApply.setApplyStatus(WithdrawStatusEnum.VIA_AUDITING.name());
-                //保存审核记录
-                this.updateById(memberWithdrawApply);
                 //提现，微信提现成功后扣减冻结金额
                 Boolean bool = memberWalletService.withdrawal(memberWithdrawApply);
                 if (bool) {
+                    //保存修改审核记录
+                    this.updateById(memberWithdrawApply);
+                    //记录日志
                     memberWalletService.reduceFrozen(memberWithdrawApply.getApplyMoney(), memberWithdrawApply.getMemberId(), "审核通过，余额提现", DepositServiceTypeEnum.WALLET_WITHDRAWAL.name());
                     return true;
                 }
@@ -70,6 +72,7 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawAp
                     throw new ServiceException(ResultCode.WALLET_REMARK_ERROR);
                 }
                 memberWithdrawApply.setApplyStatus(WithdrawStatusEnum.FAIL_AUDITING.name());
+                //保存修改审核记录
                 this.updateById(memberWithdrawApply);
                 //需要从冻结金额扣减到余额
                 memberWalletService.increaseWithdrawal(memberWithdrawApply.getApplyMoney(), memberWithdrawApply.getMemberId(), "审核拒绝，提现金额解冻到余额", DepositServiceTypeEnum.WALLET_WITHDRAWAL.name());
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java
index e3114cb6..b8dbbbe9 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java
@@ -3,7 +3,7 @@ package cn.lili.modules.member.serviceimpl;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.StoreCollection;
 import cn.lili.modules.member.entity.vo.StoreCollectionVO;
@@ -21,7 +21,7 @@ import java.util.Optional;
  * 会员店铺收藏业务层实现
  *
  * @author Chopper
- * @date 2020/11/18 2:52 下午
+ * @since 2020/11/18 2:52 下午
  */
 @Service
 public class StoreCollectionServiceImpl extends ServiceImpl<StoreCollectionMapper, StoreCollection> implements StoreCollectionService {
diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java
similarity index 88%
rename from framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java
rename to framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java
index 003c0db1..9e2b13da 100644
--- a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java
+++ b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java
@@ -1,11 +1,11 @@
-package cn.lili.common.token.base.generate;
+package cn.lili.modules.member.token;
 
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.token.Token;
-import cn.lili.common.token.TokenUtil;
-import cn.lili.common.token.base.AbstractTokenGenerate;
-import cn.lili.config.context.ThreadContextHolder;
+import cn.lili.common.security.token.Token;
+import cn.lili.common.security.token.TokenUtil;
+import cn.lili.common.security.token.base.AbstractTokenGenerate;
+import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
@@ -19,7 +19,6 @@ import java.util.Date;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/11/16 10:50
  */
 @Component
diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java
similarity index 90%
rename from framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java
rename to framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java
index 28b94c86..9d10db60 100644
--- a/framework/src/main/java/cn/lili/common/token/base/generate/StoreTokenGenerate.java
+++ b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java
@@ -1,12 +1,12 @@
-package cn.lili.common.token.base.generate;
+package cn.lili.modules.member.token;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.token.Token;
-import cn.lili.common.token.TokenUtil;
-import cn.lili.common.token.base.AbstractTokenGenerate;
+import cn.lili.common.security.token.Token;
+import cn.lili.common.security.token.TokenUtil;
+import cn.lili.common.security.token.base.AbstractTokenGenerate;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
 import cn.lili.modules.store.entity.dos.Store;
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java
index 4ccb3fdd..d2a85489 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.message.entity.enums.MessageStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -14,7 +14,7 @@ import javax.persistence.Table;
  * 会员接受消息对象
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java
index 941e1391..48dabf49 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.message.entity.enums.RangeEnum;
 import cn.lili.modules.message.entity.enums.MessageSendClient;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java
index 5ff11608..65eab23d 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.persistence.Table;
  *
  * @author Bulbasaur
  * @version v4.1
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java
index 3dfbfa3f..46abf912 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.IdEntity;
+import cn.lili.mybatis.IdEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java
index 51e02367..5398a0e2 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java
@@ -21,7 +21,7 @@ import java.util.Date;
  * 短信任务
  *
  * @author Chopper
- * @date 2021/1/30 4:13 下午
+ * @since 2021/1/30 4:13 下午
  */
 @Data
 @Entity
@@ -56,7 +56,7 @@ public class SmsReach {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java
index e1f0cb10..86011ac4 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java
@@ -17,7 +17,7 @@ import javax.persistence.Table;
  * 短信签名
  *
  * @author Chopper
- * @date 2021/1/30 4:13 下午
+ * @since 2021/1/30 4:13 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java
index e17da568..2d8cd6ab 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java
@@ -17,7 +17,7 @@ import javax.persistence.Table;
  * 短信模板
  *
  * @author Chopper
- * @date 2021/1/30 4:13 下午
+ * @since 2021/1/30 4:13 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java
index 25fdfbd0..28f8f60d 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java
@@ -19,7 +19,7 @@ import java.util.Date;
 /**
  * 店铺接收消息对象
  * @author Chopper
- * @date 2021/1/30 4:13 下午
+ * @since 2021/1/30 4:13 下午
  */
 @Data
 @Entity
@@ -44,7 +44,7 @@ public class StoreMessage {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java
index c1c059f1..5ea4771a 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java
index 2422fed7..983a7992 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,6 @@ import javax.persistence.Table;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/12/10 17:02
  */
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDTO.java b/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDTO.java
index 473ab68a..835e3394 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDTO.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDTO.java
@@ -9,7 +9,7 @@ import java.util.Map;
 /**
  * 站内信消息
  * @author Chopper
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 @Data
 public class NoticeMessageDTO {
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDetailDTO.java b/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDetailDTO.java
index 9ef8195a..0aaea8ee 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDetailDTO.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDetailDTO.java
@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 站内信消息DTO
  * @author Chopper
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 @Data
 public class NoticeMessageDetailDTO extends NoticeMessage {
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java b/framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java
index 7840ed28..14ac747f 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java
@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 短信任务DTO
  * @author Chopper
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 @Data
 public class SmsReachDTO extends SmsReach {
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageRangeEnum.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageRangeEnum.java
index 36580a5d..322c5818 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageRangeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageRangeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums;
  * 发送消息范围枚举
  *
  * @author pikachu
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 public enum MessageRangeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java
index f063535b..c9dd51eb 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java
@@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums;
  * 消息发送客户端
  *
  * @author pikachu
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 public enum MessageSendClient {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageShowType.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageShowType.java
index 319ca812..cb0b15b5 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageShowType.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageShowType.java
@@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums;
  * 消息展示类型
  *
  * @author pikachu
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 public enum MessageShowType {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageStatusEnum.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageStatusEnum.java
index 11e107cf..592de0ff 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums;
  * 消息状态枚举
  *
  * @author pikachu
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 public enum MessageStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTemplateType.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTemplateType.java
index 3783a2e5..5a15e175 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTemplateType.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTemplateType.java
@@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums;
  * 消息模板类型
  *
  * @author pikachu
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 public enum MessageTemplateType {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTitle.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTitle.java
index 9252aca7..36152245 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTitle.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTitle.java
@@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums;
  * 消息标题
  *
  * @author pikachu
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 public enum MessageTitle {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java
index 55552f6b..979f39fa 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums;
  * 消息编码枚举
  *
  * @author pikachu
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 public enum NoticeMessageNodeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageParameterEnum.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageParameterEnum.java
index da5b6997..97f2a085 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageParameterEnum.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageParameterEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums;
  * 消息编码枚举
  *
  * @author pikachu
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 public enum NoticeMessageParameterEnum {
 
@@ -35,7 +35,11 @@ public enum NoticeMessageParameterEnum {
     /**
      * 取消原因
      */
-    CANCEL_REASON("cancel_reason", "取消原因");
+    CANCEL_REASON("cancel_reason", "取消原因"),
+    /**
+     * 取消原因
+     */
+    PRICE("price", "金额");
 
     private final String type;
     private final String description;
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/RangeEnum.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/RangeEnum.java
index 0f622253..f1fad9b6 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/enums/RangeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/RangeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums;
  * 消息发送类型
  *
  * @author pikachu
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 public enum RangeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/vos/MemberMessageQueryVO.java b/framework/src/main/java/cn/lili/modules/message/entity/vos/MemberMessageQueryVO.java
index 1311d052..435555d7 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/vos/MemberMessageQueryVO.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/vos/MemberMessageQueryVO.java
@@ -10,7 +10,7 @@ import lombok.Data;
  * 会员接收消息查询vo
  *
  * @author Chopper
- * @date 2020/12/2 17:50
+ * @since 2020/12/2 17:50
  */
 @Data
 @ApiModel(value = "会员接收消息查询vo")
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageShowVO.java b/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageShowVO.java
index 577f9779..2d306f58 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageShowVO.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageShowVO.java
@@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
  * 消息
  *
  * @author Chopper
- * @date 2020/12/2 17:50
+ * @since 2020/12/2 17:50
  */
 @Data
 @ApiModel(value = "消息")
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageVO.java b/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageVO.java
index 8221dcdf..d534c21f 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageVO.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageVO.java
@@ -10,7 +10,7 @@ import lombok.Data;
 /**
  * 消息
  * @author Chopper
- * @date 2020/12/2 17:50
+ * @since 2020/12/2 17:50
  *
  */
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/vos/StoreMessageQueryVO.java b/framework/src/main/java/cn/lili/modules/message/entity/vos/StoreMessageQueryVO.java
index fc746773..62cfdcfc 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/vos/StoreMessageQueryVO.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/vos/StoreMessageQueryVO.java
@@ -10,7 +10,7 @@ import lombok.Data;
  * 店铺消息查询
  *
  * @author Chopper
- * @date 2020/12/2 17:50
+ * @since 2020/12/2 17:50
  */
 @Data
 @ApiModel(value = "消息")
diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java
index a745aa83..8f843a03 100644
--- a/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java
+++ b/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 会员接收到消息数据处理层
  *
  * @author lili
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface MemberMessageMapper extends BaseMapper<MemberMessage> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java
index 8292f430..9bad1ed7 100644
--- a/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java
+++ b/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 管理端发送消息内容数据处理层
  * @author Chopper
- * @date 2020/12/2 17:50
+ * @since 2020/12/2 17:50
  */
 public interface MessageMapper extends BaseMapper<Message> {
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java
index 689af2be..64c8066f 100644
--- a/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java
+++ b/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 通知类消息模板数据处理层
  *
  * @author Bulbasaur
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 public interface NoticeMessageTemplateMapper extends BaseMapper<NoticeMessage> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java
index b9e5d8c2..5856195e 100644
--- a/framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java
+++ b/framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 短信任务数据处理层
  * @author Chopper
- * @date 2021/1/30 4:17 下午
+ * @since 2021/1/30 4:17 下午
  */
 public interface SmsReachMapper extends BaseMapper<SmsReach> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java
index ad24c205..b600937f 100644
--- a/framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java
+++ b/framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 短信签名数据处理层
  * @author Chopper
- * @date 2021/1/30 4:17 下午
+ * @since 2021/1/30 4:17 下午
  */
 public interface SmsSignMapper extends BaseMapper<SmsSign> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java
index ab6b93b9..78638896 100644
--- a/framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java
+++ b/framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 短信模板数据处理层
  * @author Chopper
- * @date 2021/1/30 4:17 下午
+ * @since 2021/1/30 4:17 下午
  */
 public interface SmsTemplateMapper extends BaseMapper<SmsTemplate> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java
index 29c586dc..80b91dc1 100644
--- a/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java
+++ b/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Select;
  * 店铺接收到消息发送数据处理层
  *
  * @author Chopper
- * @date 2021/1/30 4:17 下午
+ * @since 2021/1/30 4:17 下午
  */
 public interface StoreMessageMapper extends BaseMapper<StoreMessage> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java b/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java
index f66de34c..e0d92ef6 100644
--- a/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java
+++ b/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 会员消息发送业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:44 下午
+ * @since 2020/11/17 3:44 下午
  */
 public interface MemberMessageService extends IService<MemberMessage> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/service/MessageService.java b/framework/src/main/java/cn/lili/modules/message/service/MessageService.java
index 0b63799f..425d0eaf 100644
--- a/framework/src/main/java/cn/lili/modules/message/service/MessageService.java
+++ b/framework/src/main/java/cn/lili/modules/message/service/MessageService.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 管理端发送消息内容业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:44 下午
+ * @since 2020/11/17 3:44 下午
  */
 public interface MessageService extends IService<Message> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java b/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java
index aac79e54..4b73cdb7 100644
--- a/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java
+++ b/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 通知类消息模板业务层
  *
  * @author Bulbasaur
- * @date 2020/12/8 9:47
+ * @since 2020/12/8 9:47
  */
 public interface NoticeMessageService extends IService<NoticeMessage> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java b/framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java
index 90079065..3d9794f5 100644
--- a/framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java
+++ b/framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 短信任务业务层
  *
  * @author Bulbasaur
- * @date 2021/1/30 3:19 下午
+ * @since 2021/1/30 3:19 下午
  */
 public interface SmsReachService extends IService<SmsReach> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java b/framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java
index f527d24e..18439ae5 100644
--- a/framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java
+++ b/framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 签名申请业务层
  *
  * @author Bulbasaur
- * @date 2021/1/30 3:19 下午
+ * @since 2021/1/30 3:19 下午
  */
 public interface SmsSignService extends IService<SmsSign> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java b/framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java
index fc25b636..7fd1e946 100644
--- a/framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java
+++ b/framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 签名申请业务层
  *
  * @author Bulbasaur
- * @date 2021/1/30 3:19 下午
+ * @since 2021/1/30 3:19 下午
  */
 public interface SmsTemplateService extends IService<SmsTemplate> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java b/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java
index ec102af2..81b32d14 100644
--- a/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java
+++ b/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 店铺接收消息业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:44 下午
+ * @since 2020/11/17 3:44 下午
  */
 public interface StoreMessageService extends IService<StoreMessage> {
 
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java
index 7f0a0c17..98c7e85e 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.message.serviceimpl;
 
 
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.message.entity.dos.MemberMessage;
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -20,7 +19,7 @@ import java.util.List;
  * 会员接收消息业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:48 下午
+ * @since 2020/11/17 3:48 下午
  */
 @Service
 public class MemberMessageServiceImpl extends ServiceImpl<MemberMessageMapper, MemberMessage> implements MemberMessageService {
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java
index e6a04466..395d4811 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java
@@ -1,10 +1,10 @@
 package cn.lili.modules.message.serviceimpl;
 
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.OtherTagsEnum;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.OtherTagsEnum;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.message.entity.dos.Message;
 import cn.lili.modules.message.entity.vos.MessageVO;
 import cn.lili.modules.message.mapper.MessageMapper;
@@ -20,7 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 管理端发送消息内容业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:48 下午
+ * @since 2020/11/17 3:48 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java
index 740fba02..03d2512f 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java
@@ -1,15 +1,16 @@
 package cn.lili.modules.message.serviceimpl;
 
 import cn.lili.common.enums.SwitchEnum;
-import cn.lili.common.utils.PageUtil;
+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.MemberNotice;
-import cn.lili.modules.member.service.MemberNoticeService;
+import cn.lili.modules.message.entity.dos.MemberMessage;
 import cn.lili.modules.message.entity.dos.NoticeMessage;
 import cn.lili.modules.message.entity.dto.NoticeMessageDTO;
+import cn.lili.modules.message.entity.enums.MessageStatusEnum;
 import cn.lili.modules.message.entity.enums.NoticeMessageParameterEnum;
 import cn.lili.modules.message.mapper.NoticeMessageTemplateMapper;
+import cn.lili.modules.message.service.MemberMessageService;
 import cn.lili.modules.message.service.NoticeMessageService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,7 +18,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Map;
 
@@ -25,13 +25,13 @@ import java.util.Map;
  * 通知类消息模板业务层实现
  *
  * @author Bulbasaur
- * @date 2020/12/8 9:48
+ * @since 2020/12/8 9:48
  */
 @Service
 public class NoticeMessageServiceImpl extends ServiceImpl<NoticeMessageTemplateMapper, NoticeMessage> implements NoticeMessageService {
 
     @Autowired
-    private MemberNoticeService memberNoticeService;
+    private MemberMessageService memberMessageService;
 
     @Override
     public IPage<NoticeMessage> getMessageTemplate(PageVO pageVO, String type) {
@@ -54,18 +54,19 @@ public class NoticeMessageServiceImpl extends ServiceImpl<NoticeMessageTemplateM
             NoticeMessage noticeMessage = this.getOne(new LambdaQueryWrapper<NoticeMessage>().eq(NoticeMessage::getNoticeNode, noticeMessageDTO.getNoticeMessageNodeEnum().getDescription().trim()));
             //如果通知类站内信开启的情况下
             if (noticeMessage != null && noticeMessage.getNoticeStatus().equals(SwitchEnum.OPEN.name())) {
-                MemberNotice memberNotice = new MemberNotice();
-                memberNotice.setMemberId(noticeMessageDTO.getMemberId());
-                memberNotice.setTitle(noticeMessage.getNoticeTitle());
-                memberNotice.setContent(noticeMessage.getNoticeContent());
+                MemberMessage memberMessage = new MemberMessage();
+                memberMessage.setMemberId(noticeMessageDTO.getMemberId());
+                memberMessage.setTitle(noticeMessage.getNoticeTitle());
+                memberMessage.setContent(noticeMessage.getNoticeContent());
                 //参数不为空，替换内容
                 if (noticeMessageDTO.getParameter() != null) {
-                    memberNotice.setContent(replaceNoticeContent(noticeMessage.getNoticeContent(), noticeMessageDTO.getParameter()));
+                    memberMessage.setContent(replaceNoticeContent(noticeMessage.getNoticeContent(), noticeMessageDTO.getParameter()));
                 } else {
-                    memberNotice.setContent(noticeMessage.getNoticeContent());
+                    memberMessage.setContent(noticeMessage.getNoticeContent());
                 }
+                memberMessage.setStatus(MessageStatusEnum.UN_READY.name());
                 //添加站内信
-                memberNoticeService.save(memberNotice);
+                memberMessageService.save(memberMessage);
             }
         } catch (Exception e) {
             log.error("站内信发送失败：", e);
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java
index d8fa32b2..6863ba39 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java
@@ -1,10 +1,10 @@
 package cn.lili.modules.message.serviceimpl;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.OtherTagsEnum;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.OtherTagsEnum;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.message.entity.dos.SmsReach;
 import cn.lili.modules.message.entity.dto.SmsReachDTO;
 import cn.lili.modules.message.mapper.SmsReachMapper;
@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -21,7 +20,7 @@ import java.util.List;
  * 短信任务业务层实现
  *
  * @author Bulbasaur
- * @date 2021/1/30 3:19 下午
+ * @since 2021/1/30 3:19 下午
  */
 @Service
 public class SmsReachServiceImpl extends ServiceImpl<SmsReachMapper, SmsReach> implements SmsReachService {
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java
index e7ec89dd..06717a3a 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java
@@ -2,8 +2,8 @@ package cn.lili.modules.message.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.sms.AliSmsUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.modules.system.sms.AliSmsUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.message.entity.dos.SmsSign;
 import cn.lili.modules.message.mapper.SmsSignMapper;
@@ -23,7 +23,7 @@ import java.util.Map;
 /**
  * 短信签名业务层实现
  * @author Chopper
- * @date 2021/1/30 4:27 下午
+ * @since 2021/1/30 4:27 下午
  */
 @Slf4j
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java
index ad1cca95..22fd9e4b 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.message.serviceimpl;
 
-import cn.lili.common.sms.AliSmsUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.modules.system.sms.AliSmsUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.message.entity.dos.SmsTemplate;
 import cn.lili.modules.message.mapper.SmsTemplateMapper;
@@ -21,7 +21,7 @@ import java.util.Map;
 /**
  * 短信模板业务层实现
  * @author Chopper
- * @date 2021/1/30 4:27 下午
+ * @since 2021/1/30 4:27 下午
  */
 @Slf4j
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java
index 6d81963c..1202b4d2 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java
@@ -3,7 +3,7 @@ package cn.lili.modules.message.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.message.entity.dos.StoreMessage;
@@ -22,7 +22,7 @@ import java.util.List;
  * 消息发送业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:48 下午
+ * @since 2020/11/17 3:48 下午
  */
 @Service
 public class StoreMessageServiceImpl extends ServiceImpl<StoreMessageMapper, StoreMessage> implements StoreMessageService {
diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java
index d4c6e15a..fc7411c8 100644
--- a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java
+++ b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java
@@ -2,12 +2,12 @@ package cn.lili.modules.message.util;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
-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.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.enums.ClientTypeEnum;
-import cn.lili.modules.connect.util.HttpUtils;
+import cn.lili.common.utils.HttpUtils;
 import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.dto.connect.WechatConnectSetting;
 import cn.lili.modules.system.entity.dto.connect.dto.WechatConnectSettingItem;
diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java
index b086459e..8866cb31 100644
--- a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java
+++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java
@@ -13,7 +13,6 @@ import java.util.Map;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/12/11 09:52
  */
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/MemberCouponDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/MemberCouponDTO.java
index 413956d5..0eb49b60 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/MemberCouponDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/MemberCouponDTO.java
@@ -10,7 +10,7 @@ import java.util.Map;
  * 用于计算优惠券结算详情
  *
  * @author Chopper
- * @date 2020-03-25 2:30 下午
+ * @since 2020-03-25 2:30 下午
  */
 @Data
 public class MemberCouponDTO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/StoreRemarkDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/StoreRemarkDTO.java
index a51f7460..a016057e 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/StoreRemarkDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/StoreRemarkDTO.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
  * 店铺备注
  *
  * @author Chopper
- * @date 2020-03-25 2:30 下午
+ * @since 2020-03-25 2:30 下午
  */
 @Data
 public class StoreRemarkDTO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java
index 2b50795c..37a981cb 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java
@@ -22,7 +22,7 @@ import java.util.Map;
  * 购物车视图
  *
  * @author Chopper
- * @date 2020-03-25 2:30 下午
+ * @since 2020-03-25 2:30 下午
  */
 @Data
 public class TradeDTO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java
index 5949526a..1f273a53 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.cart.entity.enums;
  * 购物车类型
  *
  * @author Chopper
- * @date 2020-03-25 2:30 下午
+ * @since 2020-03-25 2:30 下午
  */
 public enum CartTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/DeliveryMethodEnum.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/DeliveryMethodEnum.java
index 7d549d5f..c329cba9 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/DeliveryMethodEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/DeliveryMethodEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.cart.entity.enums;
  * 配送方式
  *
  * @author paulG
- * @date 2020-03-25 2:30 下午
+ * @since 2020-03-25 2:30 下午
  **/
 public enum DeliveryMethodEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/SuperpositionPromotionEnum.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/SuperpositionPromotionEnum.java
index 9c7f793e..eaa97222 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/SuperpositionPromotionEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/SuperpositionPromotionEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.cart.entity.enums;
  * 活动叠加
  *
  * @author Chopper
- * @date 2020-03-25 2:30 下午
+ * @since 2020-03-25 2:30 下午
  */
 public enum SuperpositionPromotionEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java
index 6a98ed64..3e26d466 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.cart.entity.enums;
  * 交易缓存枚举
  *
  * @author Chopper
- * @date 2020-03-25 2:30 下午
+ * @since 2020-03-25 2:30 下午
  */
 public enum TradeCacheEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartBase.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartBase.java
index 50eea20a..515d1925 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartBase.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartBase.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * 购物车基础
  *
  * @author Chopper
- * @date 2020-03-24 10:33 上午
+ * @since 2020-03-24 10:33 上午
  */
 @Data
 public class CartBase implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java
index 8c185030..c3e78937 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 购物车中的产品
  *
  * @author Chopper
- * @date 2020-03-24 10:33 上午
+ * @since 2020-03-24 10:33 上午
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java
index 5906b4fb..69b7ffac 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 购物车展示VO
  *
  * @author Chopper
- * @date 2020-03-24 10:33 上午
+ * @since 2020-03-24 10:33 上午
  */
 @Data
 @ApiModel(description = "购物车")
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/FullDiscountVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/FullDiscountVO.java
index 8422fdf3..e9450707 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/FullDiscountVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/FullDiscountVO.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 满额活动VO
  *
  * @author Chopper
- * @date 2020-04-01 10:42 上午
+ * @since 2020-04-01 10:42 上午
  */
 @Data
 public class FullDiscountVO extends FullDiscount {
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java
index 197faede..263340c7 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.order.cart.entity.vo;
 
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +13,7 @@ import java.util.Date;
  * 商品促销VO
  *
  * @author Chopper
- * @date 2020-04-01 10:42 上午
+ * @since 2020-04-01 10:42 上午
  */
 @Data
 @ApiModel(description = "购物车中")
@@ -30,7 +31,7 @@ public class GoodsPromotionVO implements Serializable {
     private String promotionId;
 
     /**
-     * @see cn.lili.modules.promotion.entity.enums.PromotionTypeEnum
+     * @see PromotionTypeEnum
      */
     @ApiModelProperty(value = "活动工具类型")
     private String promotionType;
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/PriceDetailVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/PriceDetailVO.java
index 2dbb4082..0ca210d4 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/PriceDetailVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/PriceDetailVO.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * 订单价格详情
  *
  * @author Chopper
- * @date 2020-04-01 10:42 上午
+ * @since 2020-04-01 10:42 上午
  */
 @Data
 public class PriceDetailVO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java
index a9cb3d00..f7be7645 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 交易参数
  *
  * @author paulG
- * @date 2021/2/23
+ * @since 2021/2/23
  **/
 @Data
 public class TradeParams implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeVO.java
index b57806c4..ec3dd3ba 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeVO.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 整比交易对象
  *
  * @author Chopper
- * @date 2020-04-01 10:42 上午
+ * @since 2020-04-01 10:42 上午
  */
 @Data
 public class TradeVO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/CartRenderStep.java b/framework/src/main/java/cn/lili/modules/order/cart/render/CartRenderStep.java
index 1fcccf63..0b58824f 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/CartRenderStep.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/CartRenderStep.java
@@ -6,16 +6,16 @@ import cn.lili.modules.order.cart.entity.dto.TradeDTO;
  * 购物车渲染
  *
  * @author Chopper
- * @date 2020-04-01 10:27 上午
+ * @since 2020-04-01 10:27 上午
  */
 public interface CartRenderStep {
 
 
     /**
      * 渲染一笔交易
-     * 0-> 校验商品 1-》 满优惠渲染 2->渲染优惠 3->优惠券渲染 4->计算运费 5->计算价格 6->分销渲染 7->其他渲染
+     * 0-》 校验商品 1-》 满优惠渲染 2-》渲染优惠 3-》优惠券渲染 4-》计算运费 5-》计算价格 6-》分销渲染 7-》其他渲染
      *
-     * @param tradeDTO
+     * @param tradeDTO 交易DTO
      */
     void render(TradeDTO tradeDTO);
 }
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java
index 5aa05f51..377d8e5c 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java
@@ -19,7 +19,7 @@ import java.util.stream.Collectors;
  * 交易构造&&创建
  *
  * @author Chopper
- * @date2020-04-01 9:47 下午
+ * @since2020-04-01 9:47 下午
  */
 @Service
 @Slf4j
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartSnRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartSnRender.java
index 90ba8c93..78b895b0 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartSnRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartSnRender.java
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
  * sn 生成
  *
  * @author Chopper
- * @date 2020-07-02 14:47
+ * @since 2020-07-02 14:47
  */
 @Order(7)
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
index ad21ff1a..e43c680a 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
@@ -1,6 +1,7 @@
 package cn.lili.modules.order.cart.render.impl;
 
 import cn.hutool.core.text.CharSequenceUtil;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
@@ -18,7 +19,6 @@ import cn.lili.modules.order.cart.render.CartRenderStep;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.promotion.entity.dos.Pintuan;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.service.PintuanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
  * 商品有效性校验
  *
  * @author Chopper
- * @date 2020-07-02 14:47
+ * @since 2020-07-02 14:47
  */
 @Order(0)
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java
index 0a03515a..54900a2d 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java
@@ -15,7 +15,7 @@ import java.util.Map;
  * 购物促销信息渲染实现
  *
  * @author Chopper
- * @date 2020-07-02 14:47
+ * @since 2020-07-02 14:47
  */
 @Order(3)
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java
index b8b53792..1ac8f77f 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java
@@ -1,12 +1,11 @@
 package cn.lili.modules.order.cart.render.impl;
 
-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.utils.CurrencyUtil;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
 import cn.lili.modules.order.cart.render.CartRenderStep;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
@@ -15,7 +14,7 @@ import org.springframework.stereotype.Service;
  * 购物促销信息渲染实现
  *
  * @author Chopper
- * @date 2020-07-02 14:47
+ * @since 2020-07-02 14:47
  */
 @Service
 @Order(6)
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java
index 6690faec..0cfdc714 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java
@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
  * FullDiscountRender
  *
  * @author Chopper
- * @date 2020-04-01 10:27 上午
+ * @since 2020-04-01 10:27 上午
  */
 @Service
 @Order(1)
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java
index 0294e23d..be224ab9 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java
@@ -22,7 +22,7 @@ import java.util.List;
  * sku 运费计算
  *
  * @author Chopper
- * @date 2020-07-02 14:47
+ * @since 2020-07-02 14:47
  */
 @Order(4)
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java
index d08c3005..b9c9f671 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  * 购物促销信息渲染实现
  *
  * @author Chopper
- * @date 2020-07-02 14:47
+ * @since 2020-07-02 14:47
  */
 @Service
 @Order(2)
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartService.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartService.java
index c47b37e9..2bcb54df 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartService.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartService.java
@@ -11,7 +11,7 @@ import cn.lili.modules.order.order.entity.vo.ReceiptVO;
  * 购物车业务层
  *
  * @author Chopper
- * @date 2020-03-23 12:29 下午
+ * @since 2020-03-23 12:29 下午
  */
 public interface CartService {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
index 886f6283..e36bb96b 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
@@ -1,7 +1,8 @@
 package cn.lili.modules.order.cart.service;
 
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
@@ -28,7 +29,9 @@ import cn.lili.modules.promotion.entity.dos.MemberCoupon;
 import cn.lili.modules.promotion.entity.dos.Pintuan;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsDTO;
-import cn.lili.modules.promotion.entity.enums.*;
+import cn.lili.modules.promotion.entity.enums.CouponScopeTypeEnum;
+import cn.lili.modules.promotion.entity.enums.KanJiaStatusEnum;
+import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum;
 import cn.lili.modules.promotion.entity.vos.kanjia.KanjiaActivitySearchParams;
 import cn.lili.modules.promotion.service.*;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
@@ -48,7 +51,7 @@ import java.util.stream.Collectors;
  * 购物车业务层实现
  *
  * @author Chopper
- * @date 2020-03-23 12:29 下午
+ * @since 2020-03-23 12:29 下午
  */
 @Slf4j
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java b/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java
index abd8a8fa..7e3dccbe 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
  * 售后日志AOP注解
  *
  * @author Chopper
- * @date 2020/11/17 7:22 下午
+ * @since 2020/11/17 7:22 下午
  */
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java b/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java
index 8b6eddfb..43ee90aa 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java
@@ -22,7 +22,7 @@ import java.util.Map;
  * 订单操作日志
  *
  * @author Chopper
- * @date 2020/11/17 7:22 下午
+ * @since 2020/11/17 7:22 下午
  */
 @Slf4j
 @Aspect
diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/OrderLogPoint.java b/framework/src/main/java/cn/lili/modules/order/order/aop/OrderLogPoint.java
index 431e9a5e..d1427a86 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/aop/OrderLogPoint.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/aop/OrderLogPoint.java
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
  * 订单日志AOP注解
  *
  * @author Chopper
- * @date 2020/11/17 7:22 下午
+ * @since 2020/11/17 7:22 下午
  */
 @Target({ElementType.PARAMETER, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java b/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java
index 05677dd2..f1c4e183 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java
@@ -21,7 +21,7 @@ import java.util.Map;
  * 订单操作日志
  *
  * @author Chopper
- * @date: 2020/11/17 7:22 下午
+ * @since: 2020/11/17 7:22 下午
  */
 @Slf4j
 @Aspect
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java
index 575da880..8f3366b9 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -17,7 +17,7 @@ import java.util.Date;
  * 售后
  *
  * @author Chopper
- * @date 2020/11/17 7:30 下午
+ * @since 2020/11/17 7:30 下午
  */
 @Data
 @Entity
@@ -148,7 +148,7 @@ public class AfterSale extends BaseEntity {
     private String mLogisticsName;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "买家发货时间")
     private Date mDeliverTime;
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java
index bfbd7a4e..c5f4f9de 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
  * 售后原因
  *
  * @author Bulbasaur
- * @date: 2021/7/9 1:39 上午
+ * @since: 2021/7/9 1:39 上午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
index cc4bf871..eee4edbc 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
@@ -2,7 +2,7 @@ package cn.lili.modules.order.order.entity.dos;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.goods.entity.enums.GoodsTypeEnum;
@@ -13,7 +13,7 @@ import cn.lili.modules.order.cart.entity.vo.CartVO;
 import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;
 import cn.lili.modules.order.order.entity.enums.*;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -32,7 +32,7 @@ import java.util.Optional;
  * 订单
  *
  * @author Chopper
- * @date 2020/11/17 7:30 下午
+ * @since 2020/11/17 7:30 下午
  */
 @Data
 @Entity
@@ -86,7 +86,7 @@ public class Order extends BaseEntity {
     private String paymentMethod;
 
     @ApiModelProperty(value = "支付时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date paymentTime;
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java
index 4529f36c..f3386494 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.order.order.entity.enums.ComplaintStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java
index 5ed5fd88..bc8dcd49 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
index 0ef83e44..b2ab11dd 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
@@ -2,7 +2,7 @@ package cn.lili.modules.order.order.entity.dos;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
  * 子订单
  *
  * @author Chopper
- * @date 2020/11/17 7:30 下午
+ * @since 2020/11/17 7:30 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java
index f4b4df72..60c8ec84 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.persistence.Table;
  * 发票
  *
  * @author Bulbasaur
- * @date 2020/11/28 11:38
+ * @since 2020/11/28 11:38
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java
index 5f3813ec..0628add5 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java
@@ -22,7 +22,7 @@ import java.util.Date;
  * 商家订单流水
  *
  * @author Chopper
- * @date 2020/11/17 7:31 下午
+ * @since 2020/11/17 7:31 下午
  */
 @Data
 @Entity
@@ -135,7 +135,7 @@ public class StoreFlow {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java
index 20966d8c..0e014b4b 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
@@ -17,7 +17,7 @@ import javax.persistence.Table;
  * 交易
  *
  * @author Chopper
- * @date 2020/11/17 7:34 下午
+ * @since 2020/11/17 7:34 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java
index e2fba22b..20e110c7 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 售后dto
  *
  * @author Chopper
- * @date 2021/3/20 10:48
+ * @since 2021/3/20 10:48
  */
 @Data
 public class AfterSaleDTO {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java
index 613912f5..b442dd83 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 商城退款流水
  *
  * @author Chopper
- * @date 2020/11/17 7:25 下午
+ * @since 2020/11/17 7:25 下午
  */
 @Data
 public class AfterSalePriceDetailDTO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderBatchDeliverDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderBatchDeliverDTO.java
index d6ccd31c..6d9eb229 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderBatchDeliverDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderBatchDeliverDTO.java
@@ -6,7 +6,7 @@ import lombok.Data;
 /**
  * 订单批量发货DTO
  * @author Bulbasaur
- * @date: 2021/5/26 4:21 下午
+ * @since: 2021/5/26 4:21 下午
  *
  */
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderComplaintDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderComplaintDTO.java
index a6588751..f2e39dba 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderComplaintDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderComplaintDTO.java
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotBlank;
  * 交易投诉DTO
  *
  * @author Bulbasaur
- * @date 2021/1/7 19:39
+ * @since 2021/1/7 19:39
  */
 @Data
 public class OrderComplaintDTO {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderExportDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderExportDTO.java
index 8d0b794b..2da9899c 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderExportDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderExportDTO.java
@@ -13,7 +13,7 @@ import java.util.Date;
 /**
  * 订单导出DTO
  * @author Bulbasaur
- * @date: 2021/6/3 6:36 下午
+ * @since: 2021/6/3 6:36 下午
  *
  */
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderReceiptDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderReceiptDTO.java
index 460305fb..6c8640b2 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderReceiptDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderReceiptDTO.java
@@ -10,7 +10,7 @@ import lombok.Data;
  * 订单发票
  *
  * @author lili
- * @date 2020/11/28 11:38
+ * @since 2020/11/28 11:38
  */
 @Data
 @ApiModel(value = "订单发票")
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
index ee9a1172..067b44f5 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.order.order.entity.dto;
 
+import cn.hutool.core.util.StrUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.DateUtil;
@@ -20,7 +21,7 @@ import java.util.Date;
  * 订单查询参数
  *
  * @author Chopper
- * @date 2020/11/17 4:33 下午
+ * @since 2020/11/17 4:33 下午
  */
 @Data
 public class OrderSearchParams extends PageVO {
@@ -76,17 +77,17 @@ public class OrderSearchParams extends PageVO {
     private String paymentMethod;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "支付时间")
     private Date paymentTime;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "下单开始时间")
     private Date startDate;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "下单结束时间")
     private Date endDate;
 
@@ -97,60 +98,56 @@ public class OrderSearchParams extends PageVO {
         QueryWrapper<T> wrapper = new QueryWrapper<>();
 
         //关键字查询
-        if (StringUtils.isNotEmpty(keywords)) {
+        if (StrUtil.isNotEmpty(keywords)) {
             wrapper.like("o.sn", keywords);
             wrapper.like("oi.goods_name", keywords);
         }
         //按卖家查询
-        wrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()), "o.store_id", UserContext.getCurrentUser().getStoreId());
+        wrapper.eq(StrUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()), "o.store_id", UserContext.getCurrentUser().getStoreId());
 
         //店铺查询
-        wrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name())
+        wrapper.eq(StrUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name())
                 && StringUtils.isNotEmpty(storeId), "o.store_id", storeId);
 
         //按买家查询
-        wrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name()), "o.member_id", UserContext.getCurrentUser().getId());
+        wrapper.eq(StrUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name()), "o.member_id", UserContext.getCurrentUser().getId());
 
         //按照买家查询
-        wrapper.like(StringUtils.isNotEmpty(memberId), "o.member_id", memberId);
+        wrapper.like(StrUtil.isNotEmpty(memberId), "o.member_id", memberId);
 
         //按订单编号查询
-        wrapper.like(StringUtils.isNotEmpty(orderSn), "o.sn", orderSn);
+        wrapper.like(StrUtil.isNotEmpty(orderSn), "o.sn", orderSn);
 
         //按时间查询
         wrapper.ge(startDate != null, "o.create_time", startDate);
 
         wrapper.le(endDate != null, "o.create_time", DateUtil.endOfDate(endDate));
         //按购买人用户名
-        wrapper.like(StringUtils.isNotEmpty(buyerName), "o.member_name", buyerName);
+        wrapper.like(StrUtil.isNotEmpty(buyerName), "o.member_name", buyerName);
 
         //按订单类型
-        if (StringUtils.isNotEmpty(orderType)) {
-            wrapper.and(queryWrapper -> queryWrapper.eq("o.order_type", orderType).or()
-                    .eq("o.order_promotion_type", orderType));
-        }
-
+        wrapper.eq(StrUtil.isNotEmpty(orderType), "o.order_type", orderType);
 
         //物流查询
-        wrapper.like(StringUtils.isNotEmpty(shipName), "o.consignee_name", shipName);
+        wrapper.like(StrUtil.isNotEmpty(shipName), "o.consignee_name", shipName);
 
         //按商品名称查询
-        wrapper.like(StringUtils.isNotEmpty(goodsName), "oi.goods_name", goodsName);
+        wrapper.like(StrUtil.isNotEmpty(goodsName), "oi.goods_name", goodsName);
 
         //付款方式
-        wrapper.like(StringUtils.isNotEmpty(paymentType), "o.payment_type", paymentType);
+        wrapper.like(StrUtil.isNotEmpty(paymentType), "o.payment_type", paymentType);
 
         //按支付方式
-        wrapper.eq(StringUtils.isNotEmpty(paymentMethod), "o.payment_method", paymentMethod);
+        wrapper.eq(StrUtil.isNotEmpty(paymentMethod), "o.payment_method", paymentMethod);
 
         //订单状态
-        wrapper.eq(StringUtils.isNotEmpty(orderStatus), "o.order_status", orderStatus);
+        wrapper.eq(StrUtil.isNotEmpty(orderStatus), "o.order_status", orderStatus);
 
         //付款状态
-        wrapper.eq(StringUtils.isNotEmpty(payStatus), "o.pay_status", payStatus);
+        wrapper.eq(StrUtil.isNotEmpty(payStatus), "o.pay_status", payStatus);
 
         //订单来源
-        wrapper.like(StringUtils.isNotEmpty(clientType), "o.client_type", clientType);
+        wrapper.like(StrUtil.isNotEmpty(clientType), "o.client_type", clientType);
 
 
         //按标签查询
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java
index df94d02c..222c2c1e 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java
@@ -14,7 +14,7 @@ import java.util.List;
  * 商城流水，细节到orderItem
  *
  * @author Chopper
- * @date 2020/11/17 7:25 下午
+ * @since 2020/11/17 7:25 下午
  */
 @Data
 public class PriceDetailDTO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java
index e0b82ff4..9d28d0f4 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java
@@ -9,7 +9,7 @@ import javax.persistence.Column;
  * 发票子内容
  *
  * @author Bulbasaur
- * @date 2020/11/28 11:44
+ * @since 2020/11/28 11:44
  */
 @Data
 public class ReceiptDTO {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptSearchParams.java
index 496d259b..176391a0 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptSearchParams.java
@@ -9,7 +9,7 @@ import lombok.Data;
  * 发票搜索参数
  *
  * @author paulG
- * @date 2021/1/12
+ * @since 2021/1/12
  **/
 @Data
 public class ReceiptSearchParams {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommentStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommentStatusEnum.java
index eb1f7f43..16eef3ff 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommentStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommentStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 评论状态枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:25 下午
+ * @since 2020/11/17 7:25 下午
  */
 public enum CommentStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommunicationOwnerEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommunicationOwnerEnum.java
index de7cd1ba..e019e106 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommunicationOwnerEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommunicationOwnerEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 投诉角色枚举
  *
  * @author paulG
- * @date 2020/12/7
+ * @since 2020/12/7
  **/
 public enum CommunicationOwnerEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java
index e2f4c1a3..6877ec75 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 交易投诉状态
  *
  * @author paulG
- * @date 2020/12/4
+ * @since 2020/12/4
  **/
 public enum ComplaintStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/DeliverStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/DeliverStatusEnum.java
index 6f157857..f381d80e 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/DeliverStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/DeliverStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 发货状态枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:25 下午
+ * @since 2020/11/17 7:25 下午
  */
 public enum DeliverStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/FlowTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/FlowTypeEnum.java
index c2c7fa9b..403fe145 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/FlowTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/FlowTypeEnum.java
@@ -5,7 +5,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 流水类型枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:25 下午
+ * @since 2020/11/17 7:25 下午
  */
 public enum FlowTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderComplaintStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderComplaintStatusEnum.java
index facd49e3..1daa5add 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderComplaintStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderComplaintStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 订单的投诉状态
  *
  * @author paulG
- * @date 2020/12/5
+ * @since 2020/12/5
  **/
 public enum OrderComplaintStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderItemAfterSaleStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderItemAfterSaleStatusEnum.java
index d1b2a33a..00a34619 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderItemAfterSaleStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderItemAfterSaleStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 订单可申请售后状态枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:26 下午
+ * @since 2020/11/17 7:26 下午
  */
 public enum OrderItemAfterSaleStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderMetaKeyEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderMetaKeyEnum.java
index 814b9055..6f47de5c 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderMetaKeyEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderMetaKeyEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 订单元Key枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:26 下午
+ * @since 2020/11/17 7:26 下午
  */
 public enum OrderMetaKeyEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOperateEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOperateEnum.java
index b9283f9a..9a3c4659 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOperateEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOperateEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 订单的操作方式枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:26 下午
+ * @since 2020/11/17 7:26 下午
  */
 public enum OrderOperateEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutStatusEnum.java
index a00ce1b3..34254a71 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 订单出库状态枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:26 下午
+ * @since 2020/11/17 7:26 下午
  */
 public enum OrderOutStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutTypeEnum.java
index fe2a6d71..9180a7c6 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutTypeEnum.java
@@ -7,7 +7,7 @@ import java.util.List;
  * 订单出库的类型枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:27 下午
+ * @since 2020/11/17 7:27 下午
  */
 public enum OrderOutTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderPromotionTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderPromotionTypeEnum.java
index f3f0a8b7..57984a98 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderPromotionTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderPromotionTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 订单促销类型枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:28 下午
+ * @since 2020/11/17 7:28 下午
  */
 public enum OrderPromotionTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderStatusEnum.java
index a2536c7b..6d9f4906 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 订单状态枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:27 下午
+ * @since 2020/11/17 7:27 下午
  */
 public enum OrderStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTagEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTagEnum.java
index d7b4aaad..8870398e 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTagEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTagEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 前端订单页面TAB标签枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:28 下午
+ * @since 2020/11/17 7:28 下午
  */
 public enum OrderTagEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTypeEnum.java
index 8fba1a49..6cd2b9b3 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 订单类型枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:28 下午
+ * @since 2020/11/17 7:28 下午
  */
 public enum OrderTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/PayStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/PayStatusEnum.java
index 00c3ea44..33188e2c 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/PayStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/PayStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums;
  * 订单状态枚举
  *
  * @author Chopper
- * @date 2020/11/17 7:28 下午
+ * @since 2020/11/17 7:28 下午
  */
 public enum PayStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java
index d165bd67..b830279a 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java
@@ -9,7 +9,7 @@ import lombok.Data;
  * 售后可操作类型
  *
  * @author Chopper
- * @date 2021/3/12 10:33 上午
+ * @since 2021/3/12 10:33 上午
  */
 @Data
 public class AfterSaleAllowOperation {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java
index 9f7fa32e..a05a416f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 售后申请VO
  *
  * @author Chopper
- * @date 2021/3/12 10:33 上午
+ * @since 2021/3/12 10:33 上午
  */
 @Data
 public class AfterSaleApplyVO {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java
index 5f729f3f..5c934af0 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java
@@ -15,7 +15,7 @@ import java.util.Date;
  * 售后搜索参数
  *
  * @author paulG
- * @date 2020/12/4
+ * @since 2020/12/4
  **/
 @Data
 public class AfterSaleSearchParams extends PageVO {
@@ -56,11 +56,11 @@ public class AfterSaleSearchParams extends PageVO {
     @ApiModelProperty(value = "售后单状态", allowableValues = "APPLY,PASS,REFUSE,BUYER_RETURN,SELLER_RE_DELIVERY,BUYER_CONFIRM,SELLER_CONFIRM,COMPLETE")
     private String serviceStatus;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
     private Date startDate;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "结束时间")
     private Date endDate;
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java
index 50650b50..4fdc10b5 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 售后VO
  *
  * @author Chopper
- * @date 2021/3/12 10:32 上午
+ * @since 2021/3/12 10:32 上午
  */
 @Data
 public class AfterSaleVO extends AfterSale {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AllowOperation.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AllowOperation.java
index 2e39d768..6ef7ca59 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AllowOperation.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AllowOperation.java
@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 订单可进行的操作
  *
  * @author Chopper
- * @date 2020/11/17 7:29 下午
+ * @since 2020/11/17 7:29 下午
  */
 @Data
 public class AllowOperation implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationSearchParams.java
index bbcfcb4d..3afa9369 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationSearchParams.java
@@ -10,7 +10,7 @@ import lombok.Data;
  * 订单投诉搜索参数
  *
  * @author paulG
- * @date 2020/12/5
+ * @since 2020/12/5
  **/
 @Data
 public class OrderComplaintCommunicationSearchParams {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationVO.java
index 53b55196..342e557f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationVO.java
@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
  * 投诉通信VO
  *
  * @author paulG
- * @date 2020/12/5
+ * @since 2020/12/5
  **/
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintOperationParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintOperationParams.java
index 83b4db04..4f3b9145 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintOperationParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintOperationParams.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 交易投诉 参数
  *
  * @author paulG
- * @date 2020/12/4
+ * @since 2020/12/4
  **/
 @Data
 public class OrderComplaintOperationParams {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java
index 707ede7c..025e54cd 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java
@@ -11,7 +11,7 @@ import lombok.Data;
  * 订单投诉查询参数
  *
  * @author paulG
- * @date 2020/12/4
+ * @since 2020/12/4
  **/
 @Data
 public class OrderComplaintSearchParams {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintVO.java
index 8cbccce8..96311ad8 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintVO.java
@@ -14,7 +14,7 @@ import java.util.List;
  * 订单交易投诉VO
  *
  * @author paulG
- * @date 2020/12/4
+ * @since 2020/12/4
  **/
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java
index a814754e..8fad0217 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java
@@ -21,7 +21,7 @@ import java.util.List;
  * 订单详情VO
  *
  * @author Chopper
- * @date 2020/11/17 7:29 下午
+ * @since 2020/11/17 7:29 下午
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java
index 000a01ed..6d091159 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java
@@ -10,7 +10,7 @@ import lombok.Data;
  * 子订单VO
  *
  * @author Chopper
- * @date 2020-08-17 20:28
+ * @since 2020-08-17 20:28
  */
 @Data
 public class OrderItemVO {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
index 1d6f9319..39dece21 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
@@ -19,7 +19,7 @@ import java.util.List;
  * 用于订单列表查看
  *
  * @author Chopper
- * @date 2020-08-17 20:28
+ * @since 2020-08-17 20:28
  */
 @Data
 public class OrderSimpleVO {
@@ -31,7 +31,7 @@ public class OrderSimpleVO {
     private Double flowPrice;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderVO.java
index f6845095..bfb23844 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderVO.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 订单vo
  *
  * @author Bulbasaur
- * @date 2020/11/28 11:38
+ * @since 2020/11/28 11:38
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java
index a38ca62a..ae903758 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.entity.vo;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.order.order.entity.enums.OrderTypeEnum;
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
@@ -16,7 +16,7 @@ import java.util.Date;
  * 订单支付日志：实际为订单部分字段提取过来的一个vo
  *
  * @author Chopper
- * @date 2020/11/17 7:30 下午
+ * @since 2020/11/17 7:30 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/ReceiptVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/ReceiptVO.java
index cbea30f0..ad7b73ce 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/ReceiptVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/ReceiptVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 发票
  *
  * @author Bulbasaur
- * @date 2020/11/28 11:38
+ * @since 2020/11/28 11:38
  */
 @Data
 @ApiModel(value = "发票")
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/StoreAppealVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/StoreAppealVO.java
index f4aac4b1..fb0a533c 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/StoreAppealVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/StoreAppealVO.java
@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
  * 订单交易投诉VO
  *
  * @author paulG
- * @date 2020/12/4
+ * @since 2020/12/4
  **/
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java
index a67c0ae7..9ee2ceb3 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select;
  * 售后数据处理层
  *
  * @author Chopper
- * @date 2020/11/17 7:34 下午
+ * @since 2020/11/17 7:34 下午
  */
 public interface AfterSaleMapper extends BaseMapper<AfterSale> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java
index 2e0f2d7b..2cfe9d2f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 售后原因数据处理层
  *
  * @author Chopper
- * @date 2020/11/17 7:34 下午
+ * @since 2020/11/17 7:34 下午
  */
 public interface AfterSaleReasonMapper extends BaseMapper<AfterSaleReason> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java
index 91643411..199b2f63 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java
@@ -14,7 +14,7 @@ import java.util.List;
  * 子订单数据处理层
  *
  * @author Chopper
- * @date 2020/11/17 7:34 下午
+ * @since 2020/11/17 7:34 下午
  */
 public interface OrderItemMapper extends BaseMapper<OrderItem> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
index 6bcbbf42..a86f0e68 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
@@ -18,7 +18,7 @@ import java.util.List;
  * 订单数据处理层
  *
  * @author Chopper
- * @date 2020/11/17 7:35 下午
+ * @since 2020/11/17 7:35 下午
  */
 public interface OrderMapper extends BaseMapper<Order> {
 
@@ -60,7 +60,8 @@ public interface OrderMapper extends BaseMapper<Order> {
      */
     @Select("SELECT o.sn,o.create_time,o.member_name,o.consignee_name,o.consignee_mobile,o.consignee_address_path,o.consignee_detail," +
             "o.payment_method, o.logistics_name,o.freight_price,o.goods_price,o.discount_price,o.flow_price,oi.goods_name,oi.num," +
-            "o.remark,o.order_status,o.pay_status,o.deliver_status,o.need_receipt,o.store_name FROM li_order_item oi INNER JOIN li_order o ON oi.order_sn=o.sn ${ew.customSqlSegment}")
+            "o.remark,o.order_status,o.pay_status,o.deliver_status,o.need_receipt,o.store_name FROM li_order o LEFT JOIN li_order_item oi " +
+            "ON oi.order_sn=o.sn ${ew.customSqlSegment}")
     List<OrderExportDTO> queryExportOrder(@Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
 
     /**
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/ReceiptMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/ReceiptMapper.java
index 3a7ba953..f6df8c3b 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/ReceiptMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/ReceiptMapper.java
@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Select;
  * 发票数据处理层
  *
  * @author Chopper
- * @date 2020/11/17 7:35 下午
+ * @since 2020/11/17 7:35 下午
  */
 public interface ReceiptMapper extends BaseMapper<Receipt> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/StoreFlowMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/StoreFlowMapper.java
index 73e0abc7..faffdc4f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/StoreFlowMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/StoreFlowMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 商家订单流水数据处理层
  *
  * @author Chopper
- * @date 2020/11/17 7:35 下午
+ * @since 2020/11/17 7:35 下午
  */
 public interface StoreFlowMapper extends BaseMapper<StoreFlow> {
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/TradeMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/TradeMapper.java
index 49201fc7..3c5093e4 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/TradeMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/TradeMapper.java
@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Update;
  * 交易数据处理层
  *
  * @author Chopper
- * @date 2020/11/17 7:35 下午
+ * @since 2020/11/17 7:35 下午
  */
 public interface TradeMapper extends BaseMapper<Trade> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java
index 9cd4bd68..a5a19a7f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 订单日志业务层
  *
  * @author Chopper
- * @date 2020/11/17 7:37 下午
+ * @since 2020/11/17 7:37 下午
  */
 public interface AfterSaleLogService extends IService<AfterSaleLog> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java
index cdd65be7..54ae530d 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 售后原因业务层
  *
  * @author Chopper
- * @date 2020/11/17 7:37 下午
+ * @since 2020/11/17 7:37 下午
  */
 public interface AfterSaleReasonService extends IService<AfterSaleReason> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java
index e27fd9bf..00cee243 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java
@@ -20,7 +20,7 @@ import java.util.List;
  * 售后业务层
  *
  * @author Chopper
- * @date 2020/11/17 7:36 下午
+ * @since 2020/11/17 7:36 下午
  */
 public interface AfterSaleService extends IService<AfterSale> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintCommunicationService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintCommunicationService.java
index 10a1920a..c0637b41 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintCommunicationService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintCommunicationService.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 订单投诉通信业务层
  *
  * @author paulG
- * @date 2020/12/5
+ * @since 2020/12/5
  **/
 public interface OrderComplaintCommunicationService extends IService<OrderComplaintCommunication> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java
index 79bc0461..7ab562da 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java
@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 交易投诉业务层
  *
  * @author paulG
- * @date 2020/12/4
+ * @since 2020/12/4
  **/
 public interface OrderComplaintService extends IService<OrderComplaint> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java
index 980985b4..cee318a2 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 子订单业务层
  *
  * @author Chopper
- * @date 2020/11/17 7:36 下午
+ * @since 2020/11/17 7:36 下午
  */
 public interface OrderItemService extends IService<OrderItem> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderPriceService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderPriceService.java
index 56db9912..1aa5791e 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderPriceService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderPriceService.java
@@ -6,7 +6,7 @@ import cn.lili.modules.order.order.entity.dos.Order;
  * 订单价格
  *
  * @author Chopper
- * @date 2020/11/17 7:36 下午
+ * @since 2020/11/17 7:36 下午
  */
 public interface OrderPriceService {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
index 63fa0ae0..e35b03eb 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
@@ -22,7 +22,7 @@ import java.util.List;
  * 子订单业务层
  *
  * @author Chopper
- * @date 2020/11/17 7:36 下午
+ * @since 2020/11/17 7:36 下午
  */
 public interface OrderService extends IService<Order> {
 
@@ -208,9 +208,8 @@ public interface OrderService extends IService<Order> {
     /**
      * 获取待发货订单编号列表
      *
-     * @param response
+     * @param response 响应
      * @param logisticsName 店铺已选择物流公司列表
-     * @return 待发货订单编号列表
      */
     void getBatchDeliverList(HttpServletResponse response, List<String> logisticsName);
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/ReceiptService.java b/framework/src/main/java/cn/lili/modules/order/order/service/ReceiptService.java
index 2caeed81..748b6051 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/ReceiptService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/ReceiptService.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 发票业务层
  *
  * @author Bulbasaur
- * @date 2020/11/17 7:37 下午
+ * @since 2020/11/17 7:37 下午
  */
 public interface ReceiptService extends IService<Receipt> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java b/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java
index 14740c83..83d07d57 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java
@@ -12,7 +12,7 @@ import java.util.Date;
  * 商家订单流水业务层
  *
  * @author Chopper
- * @date 2020/11/17 7:37 下午
+ * @since 2020/11/17 7:37 下午
  */
 public interface StoreFlowService extends IService<StoreFlow> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/TradeService.java b/framework/src/main/java/cn/lili/modules/order/order/service/TradeService.java
index 21fcfe5b..cf14ea5d 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/TradeService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/TradeService.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 交易业务层
  *
  * @author Chopper
- * @date 2020/11/17 7:37 下午
+ * @since 2020/11/17 7:37 下午
  */
 public interface TradeService extends IService<Trade> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java
index 5c69e2fb..e35fd44f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java
@@ -15,7 +15,7 @@ import java.util.List;
  * 订单日志业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 7:37 下午
+ * @since 2020/11/17 7:37 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java
index 7599e92a..991b38dc 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 售后原因业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 7:38 下午
+ * @since 2020/11/17 7:38 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
index 58ae9189..7beb0b53 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
@@ -1,18 +1,21 @@
 package cn.lili.modules.order.order.serviceimpl;
 
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.aop.syslog.annotation.SystemLogPoint;
+import cn.lili.modules.system.utils.OperationalJudgment;
+import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.AfterSaleTagsEnum;
+import cn.lili.mybatis.util.PageUtil;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.AfterSaleTagsEnum;
 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.*;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.order.order.aop.AfterSaleLogPoint;
 import cn.lili.modules.order.order.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dos.Order;
@@ -60,7 +63,7 @@ import java.util.List;
  * 售后业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 7:38 下午
+ * @since 2020/11/17 7:38 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -138,7 +141,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
             throw new ServiceException(ResultCode.AFTER_SALES_NOT_PAY_ERROR);
         }
         //判断支付方式是否为线上支付
-        if (order.getPaymentMethod().equals(PaymentMethodEnum.BANK_TRANSFER)) {
+        if (order.getPaymentMethod().equals(PaymentMethodEnum.BANK_TRANSFER.name())) {
             afterSaleApplyVO.setRefundWay(AfterSaleRefundWayEnum.OFFLINE.name());
         } else {
             afterSaleApplyVO.setRefundWay(AfterSaleRefundWayEnum.ORIGINAL.name());
@@ -153,7 +156,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
         }
 
         afterSaleApplyVO.setAccountType(order.getPaymentMethod());
-        afterSaleApplyVO.setApplyRefundPrice(CurrencyUtil.sub(orderItem.getFlowPrice(), orderItem.getNum()));
+        afterSaleApplyVO.setApplyRefundPrice(CurrencyUtil.div(orderItem.getFlowPrice(), orderItem.getNum()));
         afterSaleApplyVO.setNum(orderItem.getNum());
         afterSaleApplyVO.setGoodsId(orderItem.getGoodsId());
         afterSaleApplyVO.setGoodsName(orderItem.getGoodsName());
@@ -181,12 +184,17 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
     public AfterSale review(String afterSaleSn, String serviceStatus, String remark, Double actualRefundPrice) {
         //根据售后单号获取售后单
         AfterSale afterSale = OperationalJudgment.judgment(this.getBySn(afterSaleSn));
-        afterSale.setActualRefundPrice(actualRefundPrice);
 
         //判断为待审核的售后服务
         if (!afterSale.getServiceStatus().equals(AfterSaleStatusEnum.APPLY.name())) {
             throw new ServiceException(ResultCode.AFTER_SALES_DOUBLE_ERROR);
         }
+        //判断退款金额与付款金额是否正确,退款金额不能小于付款金额
+        if (NumberUtil.compare(afterSale.getFlowPrice(), actualRefundPrice) == -1) {
+            throw new ServiceException(ResultCode.AFTER_SALES_PRICE_ERROR);
+        }
+
+        afterSale.setActualRefundPrice(actualRefundPrice);
 
         //判断审核状态
         //如果售后类型为：退款，审核状态为已通过并且退款方式为原路退回，售后单状态为已完成。
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintCommunicationServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintCommunicationServiceImpl.java
index aef1868a..b20ea3a5 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintCommunicationServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintCommunicationServiceImpl.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.order.order.serviceimpl;
 
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.order.order.entity.dos.OrderComplaintCommunication;
 import cn.lili.modules.order.order.entity.vo.OrderComplaintCommunicationSearchParams;
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import javax.transaction.Transactional;
-
 /**
  * 交易投诉通信业务层实现
  *
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
index 1d66cff7..cf932c2e 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java
@@ -6,8 +6,8 @@ import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.common.utils.OperationalJudgment;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.modules.system.utils.OperationalJudgment;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java
index 1f5125a5..7579de46 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java
@@ -23,7 +23,7 @@ import java.util.List;
  * 子订单业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 7:38 下午
+ * @since 2020/11/17 7:38 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java
index 3bc505d8..8e9a7b18 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java
@@ -1,11 +1,11 @@
 package cn.lili.modules.order.order.serviceimpl;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.aop.syslog.annotation.SystemLogPoint;
+import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.CurrencyUtil;
-import cn.lili.common.utils.OperationalJudgment;
+import cn.lili.modules.system.utils.OperationalJudgment;
 import cn.lili.modules.goods.service.CategoryService;
 import cn.lili.modules.order.order.aop.OrderLogPoint;
 import cn.lili.modules.order.order.entity.dos.Order;
@@ -32,7 +32,7 @@ import java.util.List;
  * 订单价格业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 7:36 下午
+ * @since 2020/11/17 7:36 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index d8fff356..ef2982b4 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -8,26 +8,26 @@ import cn.hutool.json.JSONUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
-import cn.lili.common.aop.syslog.annotation.SystemLogPoint;
-import cn.lili.common.trigger.util.DelayQueueTools;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.message.PintuanOrderMessage;
+import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
+import cn.lili.trigger.util.DelayQueueTools;
+import cn.lili.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.message.PintuanOrderMessage;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
-import cn.lili.common.rocketmq.tags.MqOrderTagsEnum;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.GoodsTagsEnum;
+import cn.lili.rocketmq.tags.MqOrderTagsEnum;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
-import cn.lili.common.utils.OperationalJudgment;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeTriggerMsg;
+import cn.lili.modules.system.utils.OperationalJudgment;
+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.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
 import cn.lili.modules.goods.service.GoodsSkuService;
@@ -83,7 +83,7 @@ import java.util.*;
  * 子订单业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 7:38 下午
+ * @since 2020/11/17 7:38 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java
index ce57885b..6986fc56 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java
@@ -2,7 +2,7 @@ package cn.lili.modules.order.order.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.order.order.entity.dos.Receipt;
 import cn.lili.modules.order.order.entity.dto.OrderReceiptDTO;
@@ -14,13 +14,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 发票业务层实现
  *
  * @author Bulbasaur
- * @date 2020/11/17 7:38 下午
+ * @since 2020/11/17 7:38 下午
  */
 @Service
 public class ReceiptServiceImpl extends ServiceImpl<ReceiptMapper, Receipt> implements ReceiptService {
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
index 46c84483..defc29aa 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
@@ -15,6 +15,7 @@ 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.service.RefundLogService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -32,7 +33,7 @@ import java.util.List;
  * 商家订单流水业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 7:38 下午
+ * @since 2020/11/17 7:38 下午
  */
 @Slf4j
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
index 1bb77a78..e2189f9d 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
@@ -1 +1 @@
-package cn.lili.modules.order.order.serviceimpl;

import cn.lili.common.cache.Cache;
import cn.lili.common.cache.CachePrefix;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
import cn.lili.common.rocketmq.tags.MqOrderTagsEnum;
import cn.lili.config.rocketmq.RocketmqCustomProperties;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dos.MemberAddress;
import cn.lili.modules.member.service.MemberService;
import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.cart.entity.vo.CartVO;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.Trade;
import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
import cn.lili.modules.order.order.mapper.TradeMapper;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.order.order.service.TradeService;
import cn.lili.modules.promotion.service.CouponService;
import cn.lili.modules.promotion.service.MemberCouponService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;

/**
 * 交易业务层实现
 *
 * @author Chopper
 * @date 2020/11/17 7:39 下午
 */
@Service
@Transactional(rollbackFor = Exception.class)
public class TradeServiceImpl extends ServiceImpl<TradeMapper, Trade> implements TradeService {

    /**
     * 缓存
     */
    @Autowired
    private Cache<Object> cache;
    /**
     * 订单
     */
    @Autowired
    private OrderService orderService;
    /**
     * 会员
     */
    @Autowired
    private MemberService memberService;
    /**
     * 优惠券
     */
    @Autowired
    private CouponService couponService;
    /**
     * 会员优惠券
     */
    @Autowired
    private MemberCouponService memberCouponService;
    /**
     * RocketMQ
     */
    @Autowired
    private RocketMQTemplate rocketMQTemplate;
    /**
     * RocketMQ 配置
     */
    @Autowired
    private RocketmqCustomProperties rocketmqCustomProperties;


    @Override
    @Transactional(rollbackFor = Exception.class)
    public Trade createTrade(TradeDTO tradeDTO) {

        //创建订单预校验
        createTradeCheck(tradeDTO);


        Trade trade = new Trade(tradeDTO);
        String key = CachePrefix.TRADE.getPrefix() + trade.getSn();
        //积分预处理
        pointPretreatment(tradeDTO);
        //优惠券预处理
        couponPretreatment(tradeDTO);
        //添加交易
        this.save(trade);
        //添加订单
        orderService.intoDB(tradeDTO);
        //写入缓存，给消费者调用
        cache.put(key, tradeDTO);
        //构建订单创建消息
        String destination = rocketmqCustomProperties.getOrderTopic() + ":" + MqOrderTagsEnum.ORDER_CREATE.name();
        //发送订单创建消息
        rocketMQTemplate.asyncSend(destination, key, RocketmqSendCallbackBuilder.commonCallback());
        return trade;
    }

    /**
     * 创建订单最后一步校验
     *
     * @param tradeDTO
     */
    private void createTradeCheck(TradeDTO tradeDTO) {

        //创建订单如果没有收获地址，
        MemberAddress memberAddress = tradeDTO.getMemberAddress();
        if (memberAddress == null) {
            throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST);
        }

        /**
         * 订单配送区域校验
         */
        if (tradeDTO.getNotSupportFreight() != null && tradeDTO.getNotSupportFreight().size() > 0) {
            StringBuilder stringBuilder = new StringBuilder("包含商品有-");
            tradeDTO.getNotSupportFreight().forEach(sku -> {
                stringBuilder.append(sku.getGoodsSku().getGoodsName());
            });
            throw new ServiceException(ResultCode.ORDER_NOT_SUPPORT_DISTRIBUTION, stringBuilder.toString());
        }
    }

    @Override
    public Trade getBySn(String sn) {
        LambdaQueryWrapper<Trade> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(Trade::getSn, sn);
        return this.getOne(queryWrapper);
    }


    @Override
    public void payTrade(String tradeSn, String paymentName, String receivableNo) {
        LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
        orderQueryWrapper.eq(Order::getTradeSn, tradeSn);
        List<Order> orders = orderService.list(orderQueryWrapper);
        for (Order order : orders) {
            orderService.payOrder(order.getSn(), paymentName, receivableNo);
        }
        Trade trade = this.getBySn(tradeSn);
        trade.setPayStatus(PayStatusEnum.PAID.name());
        this.saveOrUpdate(trade);
    }

    /**
     * 积分预处理
     * 下单同时，使用积分
     *
     * @param tradeDTO
     */
    private void pointPretreatment(TradeDTO tradeDTO) {
        StringBuilder orderSns = new StringBuilder();
        for (CartVO item : tradeDTO.getCartList()) {
            orderSns.append(item.getSn()).append(",");
        }
        if (tradeDTO.getPriceDetailDTO() != null && tradeDTO.getPriceDetailDTO().getPayPoint() != null && tradeDTO.getPriceDetailDTO().getPayPoint() > 0) {
            Member userInfo = memberService.getUserInfo();
            if (userInfo.getPoint() < tradeDTO.getPriceDetailDTO().getPayPoint()) {
                throw new ServiceException(ResultCode.PAY_POINT_ENOUGH);
            }
            boolean result = memberService.updateMemberPoint(tradeDTO.getPriceDetailDTO().
                            getPayPoint().longValue(), false, tradeDTO.getMemberId(),
                    "订单【" + orderSns + "】创建，积分扣减");

            if (!result) {
                throw new ServiceException(ResultCode.PAY_POINT_ENOUGH);
            }
        }
    }


    /**
     * 优惠券预处理
     * 下单同时，扣除优惠券
     *
     * @param tradeDTO
     */
    private void couponPretreatment(TradeDTO tradeDTO) {
        List<MemberCouponDTO> memberCouponDTOList = new ArrayList<>();
        if (null != tradeDTO.getPlatformCoupon()) {
            memberCouponDTOList.add(tradeDTO.getPlatformCoupon());
        }
        Collection<MemberCouponDTO> storeCoupons = tradeDTO.getStoreCoupons().values();
        if (!storeCoupons.isEmpty()) {
            memberCouponDTOList.addAll(storeCoupons);
        }
        List<String> ids = memberCouponDTOList.stream().map(e -> e.getMemberCoupon().getId()).collect(Collectors.toList());
        memberCouponService.used(ids);
        memberCouponDTOList.forEach(e -> couponService.usedCoupon(e.getMemberCoupon().getCouponId(), 1));

    }


}
\ No newline at end of file
+package cn.lili.modules.order.order.serviceimpl;

import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
import cn.lili.rocketmq.tags.MqOrderTagsEnum;
import cn.lili.common.properties.RocketmqCustomProperties;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dos.MemberAddress;
import cn.lili.modules.member.service.MemberService;
import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.cart.entity.vo.CartVO;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.Trade;
import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
import cn.lili.modules.order.order.mapper.TradeMapper;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.order.order.service.TradeService;
import cn.lili.modules.promotion.service.CouponService;
import cn.lili.modules.promotion.service.MemberCouponService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;

/**
 * 交易业务层实现
 *
 * @author Chopper
 * @date 2020/11/17 7:39 下午
 */
@Service
@Transactional(rollbackFor = Exception.class)
public class TradeServiceImpl extends ServiceImpl<TradeMapper, Trade> implements TradeService {

    /**
     * 缓存
     */
    @Autowired
    private Cache<Object> cache;
    /**
     * 订单
     */
    @Autowired
    private OrderService orderService;
    /**
     * 会员
     */
    @Autowired
    private MemberService memberService;
    /**
     * 优惠券
     */
    @Autowired
    private CouponService couponService;
    /**
     * 会员优惠券
     */
    @Autowired
    private MemberCouponService memberCouponService;
    /**
     * RocketMQ
     */
    @Autowired
    private RocketMQTemplate rocketMQTemplate;
    /**
     * RocketMQ 配置
     */
    @Autowired
    private RocketmqCustomProperties rocketmqCustomProperties;


    @Override
    @Transactional(rollbackFor = Exception.class)
    public Trade createTrade(TradeDTO tradeDTO) {

        //创建订单预校验
        createTradeCheck(tradeDTO);


        Trade trade = new Trade(tradeDTO);
        String key = CachePrefix.TRADE.getPrefix() + trade.getSn();
        //积分预处理
        pointPretreatment(tradeDTO);
        //优惠券预处理
        couponPretreatment(tradeDTO);
        //添加交易
        this.save(trade);
        //添加订单
        orderService.intoDB(tradeDTO);
        //写入缓存，给消费者调用
        cache.put(key, tradeDTO);
        //构建订单创建消息
        String destination = rocketmqCustomProperties.getOrderTopic() + ":" + MqOrderTagsEnum.ORDER_CREATE.name();
        //发送订单创建消息
        rocketMQTemplate.asyncSend(destination, key, RocketmqSendCallbackBuilder.commonCallback());
        return trade;
    }

    /**
     * 创建订单最后一步校验
     *
     * @param tradeDTO
     */
    private void createTradeCheck(TradeDTO tradeDTO) {

        //创建订单如果没有收获地址，
        MemberAddress memberAddress = tradeDTO.getMemberAddress();
        if (memberAddress == null) {
            throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST);
        }

        /**
         * 订单配送区域校验
         */
        if (tradeDTO.getNotSupportFreight() != null && tradeDTO.getNotSupportFreight().size() > 0) {
            StringBuilder stringBuilder = new StringBuilder("包含商品有-");
            tradeDTO.getNotSupportFreight().forEach(sku -> {
                stringBuilder.append(sku.getGoodsSku().getGoodsName());
            });
            throw new ServiceException(ResultCode.ORDER_NOT_SUPPORT_DISTRIBUTION, stringBuilder.toString());
        }
    }

    @Override
    public Trade getBySn(String sn) {
        LambdaQueryWrapper<Trade> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(Trade::getSn, sn);
        return this.getOne(queryWrapper);
    }


    @Override
    public void payTrade(String tradeSn, String paymentName, String receivableNo) {
        LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
        orderQueryWrapper.eq(Order::getTradeSn, tradeSn);
        List<Order> orders = orderService.list(orderQueryWrapper);
        for (Order order : orders) {
            orderService.payOrder(order.getSn(), paymentName, receivableNo);
        }
        Trade trade = this.getBySn(tradeSn);
        trade.setPayStatus(PayStatusEnum.PAID.name());
        this.saveOrUpdate(trade);
    }

    /**
     * 积分预处理
     * 下单同时，使用积分
     *
     * @param tradeDTO
     */
    private void pointPretreatment(TradeDTO tradeDTO) {
        StringBuilder orderSns = new StringBuilder();
        for (CartVO item : tradeDTO.getCartList()) {
            orderSns.append(item.getSn()).append(",");
        }
        if (tradeDTO.getPriceDetailDTO() != null && tradeDTO.getPriceDetailDTO().getPayPoint() != null && tradeDTO.getPriceDetailDTO().getPayPoint() > 0) {
            Member userInfo = memberService.getUserInfo();
            if (userInfo.getPoint() < tradeDTO.getPriceDetailDTO().getPayPoint()) {
                throw new ServiceException(ResultCode.PAY_POINT_ENOUGH);
            }
            boolean result = memberService.updateMemberPoint(tradeDTO.getPriceDetailDTO().
                            getPayPoint().longValue(), false, tradeDTO.getMemberId(),
                    "订单【" + orderSns + "】创建，积分扣减");

            if (!result) {
                throw new ServiceException(ResultCode.PAY_POINT_ENOUGH);
            }
        }
    }


    /**
     * 优惠券预处理
     * 下单同时，扣除优惠券
     *
     * @param tradeDTO
     */
    private void couponPretreatment(TradeDTO tradeDTO) {
        List<MemberCouponDTO> memberCouponDTOList = new ArrayList<>();
        if (null != tradeDTO.getPlatformCoupon()) {
            memberCouponDTOList.add(tradeDTO.getPlatformCoupon());
        }
        Collection<MemberCouponDTO> storeCoupons = tradeDTO.getStoreCoupons().values();
        if (!storeCoupons.isEmpty()) {
            memberCouponDTOList.addAll(storeCoupons);
        }
        List<String> ids = memberCouponDTOList.stream().map(e -> e.getMemberCoupon().getId()).collect(Collectors.toList());
        memberCouponService.used(ids);
        memberCouponDTOList.forEach(e -> couponService.usedCoupon(e.getMemberCoupon().getCouponId(), 1));

    }


}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java
index a70e8abd..e0b56d16 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java
@@ -24,7 +24,7 @@ import java.util.Date;
  * 售后日志
  *
  * @author Bulbasaur
- * @date 2020-03-25 2:30 下午
+ * @since 2020-03-25 2:30 下午
  */
 @Data
 @Entity
@@ -48,7 +48,7 @@ public class AfterSaleLog {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java
index 39c8a263..0bdfbd91 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java
@@ -25,7 +25,7 @@ import java.util.Date;
  * 订单日志
  *
  * @author Chopper
- * @date 2020-03-25 2:30 下午
+ * @since 2020-03-25 2:30 下午
  */
 @Data
 @Entity
@@ -51,7 +51,7 @@ public class OrderLog {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java
index 8e039c55..8adcb9fd 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java
@@ -26,7 +26,7 @@ import java.util.Date;
  * 预存款充值记录
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
@@ -53,7 +53,7 @@ public class Recharge {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
@@ -86,7 +86,7 @@ public class Recharge {
 
     @ApiModelProperty(value = "支付时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date payTime;
 
 
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java
index 8508af4e..786bf409 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java
@@ -23,7 +23,7 @@ import java.util.Date;
  * 预存款日志实体
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
@@ -81,7 +81,7 @@ public class WalletLog {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleStatusEnum.java
index f0ff1d64..0ac00c29 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.trade.entity.enums;
  * 售后状态
  *
  * @author Chopper
- * @date 2020-08-20 15:39
+ * @since 2020-08-20 15:39
  */
 public enum AfterSaleStatusEnum {
 
@@ -14,7 +14,7 @@ public enum AfterSaleStatusEnum {
     APPLY("申请中"),
     PASS("已通过"),
     REFUSE("已拒绝"),
-    BUYER_RETURN("买家退货，待卖家收货"),
+    BUYER_RETURN("待卖家收货"),
     SELLER_CONFIRM("卖家确认收货"),
     SELLER_TERMINATION("卖家终止售后"),
     BUYER_CANCEL("买家取消售后"),
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleTypeEnum.java
index 6b0d26a4..d7ddfc2d 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.trade.entity.enums;
  * 售后类型
  *
  * @author Chopper
- * @date 2020/8/20 15:39
+ * @since 2020/8/20 15:39
  */
 
 public enum AfterSaleTypeEnum {
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java
index 51c8eaa7..cbfae540 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.order.trade.entity.enums;
  * 预存款变动日志业务类型
  *
  * @author Chopper
- * @date 2020/8/20 15:39
+ * @since 2020/8/20 15:39
  */
 
 public enum DepositServiceTypeEnum {
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/DepositQueryVO.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/DepositQueryVO.java
index dfd438a8..29bcad3f 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/DepositQueryVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/DepositQueryVO.java
@@ -12,7 +12,7 @@ import java.io.Serializable;
  * 预存款充值记录查询条件
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @ApiModel(value = "预存款变动记录查询条件")
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/RechargeQueryVO.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/RechargeQueryVO.java
index 7bd5d894..d65882ae 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/RechargeQueryVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/RechargeQueryVO.java
@@ -12,7 +12,7 @@ import java.io.Serializable;
  * 预存款充值记录查询条件
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @ApiModel(value = "预存款充值记录查询条件")
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java b/framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java
index 8315d63d..4bb728e3 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 售后日志数据处理层
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface AfterSaleLogMapper extends BaseMapper<AfterSaleLog> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/mapper/OrderLogMapper.java b/framework/src/main/java/cn/lili/modules/order/trade/mapper/OrderLogMapper.java
index 91cfb106..2feeaa49 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/mapper/OrderLogMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/mapper/OrderLogMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 订单日志数据处理层
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface OrderLogMapper extends BaseMapper<OrderLog> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java b/framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java
index b3af0ac9..fafc2195 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 预存款充值记录数据处理层
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface RechargeMapper extends BaseMapper<Recharge> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java b/framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java
index 428698d8..2ea8ae05 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 预存款日志数据处理层
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface WalletLogMapper extends BaseMapper<WalletLog> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/service/OrderLogService.java b/framework/src/main/java/cn/lili/modules/order/trade/service/OrderLogService.java
index e2be3e7d..ece01032 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/service/OrderLogService.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/service/OrderLogService.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 订单日志业务层
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface OrderLogService extends IService<OrderLog> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java b/framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java
index a4b51e39..3c3cd946 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 预存款充值记录业务层
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface RechargeService extends IService<Recharge> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java b/framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java
index a83baece..8ca0722f 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 预存款日志业务层
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public interface WalletLogService extends IService<WalletLog> {
 
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java
index 9d3aa91c..f032a02c 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java
@@ -17,7 +17,7 @@ import java.util.List;
  * 订单日志业务层实现
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Service
 public class OrderLogServiceImpl extends ServiceImpl<OrderLogMapper, OrderLog> implements OrderLogService {
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java
index c866ce0e..e1baf0dc 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java
@@ -5,8 +5,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.DateUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
@@ -30,7 +29,7 @@ import java.util.Date;
  * 预存款日志业务层实现
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java
index 88bb32c9..30f2ea31 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.order.trade.serviceimpl;
 
-import cn.lili.common.utils.PageUtil;
+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;
@@ -19,7 +19,7 @@ import java.util.Date;
  * 预存款日志业务层实现
  *
  * @author pikachu
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java
index 6a3d756c..f15908ff 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.page.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.page.entity.enums.ArticleEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -17,7 +17,7 @@ import javax.validation.constraints.NotNull;
  * 文章DO
  *
  * @author Bulbasaur
- * @date 2020/12/10 17:42
+ * @since 2020/12/10 17:42
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java
index 1ef9e680..d5a67750 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.page.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.page.entity.enums.ArticleCategoryEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -18,7 +18,7 @@ import javax.validation.constraints.NotEmpty;
  *
  * @author pikachu
  * @author Bulbasaur
- * @date 2020/12/10 17:42
+ * @since 2020/12/10 17:42
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java
index 432df5f2..03beb983 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java
@@ -1,7 +1,5 @@
 package cn.lili.modules.page.entity.dos;
 
-import cn.lili.base.BaseEntity;
-import cn.lili.common.utils.SnowFlake;
 import cn.lili.modules.page.entity.enums.FeedbackTypeEnum;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -27,7 +25,7 @@ import java.util.Date;
  * 意见反馈
  *
  * @author Bulbasaur
- * @date 2020/12/10 17:42
+ * @since 2020/12/10 17:42
  */
 @Data
 @Entity
@@ -46,7 +44,7 @@ public class Feedback implements Serializable {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java
index fd30ba49..0238878b 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.page.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.enums.ClientTypeEnum;
@@ -18,7 +18,7 @@ import javax.persistence.Table;
  * 页面数据DO
  *
  * @author Bulbasaur
- * @date 2020/12/10 17:42
+ * @since 2020/12/10 17:42
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java
index 9381253a..8a950065 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.page.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.enums.ClientTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -14,7 +14,7 @@ import javax.persistence.Table;
  * 专题活动
  *
  * @author Bulbasaur
- * @date 2020/12/10 17:42
+ * @since 2020/12/10 17:42
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dto/ArticleSearchParams.java b/framework/src/main/java/cn/lili/modules/page/entity/dto/ArticleSearchParams.java
index fe394f53..00271be7 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/dto/ArticleSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/dto/ArticleSearchParams.java
@@ -10,7 +10,7 @@ import lombok.Data;
  * 商品查询条件
  *
  * @author pikachu
- * @date 2020-02-24 19:27:20
+ * @since 2020-02-24 19:27:20
  */
 @Data
 public class ArticleSearchParams extends PageVO {
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java b/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java
index 0bed2e74..70be533c 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java
@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
  * 楼层装修数据DTO
  *
  * @author Bulbasaur
- * @date 2020/12/10 17:44
+ * @since 2020/12/10 17:44
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleCategoryEnum.java b/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleCategoryEnum.java
index b914f792..d49f7865 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleCategoryEnum.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleCategoryEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.page.entity.enums;
  * 文章分类枚举
  *
  * @author Bulbasaur
- * @date 2020/12/7 10:50
+ * @since 2020/12/7 10:50
  */
 public enum ArticleCategoryEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleEnum.java b/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleEnum.java
index d2c93723..9a971e8e 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleEnum.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.page.entity.enums;
  * 文章分类枚举
  *
  * @author Bulbasaur
- * @date 2020/12/7 10:50
+ * @since 2020/12/7 10:50
  */
 public enum ArticleEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/enums/FeedbackTypeEnum.java b/framework/src/main/java/cn/lili/modules/page/entity/enums/FeedbackTypeEnum.java
index cca95dfb..ee088002 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/enums/FeedbackTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/enums/FeedbackTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.page.entity.enums;
  * 功能反馈枚举
  *
  * @author Bulbasaur
- * @date 2020/12/7 10:50
+ * @since 2020/12/7 10:50
  */
 public enum FeedbackTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/enums/PageEnum.java b/framework/src/main/java/cn/lili/modules/page/entity/enums/PageEnum.java
index 0c5b2948..c8747c8b 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/enums/PageEnum.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/enums/PageEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.page.entity.enums;
  * 楼层装修枚举
  *
  * @author Bulbasaur
- * @date 2020/12/7 10:50
+ * @since 2020/12/7 10:50
  */
 public enum PageEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleCategoryVO.java b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleCategoryVO.java
index f6f0f901..112ecc87 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleCategoryVO.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleCategoryVO.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 文章分类VO
  *
  * @author Chopper
- * @date 2021-03-26 11:32
+ * @since 2021-03-26 11:32
  */
 @Data
 public class ArticleCategoryVO extends ArticleCategory {
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java
index 98891628..997216bd 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 文章VO
  *
  * @author Chopper
- * @date 2021-03-26 11:32
+ * @since 2021-03-26 11:32
  */
 @Data
 public class ArticleVO {
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataListVO.java b/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataListVO.java
index 1eb61f9c..87bd7553 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataListVO.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataListVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 楼层装修数据VO
  *
  * @author Bulbasaur
- * @date 2020/12/10 17:42
+ * @since 2020/12/10 17:42
  */
 @Data
 public class PageDataListVO {
diff --git a/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataVO.java b/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataVO.java
index 8df6902c..5a555dab 100644
--- a/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataVO.java
+++ b/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 楼层装修数据VO
  *
  * @author Bulbasaur
- * @date 2020/12/10 17:42
+ * @since 2020/12/10 17:42
  */
 @Data
 public class PageDataVO {
diff --git a/framework/src/main/java/cn/lili/modules/page/mapper/ArticleCategoryMapper.java b/framework/src/main/java/cn/lili/modules/page/mapper/ArticleCategoryMapper.java
index 933db36b..ed28617f 100644
--- a/framework/src/main/java/cn/lili/modules/page/mapper/ArticleCategoryMapper.java
+++ b/framework/src/main/java/cn/lili/modules/page/mapper/ArticleCategoryMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 文章分类数据处理层
  *
  * @author pikachu
- * @date 2020-05-5 15:10:16
+ * @since 2020-05-5 15:10:16
  */
 public interface ArticleCategoryMapper extends BaseMapper<ArticleCategory> {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/mapper/ArticleMapper.java b/framework/src/main/java/cn/lili/modules/page/mapper/ArticleMapper.java
index 8313b50c..f20cdaaf 100644
--- a/framework/src/main/java/cn/lili/modules/page/mapper/ArticleMapper.java
+++ b/framework/src/main/java/cn/lili/modules/page/mapper/ArticleMapper.java
@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Select;
  * 文章数据处理层
  *
  * @author pikachu
- * @date 2020-05-06 15:18:56
+ * @since 2020-05-06 15:18:56
  */
 public interface ArticleMapper extends BaseMapper<Article> {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/mapper/FeedbackMapper.java b/framework/src/main/java/cn/lili/modules/page/mapper/FeedbackMapper.java
index 4db2f07d..e0364725 100644
--- a/framework/src/main/java/cn/lili/modules/page/mapper/FeedbackMapper.java
+++ b/framework/src/main/java/cn/lili/modules/page/mapper/FeedbackMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 意见反馈处理层
  *
  * @author pikachu
- * @date 2020-05-06 15:18:56
+ * @since 2020-05-06 15:18:56
  */
 public interface FeedbackMapper extends BaseMapper<Feedback> {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/mapper/PageDataMapper.java b/framework/src/main/java/cn/lili/modules/page/mapper/PageDataMapper.java
index 1076cd88..e1c6956d 100644
--- a/framework/src/main/java/cn/lili/modules/page/mapper/PageDataMapper.java
+++ b/framework/src/main/java/cn/lili/modules/page/mapper/PageDataMapper.java
@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Select;
  * 楼层装修设置数据处理层
  *
  * @author paulGao
- * @date 2020/12/7 11:26
+ * @since 2020/12/7 11:26
  */
 public interface PageDataMapper extends BaseMapper<PageData> {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/mapper/SpecialMapper.java b/framework/src/main/java/cn/lili/modules/page/mapper/SpecialMapper.java
index ddbfc783..0da88e5b 100644
--- a/framework/src/main/java/cn/lili/modules/page/mapper/SpecialMapper.java
+++ b/framework/src/main/java/cn/lili/modules/page/mapper/SpecialMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 专题活动数据处理层
  *
  * @author Bulbasaur
- * @date 2020/12/7 11:26
+ * @since 2020/12/7 11:26
  */
 public interface SpecialMapper extends BaseMapper<Special> {
 }
diff --git a/framework/src/main/java/cn/lili/modules/page/service/ArticleCategoryService.java b/framework/src/main/java/cn/lili/modules/page/service/ArticleCategoryService.java
index 0c820c9f..323dab06 100644
--- a/framework/src/main/java/cn/lili/modules/page/service/ArticleCategoryService.java
+++ b/framework/src/main/java/cn/lili/modules/page/service/ArticleCategoryService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 文章分类业务层
  *
  * @author Bulbasaur
- * @date 2020/11/24 17:07
+ * @since 2020/11/24 17:07
  */
 public interface ArticleCategoryService extends IService<ArticleCategory> {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java b/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java
index 6fac59fe..a9bb5e12 100644
--- a/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java
+++ b/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 文章业务层
  *
  * @author pikachu
- * @date 2020/11/18 11:40 上午
+ * @since 2020/11/18 11:40 上午
  */
 @CacheConfig(cacheNames = "{article}")
 public interface ArticleService extends IService<Article> {
diff --git a/framework/src/main/java/cn/lili/modules/page/service/FeedbackService.java b/framework/src/main/java/cn/lili/modules/page/service/FeedbackService.java
index c2b2a51c..6f95c782 100644
--- a/framework/src/main/java/cn/lili/modules/page/service/FeedbackService.java
+++ b/framework/src/main/java/cn/lili/modules/page/service/FeedbackService.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 意见反馈业务层
  *
  * @author pikachu
- * @date 2020/11/18 11:40 上午
+ * @since 2020/11/18 11:40 上午
  */
 public interface FeedbackService extends IService<Feedback> {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/service/PageDataService.java b/framework/src/main/java/cn/lili/modules/page/service/PageDataService.java
index 1ddea4c7..09432b50 100644
--- a/framework/src/main/java/cn/lili/modules/page/service/PageDataService.java
+++ b/framework/src/main/java/cn/lili/modules/page/service/PageDataService.java
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 页面业务层
  *
  * @author Bulbasaur
- * @date 2020/12/10 17:23
+ * @since 2020/12/10 17:23
  */
 public interface PageDataService extends IService<PageData> {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/service/SpecialService.java b/framework/src/main/java/cn/lili/modules/page/service/SpecialService.java
index 76c8f424..30863ab6 100644
--- a/framework/src/main/java/cn/lili/modules/page/service/SpecialService.java
+++ b/framework/src/main/java/cn/lili/modules/page/service/SpecialService.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 专题活动业务层
  *
  * @author Bulbasaur
- * @date 2020/12/7 11:27
+ * @since 2020/12/7 11:27
  */
 public interface SpecialService extends IService<Special> {
 
diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java
index e4f13ce0..96cae40c 100644
--- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java
@@ -1,10 +1,9 @@
 package cn.lili.modules.page.serviceimpl;
 
-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.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.page.entity.dos.Article;
 import cn.lili.modules.page.entity.dos.ArticleCategory;
 import cn.lili.modules.page.entity.enums.ArticleCategoryEnum;
@@ -27,7 +26,7 @@ import java.util.List;
  * 文章分类业务层实现
  *
  * @author pikachu
- * @date 2020-05-5 15:10:16
+ * @since 2020-05-5 15:10:16
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -54,12 +53,6 @@ public class ArticleCategoryServiceImpl extends ServiceImpl<ArticleCategoryMappe
 
     @Override
     public ArticleCategory saveArticleCategory(ArticleCategory articleCategory) {
-        //不能添加重复的分类名称
-        List<ArticleCategory> list = this.list(
-                new LambdaQueryWrapper<ArticleCategory>().eq(ArticleCategory::getArticleCategoryName, articleCategory.getArticleCategoryName()));
-        if (StringUtils.isNotEmpty(list)) {
-            throw new ServiceException(ResultCode.ARTICLE_CATEGORY_NAME_EXIST);
-        }
         //非顶级分类
         if (articleCategory.getParentId() != null && !parentId.equals(articleCategory.getParentId())) {
             ArticleCategory parent = this.getById(articleCategory.getParentId());
diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java
index 3a9a3696..2650e6b7 100644
--- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java
@@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.modules.page.entity.dos.Article;
 import cn.lili.modules.page.entity.dto.ArticleSearchParams;
 import cn.lili.modules.page.entity.enums.ArticleEnum;
@@ -27,7 +27,7 @@ import java.util.List;
  * 文章业务层实现
  *
  * @author Chopper
- * @date 2020/11/18 11:40 上午
+ * @since 2020/11/18 11:40 上午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java
index 210c24c2..714cd671 100644
--- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java
@@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 意见反馈业务层实现
  *
  * @author Chopper
- * @date 2020/11/18 11:40 上午
+ * @since 2020/11/18 11:40 上午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
index ceb0c659..2595e44e 100644
--- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
@@ -3,7 +3,7 @@ package cn.lili.modules.page.serviceimpl;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.page.entity.dos.PageData;
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Service;
  * 楼层装修管理业务层实现
  *
  * @author Bulbasaur
- * @date 2020/12/11 9:15
+ * @since 2020/12/11 9:15
  */
 @Service
 public class PageDataServiceImpl extends ServiceImpl<PageDataMapper, PageData> implements PageDataService {
diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java
index 60c7fe2b..6e6b4fee 100644
--- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * 专题活动业务层实现
  *
  * @author Bulbasaur
- * @date 2020/12/7 11:27
+ * @since 2020/12/7 11:27
  */
 @Service
 public class SpecialServiceImpl extends ServiceImpl<SpecialMapper, Special> implements SpecialService {
diff --git a/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java b/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java
index 9023b991..6fc6c9a3 100644
--- a/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java
+++ b/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java
@@ -24,7 +24,7 @@ import java.util.Date;
  * 退款日志
  *
  * @author Chopper
- * @date 2021/1/28 09:21
+ * @since 2021/1/28 09:21
  */
 @Data
 @Entity
@@ -83,7 +83,7 @@ public class RefundLog {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java
index 742e4854..077bbb21 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java
@@ -31,7 +31,7 @@ import java.util.List;
  * 收银台工具
  *
  * @author Chopper
- * @date 2020-12-19 09:25
+ * @since 2020-12-19 09:25
  */
 @Component
 @Slf4j
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java b/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java
index 8057c401..1378ea10 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java
@@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletResponse;
  * 支付接口
  *
  * @author Chopper
- * @date 2020-12-21 09:32
+ * @since 2020-12-21 09:32
  */
 public interface Payment {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java
index c00f059c..f62641fd 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java
@@ -21,7 +21,7 @@ import java.util.Date;
  * 退款支持
  *
  * @author Chopper
- * @date 2020-12-19 09:25
+ * @since 2020-12-19 09:25
  */
 @Component
 @Slf4j
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/PaymentHttpResponse.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/PaymentHttpResponse.java
index 239303ef..d418940b 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/core/PaymentHttpResponse.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/PaymentHttpResponse.java
@@ -13,7 +13,7 @@ import java.util.Map;
  * 支付接口响应
  *
  * @author Chopper
- * @date 2020/12/18 15:13
+ * @since 2020/12/18 15:13
  */
 public class PaymentHttpResponse implements Serializable {
     private static final long serialVersionUID = 6089103955998013402L;
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/RequestMethodEnums.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/RequestMethodEnums.java
index f98591a1..95419cdb 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/RequestMethodEnums.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/RequestMethodEnums.java
@@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.core.enums;
  * HTTP 请求的方法
  *
  * @author Chopper
- * @date 2021-01-25 15:10
+ * @since 2021-01-25 15:10
  */
 public enum RequestMethodEnums {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/SignType.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/SignType.java
index d3994217..b7a605a8 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/SignType.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/SignType.java
@@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.core.enums;
  * 签名方式
  *
  * @author Chopper
- * @date 2021-01-25 15:10
+ * @since 2021-01-25 15:10
  */
 public enum SignType {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/http/AbstractHttpDelegate.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/http/AbstractHttpDelegate.java
index 4a4906ff..efad726b 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/core/http/AbstractHttpDelegate.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/http/AbstractHttpDelegate.java
@@ -20,7 +20,7 @@ import java.util.Map;
  * Http 代理类
  *
  * @author Chopper
- * @date 2021-01-25 15:10
+ * @since 2021-01-25 15:10
  */
 public abstract class AbstractHttpDelegate {
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java
index 12083e41..8dd5a458 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java
@@ -31,7 +31,6 @@ import java.util.*;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/12/18 15:24
  */
 @Slf4j
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/dto/PayParam.java b/framework/src/main/java/cn/lili/modules/payment/kit/dto/PayParam.java
index c743ca1d..a0b1f664 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/dto/PayParam.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/dto/PayParam.java
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
  * 支付参数
  *
  * @author Chopper
- * @date 2020/12/19 11:46
+ * @since 2020/12/19 11:46
  */
 @Data
 @ToString
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java b/framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java
index f5acc84f..d7b3fee8 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.enums;
  * 订单类型
  *
  * @author Chopper
- * @date 2020-12-19 11:50
+ * @since 2020-12-19 11:50
  */
 public enum CashierEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java b/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java
index 325cf6e0..98895c91 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.enums;
  * 支付方式枚举
  *
  * @author Chopper
- * @date 2020/12/18 18:08
+ * @since 2020/12/18 18:08
  */
 public enum PaymentClientEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java b/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java
index 28f32ebf..0089d149 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.enums;
  * 支付方式枚举
  *
  * @author Chopper
- * @date 2020/12/18 18:08
+ * @since 2020/12/18 18:08
  */
 public enum PaymentMethodEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java
index c756bf6d..c2ee4232 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java
@@ -9,7 +9,7 @@ import cn.lili.modules.payment.kit.params.dto.CashierParam;
  * 收银台接口
  *
  * @author Chopper
- * @date 2021-01-25 19:08
+ * @since 2021-01-25 19:08
  */
 public interface CashierExecute {
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/dto/CashierParam.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/dto/CashierParam.java
index d7e9b279..577cd13c 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/params/dto/CashierParam.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/dto/CashierParam.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 支付参数
  *
  * @author Chopper
- * @date 2021-01-25 19:09
+ * @since 2021-01-25 19:09
  */
 @Data
 @ToString
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java
index 5dfc9fe6..87160fdb 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java
@@ -27,7 +27,7 @@ import java.util.List;
  * 订单支付信息获取
  *
  * @author Chopper
- * @date 2021-01-25 20:00
+ * @since 2021-01-25 20:00
  */
 @Slf4j
 @Component
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java
index 8478758c..159cb2f8 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java
@@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
  * 充值信息获取
  *
  * @author Chopper
- * @date 2021-01-25 20:00
+ * @since 2021-01-25 20:00
  */
 @Slf4j
 @Component
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java
index 10b7eff9..cddabb05 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
  * 整笔交易信息获取
  *
  * @author Chopper
- * @date 2021-01-25 20:00
+ * @since 2021-01-25 20:00
  */
 @Slf4j
 @Component
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java
index 71a084cf..c63eeced 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java
@@ -22,7 +22,7 @@ import java.util.Map;
  * 支付宝支付
  *
  * @author Chopper
- * @date 2020/12/15 19:26
+ * @since 2020/12/15 19:26
  */
 
 public class AliPayApi {
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApiConfigKit.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApiConfigKit.java
index 4d16304b..2c21c767 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApiConfigKit.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApiConfigKit.java
@@ -19,7 +19,7 @@ import java.util.Date;
  * AliPayApiConfigKit
  *
  * @author Chopper
- * @date 2020-12-16 09:31
+ * @since 2020-12-16 09:31
  */
 public class AliPayApiConfigKit {
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java
index e89f141b..27238e03 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java
@@ -10,7 +10,7 @@ import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.config.properties.ApiProperties;
+import cn.lili.common.properties.ApiProperties;
 import cn.lili.modules.payment.entity.RefundLog;
 import cn.lili.modules.payment.kit.CashierSupport;
 import cn.lili.modules.payment.kit.Payment;
@@ -43,7 +43,7 @@ import java.util.Map;
  * 支付宝支付
  *
  * @author Chopper
- * @date 2020/12/17 09:55
+ * @since 2020/12/17 09:55
  */
 @Slf4j
 @Component
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java
index f721a281..8a6f9982 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java
@@ -23,7 +23,7 @@ import java.io.PrintWriter;
  * 支付宝支付
  *
  * @author Chopper
- * @date 2020/12/15 19:26
+ * @since 2020/12/15 19:26
  */
 @Slf4j
 public class AliPayRequest {
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatApi.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatApi.java
index cd6049aa..f7cff08b 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatApi.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatApi.java
@@ -19,7 +19,7 @@ import java.util.Map;
  * 微信支付相关接口
  *
  * @author Chopper
- * @date 2021/1/26 15:25
+ * @since 2021/1/26 15:25
  */
 
 public class WechatApi {
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
index ef603306..55426ed9 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
@@ -5,8 +5,8 @@ import cn.hutool.core.net.URLEncoder;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-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.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
@@ -15,7 +15,7 @@ import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.config.properties.ApiProperties;
+import cn.lili.common.properties.ApiProperties;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.enums.ConnectEnum;
@@ -59,7 +59,7 @@ import java.util.Objects;
  * 微信支付
  *
  * @author Chopper
- * @date 2020/12/21 17:44
+ * @since 2020/12/21 17:44
  */
 @Slf4j
 @Component
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatApi.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatApi.java
index 864d1476..03b7e839 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatApi.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatApi.java
@@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.plugin.wechat.enums;
  * 微信api列表
  *
  * @author Chopper
- * @date 2020/12/17 17:43
+ * @since 2020/12/17 17:43
  */
 public enum WechatApi {
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatDomain.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatDomain.java
index b9fc7866..fca89e9d 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatDomain.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatDomain.java
@@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.plugin.wechat.enums;
  * 微信支付域名
  *
  * @author Chopper
- * @date 2020/12/17 17:44
+ * @since 2020/12/17 17:44
  */
 public enum WechatDomain {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Amount.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Amount.java
index cc8e6d31..fe06d268 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Amount.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Amount.java
@@ -7,7 +7,7 @@ import lombok.experimental.Accessors;
  * 统一下单-订单金额
  *
  * @author Chopper
- * @date 2020/12/17 17:44
+ * @since 2020/12/17 17:44
  */
 @Data
 @Accessors(chain = true)
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Detail.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Detail.java
index b8a550a5..18b05b0f 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Detail.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Detail.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 统一下单-优惠功能
  *
  * @author Chopper
- * @date 2020/12/17 17:46
+ * @since 2020/12/17 17:46
  */
 @Data
 @Accessors(chain = true)
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/GoodsDetail.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/GoodsDetail.java
index 3225d939..b12e335d 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/GoodsDetail.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/GoodsDetail.java
@@ -7,7 +7,7 @@ import lombok.experimental.Accessors;
  * 统一下单-单品列表
  *
  * @author Chopper
- * @date 2020/12/17 17:47
+ * @since 2020/12/17 17:47
  */
 
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/H5Info.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/H5Info.java
index d63430d9..c6c8db37 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/H5Info.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/H5Info.java
@@ -7,7 +7,7 @@ import lombok.experimental.Accessors;
  * 统一下单-H5 场景信息
  *
  * @author Chopper
- * @date 2020/12/17 17:56
+ * @since 2020/12/17 17:56
  */
 
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Payer.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Payer.java
index f6e0cf7d..c6540b5f 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Payer.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Payer.java
@@ -7,7 +7,7 @@ import lombok.experimental.Accessors;
  * 统一下单-支付者
  *
  * @author Chopper
- * @date 2020/12/17 17:56
+ * @since 2020/12/17 17:56
  */
 
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/RefundModel.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/RefundModel.java
index f855e6bb..0e4cdf29 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/RefundModel.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/RefundModel.java
@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
  * 国内退款-退款申请
  *
  * @author Chopper
- * @date 2020/12/17 17:58
+ * @since 2020/12/17 17:58
  */
 @Data
 @Accessors(chain = true)
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SceneInfo.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SceneInfo.java
index 879511ba..4aaca6a6 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SceneInfo.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SceneInfo.java
@@ -7,7 +7,7 @@ import lombok.experimental.Accessors;
  * 统一下单-场景信息
  *
  * @author Chopper
- * @date 2020/12/17 17:57
+ * @since 2020/12/17 17:57
  */
 
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SettleInfo.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SettleInfo.java
index 9e11f8fc..5c83dcba 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SettleInfo.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SettleInfo.java
@@ -7,7 +7,7 @@ import lombok.experimental.Accessors;
  * 统一下单-结算信息
  *
  * @author Chopper
- * @date 2020/12/17 17:58
+ * @since 2020/12/17 17:58
  */
 @Data
 @Accessors(chain = true)
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/StoreInfo.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/StoreInfo.java
index a4aef092..f5a3789d 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/StoreInfo.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/StoreInfo.java
@@ -7,7 +7,7 @@ import lombok.experimental.Accessors;
  * 统一下单-商户门店信息
  *
  * @author Chopper
- * @date 2020/12/17 17:58
+ * @since 2020/12/17 17:58
  */
 
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/UnifiedOrderModel.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/UnifiedOrderModel.java
index 91adc5be..25d5a3ca 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/UnifiedOrderModel.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/UnifiedOrderModel.java
@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
  * 统一下单-商户门店信息
  *
  * @author Chopper
- * @date 2020/12/17 17:58
+ * @since 2020/12/17 17:58
  */
 
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/payment/mapper/RefundLogMapper.java b/framework/src/main/java/cn/lili/modules/payment/mapper/RefundLogMapper.java
index 73a4ade7..da84b7fd 100644
--- a/framework/src/main/java/cn/lili/modules/payment/mapper/RefundLogMapper.java
+++ b/framework/src/main/java/cn/lili/modules/payment/mapper/RefundLogMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 退款日志数据层
  * @author Chopper
- * @date 2020-12-19 09:25
+ * @since 2020-12-19 09:25
  */
 public interface RefundLogMapper extends BaseMapper<RefundLog> {
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/service/PaymentService.java b/framework/src/main/java/cn/lili/modules/payment/service/PaymentService.java
index f78efc8d..5ecef2a1 100644
--- a/framework/src/main/java/cn/lili/modules/payment/service/PaymentService.java
+++ b/framework/src/main/java/cn/lili/modules/payment/service/PaymentService.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  * 支付日志 业务层
  *
  * @author Chopper
- * @date 2020-12-19 09:25
+ * @since 2020-12-19 09:25
  */
 public interface PaymentService {
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/service/RefundLogService.java b/framework/src/main/java/cn/lili/modules/payment/service/RefundLogService.java
index 6b01ea1c..f4d56b64 100644
--- a/framework/src/main/java/cn/lili/modules/payment/service/RefundLogService.java
+++ b/framework/src/main/java/cn/lili/modules/payment/service/RefundLogService.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 退款日志 业务层
  *
  * @author Chopper
- * @date 2020-12-19 09:25
+ * @since 2020-12-19 09:25
  */
 public interface RefundLogService extends IService<RefundLog> {
 }
diff --git a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java
index 323555bf..97d8a242 100644
--- a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java
@@ -21,7 +21,7 @@ import java.util.List;
  * 支付日志 业务实现
  *
  * @author Chopper
- * @date 2020-12-19 09:25
+ * @since 2020-12-19 09:25
  */
 @Slf4j
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java
index 601374ac..8a5e7d8c 100644
--- a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java
@@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 退款日志 业务实现
  *
  * @author Chopper
- * @date 2020-12-19 09:25
+ * @since 2020-12-19 09:25
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/permission/SettingKeys.java b/framework/src/main/java/cn/lili/modules/permission/SettingKeys.java
index 5065f4c0..8aa026bb 100644
--- a/framework/src/main/java/cn/lili/modules/permission/SettingKeys.java
+++ b/framework/src/main/java/cn/lili/modules/permission/SettingKeys.java
@@ -4,7 +4,7 @@ package cn.lili.modules.permission;
  * 系统秘钥
  *
  * @author paulG
- * @date 2020/11/17 4:23 下午
+ * @since 2020/11/17 4:23 下午
  */
 public enum SettingKeys {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java
index 52993199..83c4885a 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java
@@ -1,11 +1,10 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -15,7 +14,7 @@ import javax.persistence.Table;
  * 管理员类
  *
  * @author Chopper
- * @date 2020/11/19 11:42
+ * @since 2020/11/19 11:42
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java
index 090c633f..b490b05a 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  * 部门
  *
  * @author Chopper
- * @date 2020/11/19 11:57
+ * @since 2020/11/19 11:57
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java
index 892747ab..cae23129 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +15,7 @@ import javax.persistence.Table;
  * 角色部门绑定关系
  *
  * @author Chopper
- * @date 2020/11/19 12:18
+ * @since 2020/11/19 12:18
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java
index 8d34b045..3ba16eb2 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  * 菜单权限
  *
  * @author Chopper
- * @date 2020/11/19 12:12
+ * @since 2020/11/19 12:12
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java
index 72e33f86..9beb00a4 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.persistence.Table;
  * 角色
  *
  * @author Chopper
- * @date 2020/11/19 11:57
+ * @since 2020/11/19 11:57
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java
index 46177b63..4b777c4c 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +13,7 @@ import javax.persistence.Table;
  * 角色权限绑定关系
  *
  * @author Chopper
- * @date 2020/11/19 12:18
+ * @since 2020/11/19 12:18
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java
index 7ce23182..9bd4585a 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dos;
 
-import cn.lili.base.IdEntity;
+import cn.lili.mybatis.IdEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +13,7 @@ import javax.persistence.Table;
  * 用户角色
  *
  * @author Chopper
- * @date 2020/11/19 12:18
+ * @since 2020/11/19 12:18
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java b/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java
index d6cf6247..dcb6698b 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.permission.entity.dto;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,7 +12,7 @@ import javax.validation.constraints.NotEmpty;
  * 管理员入库dto
  *
  * @author Chopper
- * @date 2020/11/16 19:55
+ * @since 2020/11/16 19:55
  */
 @Data
 @ApiModel(value = "管理员入库dto")
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dto/MenuSearchParams.java b/framework/src/main/java/cn/lili/modules/permission/entity/dto/MenuSearchParams.java
index a822758a..e4fb54ae 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/dto/MenuSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/dto/MenuSearchParams.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 权限搜索参数
  *
  * @author Chopper
- * @date 2020-11-19 16:46
+ * @since 2020-11-19 16:46
  */
 @Data
 public class MenuSearchParams {
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/AdminUserVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/AdminUserVO.java
index 72750041..d7bd826b 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/AdminUserVO.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/AdminUserVO.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 管理员VO
  *
  * @author Chopper
- * @date 2020-11-22 09:17
+ * @since 2020-11-22 09:17
  */
 @Data
 public class AdminUserVO extends AdminUser {
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/DepartmentVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/DepartmentVO.java
index b5c291c9..5e273cb2 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/DepartmentVO.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/DepartmentVO.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 部门VO
  *
  * @author Chopper
- * @date 2020-11-23 18:48
+ * @since 2020-11-23 18:48
  */
 @Data
 public class DepartmentVO extends Department {
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/MenuVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/MenuVO.java
index 3aba6f18..5543c09b 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/MenuVO.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/MenuVO.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 菜单VO 展示模型
  *
  * @author Chopper
- * @date 2020/11/20 15:38
+ * @since 2020/11/20 15:38
  */
 
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/RoleVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/RoleVO.java
index a9eb9ded..d86352b5 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/RoleVO.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/RoleVO.java
@@ -11,7 +11,7 @@ import java.util.List;
  * RoleVO
  *
  * @author Chopper
- * @date 2020-11-22 17:42
+ * @since 2020-11-22 17:42
  */
 @Data
 public class RoleVO extends Role {
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java
index 8fea6475..eb1651ab 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java
@@ -14,7 +14,7 @@ import java.util.Map;
  * 日志
  *
  * @author Chopper
- * @date 2020/12/2 17:50
+ * @since 2020/12/2 17:50
  */
 @Data
 public class SystemLogVO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java
index 671495a0..5313fa72 100644
--- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java
+++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * RoleMenuVO
  *
  * @author Chopper
- * @date 2020-11-24 11:45
+ * @since 2020-11-24 11:45
  */
 @Data
 public class UserMenuVO extends Menu {
diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/AdminUserMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/AdminUserMapper.java
index 75ff89ae..d3ff44eb 100644
--- a/framework/src/main/java/cn/lili/modules/permission/mapper/AdminUserMapper.java
+++ b/framework/src/main/java/cn/lili/modules/permission/mapper/AdminUserMapper.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 用户数据处理层
  *
  * @author Chopper
- * @date 2020-11-22 09:17
+ * @since 2020-11-22 09:17
  */
 public interface AdminUserMapper extends BaseMapper<AdminUser> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentMapper.java
index e6e7c6d3..3881824d 100644
--- a/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentMapper.java
+++ b/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 部门数据处理层
  *
  * @author Chopper
- * @date 2020-11-22 09:17
+ * @since 2020-11-22 09:17
  */
 public interface DepartmentMapper extends BaseMapper<Department> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentRoleMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentRoleMapper.java
index ca1220fb..5d0c97fc 100644
--- a/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentRoleMapper.java
+++ b/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentRoleMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 部门角色数据处理层
  *
  * @author Chopper
- * @date 2020-11-22 09:17
+ * @since 2020-11-22 09:17
  */
 public interface DepartmentRoleMapper extends BaseMapper<DepartmentRole> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/MenuMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/MenuMapper.java
index b3515ce3..e5e24aaf 100644
--- a/framework/src/main/java/cn/lili/modules/permission/mapper/MenuMapper.java
+++ b/framework/src/main/java/cn/lili/modules/permission/mapper/MenuMapper.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 菜单数据处理层
  *
  * @author Chopper
- * @date 2020-11-22 09:17
+ * @since 2020-11-22 09:17
  */
 public interface MenuMapper extends BaseMapper<Menu> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleDepartmentMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleDepartmentMapper.java
index 12c82357..3cfd4eb4 100644
--- a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleDepartmentMapper.java
+++ b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleDepartmentMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 角色部门数据处理层
  *
  * @author Chopper
- * @date 2020-11-22 09:17
+ * @since 2020-11-22 09:17
  */
 public interface RoleDepartmentMapper extends BaseMapper<DepartmentRole> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMapper.java
index 6fc2af6b..5d16cffc 100644
--- a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMapper.java
+++ b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 角色数据处理层
  *
  * @author Chopper
- * @date 2020-11-22 09:17
+ * @since 2020-11-22 09:17
  */
 public interface RoleMapper extends BaseMapper<Role> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMenuMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMenuMapper.java
index 3e64bec2..d08e6579 100644
--- a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMenuMapper.java
+++ b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMenuMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 角色菜单数据处理层
  *
  * @author Chopper
- * @date 2020-11-22 09:17
+ * @since 2020-11-22 09:17
  */
 public interface RoleMenuMapper extends BaseMapper<RoleMenu> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/RolePermissionMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/RolePermissionMapper.java
index 978d2681..af075a9c 100644
--- a/framework/src/main/java/cn/lili/modules/permission/mapper/RolePermissionMapper.java
+++ b/framework/src/main/java/cn/lili/modules/permission/mapper/RolePermissionMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 角色权限数据处理层
  *
  * @author Chopper
- * @date 2020-11-22 09:17
+ * @since 2020-11-22 09:17
  */
 public interface RolePermissionMapper extends BaseMapper<RoleMenu> {
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/UserRoleMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/UserRoleMapper.java
index 57fe3be8..f513905a 100644
--- a/framework/src/main/java/cn/lili/modules/permission/mapper/UserRoleMapper.java
+++ b/framework/src/main/java/cn/lili/modules/permission/mapper/UserRoleMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 角色权限数据处理层
  * @author Chopper
- * @date 2020-11-22 09:17
+ * @since 2020-11-22 09:17
  */
 public interface UserRoleMapper extends BaseMapper<UserRole> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java b/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java
index 4423c85e..7257ca22 100644
--- a/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java
+++ b/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.permission.service;
 
 
-import cn.lili.common.token.Token;
+import cn.lili.common.security.token.Token;
 import cn.lili.modules.permission.entity.dos.AdminUser;
 import cn.lili.modules.permission.entity.dto.AdminUserDTO;
 import cn.lili.modules.permission.entity.vo.AdminUserVO;
@@ -17,7 +17,7 @@ import java.util.List;
  * 用户业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:42 下午
+ * @since 2020/11/17 3:42 下午
  */
 @CacheConfig(cacheNames = "{adminuser}")
 public interface AdminUserService extends IService<AdminUser> {
diff --git a/framework/src/main/java/cn/lili/modules/permission/service/DepartmentRoleService.java b/framework/src/main/java/cn/lili/modules/permission/service/DepartmentRoleService.java
index ee9e1b03..bd95b17c 100644
--- a/framework/src/main/java/cn/lili/modules/permission/service/DepartmentRoleService.java
+++ b/framework/src/main/java/cn/lili/modules/permission/service/DepartmentRoleService.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 部门角色业务层
  *
  * @author Chopper
- * @date 2020/11/22 12:08
+ * @since 2020/11/22 12:08
  */
 public interface DepartmentRoleService extends IService<DepartmentRole> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/service/DepartmentService.java b/framework/src/main/java/cn/lili/modules/permission/service/DepartmentService.java
index b13c7126..38ff2e3a 100644
--- a/framework/src/main/java/cn/lili/modules/permission/service/DepartmentService.java
+++ b/framework/src/main/java/cn/lili/modules/permission/service/DepartmentService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 部门业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:43 下午
+ * @since 2020/11/17 3:43 下午
  */
 public interface DepartmentService extends IService<Department> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/service/MenuService.java b/framework/src/main/java/cn/lili/modules/permission/service/MenuService.java
index da5280f1..ede5b5d0 100644
--- a/framework/src/main/java/cn/lili/modules/permission/service/MenuService.java
+++ b/framework/src/main/java/cn/lili/modules/permission/service/MenuService.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 权限业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:45 下午
+ * @since 2020/11/17 3:45 下午
  */
 @CacheConfig(cacheNames = "{menu}")
 public interface MenuService extends IService<Menu> {
diff --git a/framework/src/main/java/cn/lili/modules/permission/service/RoleMenuService.java b/framework/src/main/java/cn/lili/modules/permission/service/RoleMenuService.java
index 681124b7..f2261c03 100644
--- a/framework/src/main/java/cn/lili/modules/permission/service/RoleMenuService.java
+++ b/framework/src/main/java/cn/lili/modules/permission/service/RoleMenuService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 角色菜单接口
  *
  * @author Chopper
- * @date 2020/11/22 11:43
+ * @since 2020/11/22 11:43
  */
 public interface RoleMenuService extends IService<RoleMenu> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/service/RoleService.java b/framework/src/main/java/cn/lili/modules/permission/service/RoleService.java
index ba8f0e69..e1334208 100644
--- a/framework/src/main/java/cn/lili/modules/permission/service/RoleService.java
+++ b/framework/src/main/java/cn/lili/modules/permission/service/RoleService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 角色业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:45 下午
+ * @since 2020/11/17 3:45 下午
  */
 public interface RoleService extends IService<Role> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java b/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java
index cb768ab8..923991b2 100644
--- a/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java
+++ b/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 系统日志业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:45 下午
+ * @since 2020/11/17 3:45 下午
  */
 public interface SystemLogService {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/service/UserRoleService.java b/framework/src/main/java/cn/lili/modules/permission/service/UserRoleService.java
index e63196c9..0cb37699 100644
--- a/framework/src/main/java/cn/lili/modules/permission/service/UserRoleService.java
+++ b/framework/src/main/java/cn/lili/modules/permission/service/UserRoleService.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 管理员业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:46 下午
+ * @since 2020/11/17 3:46 下午
  */
 public interface UserRoleService extends IService<UserRole> {
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
index 5deb5d46..b4b56844 100644
--- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
@@ -1,12 +1,12 @@
 package cn.lili.modules.permission.serviceimpl;
 
-import cn.lili.common.aop.syslog.annotation.SystemLogPoint;
+import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.token.Token;
-import cn.lili.common.token.base.generate.ManagerTokenGenerate;
+import cn.lili.common.security.token.Token;
+import cn.lili.modules.system.token.ManagerTokenGenerate;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.permission.entity.dos.AdminUser;
@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
  * 用户业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:46 下午
+ * @since 2020/11/17 3:46 下午
  */
 @Slf4j
 @Service
@@ -56,7 +56,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
     /**
      * 角色长度
      */
-    private int rolesMaxSize =10;
+    private int rolesMaxSize = 10;
 
     @Override
     public IPage<AdminUserVO> adminUserPage(Page initPage, QueryWrapper<AdminUser> initWrapper) {
@@ -120,7 +120,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
         try {
             return managerTokenGenerate.createToken(username, false);
         } catch (Exception e) {
-            log.error("管理员登录错误",e);
+            log.error("管理员登录错误", e);
         }
         return null;
 
@@ -231,7 +231,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
      * @param roles  角色id集合
      */
     private void updateRole(String userId, List<String> roles) {
-        if (!StringUtils.isNotEmpty(roles)) {
+        if (roles.isEmpty() || roles == null) {
             return;
         }
         List<UserRole> userRoles = new ArrayList<>(roles.size());
diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java
index 255e0eaa..3040aaea 100644
--- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java
@@ -14,7 +14,7 @@ import java.util.List;
  * 部门角色业务层实现
  *
  * @author Chopper
- * @date 2020/11/22 12:08
+ * @since 2020/11/22 12:08
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java
index cacfa4b0..c9d6e578 100644
--- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java
@@ -23,7 +23,7 @@ import java.util.List;
  * 部门业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:47 下午
+ * @since 2020/11/17 3:47 下午
  */
 @Slf4j
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java
index 5a5d9ba4..d283b287 100644
--- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java
@@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 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.utils.StringUtils;
 import cn.lili.common.vo.SearchVO;
 import cn.lili.modules.permission.entity.dos.Menu;
@@ -28,7 +28,7 @@ import java.util.List;
  * 权限业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:49 下午
+ * @since 2020/11/17 3:49 下午
  */
 @Slf4j
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java
index 9b991eec..b5d0acaa 100644
--- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java
@@ -18,7 +18,7 @@ import java.util.List;
  * 角色菜单业务层实现
  *
  * @author Chopper
- * @date 2020/11/22 11:43
+ * @since 2020/11/22 11:43
  */
 @Slf4j
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java
index 4362f73c..09b4da2d 100644
--- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java
@@ -19,7 +19,7 @@ import java.util.List;
  * 角色业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:50 下午
+ * @since 2020/11/17 3:50 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java
index e5459685..0f785fba 100644
--- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
  * 系统日志
  *
  * @author Chopper
- * @date 2020/11/17 3:45 下午
+ * @since 2020/11/17 3:45 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java
index 923835eb..77912879 100644
--- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java
@@ -17,7 +17,7 @@ import java.util.List;
  * 用户权限业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:52 下午
+ * @since 2020/11/17 3:52 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java
index 1188a79a..20961071 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java
@@ -14,7 +14,7 @@ import javax.persistence.Table;
  * 优惠券活动实体类
  *
  * @author Chopper
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java
index a91fff96..7288d969 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull;
  * 优惠券活动实体类
  *
  * @author Bulbasaur
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java
index 0bb06e67..26bb8441 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.promotion.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +13,7 @@ import javax.persistence.Table;
  * 优惠券活动实体类
  *
  * @author Bulbasaur
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java
index d78c7a7c..46ec9d95 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull;
  * 满优惠活动实体类
  *
  * @author Chopper
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java
index f293fa6e..9c8ab06d 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.promotion.entity.dos;
 
-import cn.lili.base.BaseEntity;
 import cn.lili.modules.promotion.entity.enums.KanJiaStatusEnum;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java
index 1fca0ad1..1b0e5157 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.promotion.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java
index de6f5eb0..16b64312 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java
@@ -3,7 +3,7 @@ package cn.lili.modules.promotion.entity.dos;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.promotion.entity.enums.CouponRangeDayEnum;
 import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,7 +21,7 @@ import java.util.Date;
  * 会员优惠券实体类
  *
  * @author Chopper
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java
index 03661bf5..94be0b0b 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java
@@ -14,7 +14,7 @@ import javax.validation.constraints.Min;
  * 拼团活动实体类
  *
  * @author Chopper
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java
index 4fec53f1..b302ca6a 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java
@@ -15,7 +15,7 @@ import javax.persistence.Table;
  * 积分商品实体类
  *
  * @author paulG
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  **/
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java
index d3693cb5..80016d0f 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java
@@ -1,12 +1,11 @@
 package cn.lili.modules.promotion.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
@@ -18,7 +17,7 @@ import java.math.BigDecimal;
  * 积分商品分类
  *
  * @author paulG
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  **/
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java
index ad85dcde..e6691aa8 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java
@@ -1,7 +1,8 @@
 package cn.lili.modules.promotion.entity.dos;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.lili.base.BaseEntity;
+import cn.lili.common.enums.PromotionTypeEnum;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -19,7 +20,7 @@ import java.util.Date;
  * 促销活动商品实体类
  *
  * @author Chopper
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  */
 @Data
 @Entity
@@ -58,7 +59,7 @@ public class PromotionGoods extends BaseEntity {
     private String promotionId;
 
     /**
-     * @see cn.lili.modules.promotion.entity.enums.PromotionTypeEnum
+     * @see PromotionTypeEnum
      */
     @ApiModelProperty(value = "促销工具类型")
     private String promotionType;
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java
index 2f00487e..942d43f1 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java
@@ -21,7 +21,7 @@ import java.util.Date;
  * 秒杀活动实体类
  *
  * @author Chopper
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java
index 754e0c4c..adc10e95 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.promotion.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull;
  * 秒杀活动申请实体类
  *
  * @author Chopper
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java
index 42351d0e..255b340b 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.promotion.entity.dto;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +16,7 @@ import java.util.Date;
  * 促销活动基础类
  *
  * @author Chopper
- * @date 2020-03-19 10:44 上午
+ * @since 2020-03-19 10:44 上午
  */
 @Data
 @MappedSuperclass
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java
index 2fb53534..91505f31 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 优惠券活动DTO
  *
  * @author Bulbasaur
- * @date: 2021/5/21 7:16 下午
+ * @since: 2021/5/21 7:16 下午
  */
 @Data
 public class CouponActivityDTO extends CouponActivity {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java
index ffe0a971..716d9c3c 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.promotion.entity.dto;
 
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +15,7 @@ import java.util.List;
  * 促销活动商品价格数据传输对象
  *
  * @author paulG
- * @date 2020/8/20
+ * @since 2020/8/20
  **/
 @Data
 @NoArgsConstructor
@@ -77,7 +78,7 @@ public class GoodsSkuPromotionPriceDTO implements Serializable {
     private String promotionId;
 
     /**
-     * @see cn.lili.modules.promotion.entity.enums.PromotionTypeEnum
+     * @see PromotionTypeEnum
      */
     @ApiModelProperty(value = "促销活动类型")
     private String promotionType;
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionGoodsDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionGoodsDTO.java
index de5ce85b..63e034fb 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionGoodsDTO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionGoodsDTO.java
@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
  * 促销商品数据传输对象
  *
  * @author paulG
- * @date 2020/10/9
+ * @since 2020/10/9
  **/
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceDTO.java
index afb64321..e8d07f08 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceDTO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceDTO.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 促销价格数据传输对象
  *
  * @author paulG
- * @date 2020/11/17
+ * @since 2020/11/17
  **/
 @Data
 public class PromotionPriceDTO {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceParamDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceParamDTO.java
index 2d4c3f00..afb69a6c 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceParamDTO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceParamDTO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 促销价格参数数据传输对象
  *
  * @author paulG
- * @date 2020/11/17
+ * @since 2020/11/17
  **/
 @Data
 public class PromotionPriceParamDTO {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/StorePromotionPriceDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/StorePromotionPriceDTO.java
index fc002ca8..dfc952ab 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/StorePromotionPriceDTO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/StorePromotionPriceDTO.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 店铺促销计算数据传输对象
  *
  * @author paulG
- * @date 2020/11/17
+ * @since 2020/11/17
  **/
 @Data
 public class StorePromotionPriceDTO {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivitySendTypeEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivitySendTypeEnum.java
index cc6148bc..5e2ea398 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivitySendTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivitySendTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums;
  * 优惠券活动发送类型枚举
  *
  * @author Bulbasaur
- * @date: 2021/5/20 5:47 下午
+ * @since: 2021/5/20 5:47 下午
  */
 public enum CouponActivitySendTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivityTypeEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivityTypeEnum.java
index c127d9f9..fb380a22 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivityTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivityTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums;
  * 优惠券活动类型枚举
  *
  * @author Bulbasaur
- * @date: 2021/5/20 5:47 下午
+ * @since: 2021/5/20 5:47 下午
  */
 public enum CouponActivityTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponGetEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponGetEnum.java
index 9b71ee7c..7396307c 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponGetEnum.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponGetEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums;
  * 优惠券获取方式枚举
  *
  * @author Chopper
- * @date 2020-03-19 9:36 上午
+ * @since 2020-03-19 9:36 上午
  */
 public enum CouponGetEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponRangeDayEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponRangeDayEnum.java
index d67aa29d..2c89a3bd 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponRangeDayEnum.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponRangeDayEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums;
  * 优惠券时间范围枚举
  *
  * @author Bulbasaur
- * @date: 2021/5/24 8:31 上午
+ * @since: 2021/5/24 8:31 上午
  */
 public enum CouponRangeDayEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponScopeTypeEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponScopeTypeEnum.java
index d099ef29..1e0f8fc2 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponScopeTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponScopeTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums;
  * 优惠券适用范围类型枚举
  *
  * @author Chopper
- * @date 2020-03-19 9:36 上午
+ * @since 2020-03-19 9:36 上午
  */
 public enum CouponScopeTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponTypeEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponTypeEnum.java
index b7005f3a..2ff19206 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponTypeEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums;
  * 优惠券折扣类型
  *
  * @author Chopper
- * @date 2020-03-19 9:36 上午
+ * @since 2020-03-19 9:36 上午
  */
 public enum CouponTypeEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/MemberCouponStatusEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/MemberCouponStatusEnum.java
index 8b98856c..e2513c93 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/MemberCouponStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/MemberCouponStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums;
  * 会员优惠券状态枚举
  *
  * @author Chopper
- * @date 2020-03-19 9:36 上午
+ * @since 2020-03-19 9:36 上午
  */
 public enum MemberCouponStatusEnum {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionApplyStatusEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionApplyStatusEnum.java
index cab25f91..16f1b2fe 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionApplyStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionApplyStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums;
  * 促销活动申请状态枚举
  *
  * @author Chopper
- * @date 2020-03-19 9:36 上午
+ * @since 2020-03-19 9:36 上午
  */
 public enum PromotionApplyStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionStatusEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionStatusEnum.java
index bc9e13ff..69423f7d 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums;
  * 促销状态枚举
  *
  * @author Chopper
- * @date 2020-03-19 3:53 下午
+ * @since 2020-03-19 3:53 下午
  */
 public enum PromotionStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/SeckillApplyStatusEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/SeckillApplyStatusEnum.java
index 0479580e..7621fdb2 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/SeckillApplyStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/SeckillApplyStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums;
  * 秒杀活动状态枚举
  *
  * @author paulG
- * @date 2020/8/26
+ * @since 2020/8/26
  **/
 public enum SeckillApplyStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java
index da003d29..5fd5b8ea 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 优惠券活动的优惠券VO
  *
  * @author Bulbasaur
- * @date: 2021/6/18 11:00 上午
+ * @since: 2021/6/18 11:00 上午
  */
 @Data
 public class CouponActivityItemVO extends CouponActivityItem {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java
index 0a8a9d26..1d8ed0d9 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 优惠券活动VO
  *
  * @author Bulbasaur
- * @date: 2021/5/21 7:01 下午
+ * @since: 2021/5/21 7:01 下午
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponSearchParams.java
index 7cfe4f03..b177d40c 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponSearchParams.java
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
  * 优惠券查询通用类
  *
  * @author paulG
- * @date 2020/8/14
+ * @since 2020/8/14
  **/
 @Data
 public class CouponSearchParams implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java
index c27e2a52..2a69f0e2 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 优惠券视图对象
  *
  * @author Chopper
- * @date 2020/8/14
+ * @since 2020/8/14
  */
 @Data
 @ApiModel(value = "优惠券")
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/FullDiscountSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/FullDiscountSearchParams.java
index f4709418..b2e35ab1 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/FullDiscountSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/FullDiscountSearchParams.java
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
  * 满优惠查询通用类
  *
  * @author paulG
- * @date 2020/8/21
+ * @since 2020/8/21
  **/
 @Data
 public class FullDiscountSearchParams implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java
index 94baea1e..7b1ce33f 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java
@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
  * 拼图会员视图对象
  *
  * @author paulG
- * @date 2021/3/3
+ * @since 2021/3/3
  **/
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java
index 34a64425..79da0d01 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
  * 拼团查询通用类
  *
  * @author paulG
- * @date 2020/10/9
+ * @since 2020/10/9
  **/
 @Data
 public class PintuanSearchParams {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanShareVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanShareVO.java
index fa9a2ba0..20909287 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanShareVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanShareVO.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 拼图会员分享对象
  *
  * @author paulG
- * @date 2021/3/24
+ * @since 2021/3/24
  **/
 @Data
 public class PintuanShareVO {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanVO.java
index 3b134d0e..3467aef5 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanVO.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 拼团视图对象
  *
  * @author paulG
- * @date 2020/10/28
+ * @since 2020/10/28
  **/
 @Data
 public class PintuanVO extends Pintuan {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsCategoryVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsCategoryVO.java
index 919dd989..568be735 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsCategoryVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsCategoryVO.java
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
  * 积分商品分类视图对象
  *
  * @author paulG
- * @date 2021/1/15
+ * @since 2021/1/15
  **/
 @Data
 public class PointsGoodsCategoryVO extends PointsGoodsCategory {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java
index af2b717c..ec03d05e 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java
@@ -15,7 +15,7 @@ import java.util.regex.Pattern;
  * 积分商品查询通用类
  *
  * @author paulG
- * @date 2021/1/13
+ * @since 2021/1/13
  **/
 @Data
 public class PointsGoodsSearchParams {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsVO.java
index e649ffa6..68c71df8 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsVO.java
@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
  * 积分商品视图对象
  *
  * @author paulG
- * @date 2021/1/13
+ * @since 2021/1/13
  **/
 @EqualsAndHashCode(callSuper = true)
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionGoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionGoodsSearchParams.java
index 12951732..8e1a9365 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionGoodsSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionGoodsSearchParams.java
@@ -12,7 +12,7 @@ import java.util.Date;
  * 促销商品查询通用类
  *
  * @author paulG
- * @date 2021/2/21
+ * @since 2021/2/21
  **/
 @Data
 public class PromotionGoodsSearchParams {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillApplyVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillApplyVO.java
index ca07f14b..f51b3c75 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillApplyVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillApplyVO.java
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
  * 秒杀活动申请视图对象
  *
  * @author paulG
- * @date 2020/8/21
+ * @since 2020/8/21
  **/
 @Data
 public class SeckillApplyVO extends SeckillApply {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillGoodsVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillGoodsVO.java
index 011c9e04..01b1ffba 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillGoodsVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillGoodsVO.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
  * 秒杀活动商品视图对象
  *
  * @author paulG
- * @date 2020/8/26
+ * @since 2020/8/26
  **/
 @Data
 public class SeckillGoodsVO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillSearchParams.java
index 063921b7..1725a2bd 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillSearchParams.java
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
  * 秒杀活动查询通用类
  *
  * @author paulG
- * @date 2020/8/21
+ * @since 2020/8/21
  **/
 @Data
 public class SeckillSearchParams implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillTimelineVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillTimelineVO.java
index b03e9fd6..3fa276d3 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillTimelineVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillTimelineVO.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 秒杀活动时刻视图对象
  *
  * @author paulG
- * @date 2020/8/27
+ * @since 2020/8/27
  **/
 @Data
 public class SeckillTimelineVO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillVO.java
index 10c1246d..336c541f 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillVO.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 秒杀活动视图对象
  *
  * @author paulG
- * @date 2020/8/20
+ * @since 2020/8/20
  **/
 @Data
 public class SeckillVO extends Seckill {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java
index 168d97a4..ea344a97 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 优惠券活动
  *
  * @author Bulbasaur
- * @date: 2021/5/20 6:11 下午
+ * @since: 2021/5/20 6:11 下午
  */
 public interface CouponActivityItemMapper extends BaseMapper<CouponActivityItem> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityMapper.java
index 256e78e4..3deeccac 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 优惠券活动
  * @author Bulbasaur
- * @date: 2021/5/20 6:11 下午
+ * @since: 2021/5/20 6:11 下午
  *
  */
 public interface CouponActivityMapper extends BaseMapper<CouponActivity> {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponMapper.java
index a3307375..553979eb 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 优惠券数据处理层
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 public interface CouponMapper extends BaseMapper<Coupon> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/FullDiscountMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/FullDiscountMapper.java
index d74297c3..4a42e5b8 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/FullDiscountMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/FullDiscountMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 满优惠数据处理层
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 public interface FullDiscountMapper extends BaseMapper<FullDiscount> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java
index 27d2cc4b..6336ae09 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 会员优惠券数据处理层
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 public interface MemberCouponMapper extends BaseMapper<MemberCoupon> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/PintuanMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/PintuanMapper.java
index b6345bc4..1e078347 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/PintuanMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/PintuanMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 拼团数据处理层
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 public interface PintuanMapper extends BaseMapper<Pintuan> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsCategoryMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsCategoryMapper.java
index c706e299..f73122dc 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsCategoryMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsCategoryMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 积分商品分类数据处理层
  *
  * @author paulG
- * @date 2020/8/21
+ * @since 2020/8/21
  **/
 public interface PointsGoodsCategoryMapper extends BaseMapper<PointsGoodsCategory> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java
index 1566a47c..d0139293 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select;
  * 积分商品数据处理层
  *
  * @author paulG
- * @date 2020/8/21
+ * @since 2020/8/21
  **/
 public interface PointsGoodsMapper extends BaseMapper<PointsGoods> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/PromotionGoodsMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/PromotionGoodsMapper.java
index c6ac77eb..fc675f91 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/PromotionGoodsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/PromotionGoodsMapper.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * 促销商品数据处理层
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 public interface PromotionGoodsMapper extends BaseMapper<PromotionGoods> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillApplyMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillApplyMapper.java
index f3d0fa47..9fffad06 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillApplyMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillApplyMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 秒杀活动申请数据处理层
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 public interface SeckillApplyMapper extends BaseMapper<SeckillApply> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillMapper.java
index 5eeb4f2c..95cdeb0a 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillMapper.java
@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Update;
  * 秒杀活动数据处理层
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 public interface SeckillMapper extends BaseMapper<Seckill> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java
index f85206dc..f790771b 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 优惠券活动-优惠券业务层
  *
  * @author Bulbasaur
- * @date: 2021/5/20 6:10 下午
+ * @since: 2021/5/20 6:10 下午
  */
 public interface CouponActivityItemService extends IService<CouponActivityItem> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityService.java b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityService.java
index b51f3ef0..bdb23f8c 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityService.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 优惠券活动业务层
  *
  * @author Bulbasaur
- * @date: 2021/5/20 6:10 下午
+ * @since: 2021/5/20 6:10 下午
  */
 public interface CouponActivityService extends IService<CouponActivity> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java b/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java
index 02b3d4b1..3b4a526d 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java
@@ -14,7 +14,7 @@ import java.util.List;
  * 优惠券业务层
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 public interface CouponService extends IService<Coupon> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/FullDiscountService.java b/framework/src/main/java/cn/lili/modules/promotion/service/FullDiscountService.java
index 03e3b3db..e84a7bda 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/FullDiscountService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/FullDiscountService.java
@@ -1,9 +1,10 @@
 package cn.lili.modules.promotion.service;
 
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.promotion.entity.dos.FullDiscount;
-import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams;
 import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
+import cn.lili.modules.promotion.entity.dos.FullDiscount;
+import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
+import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,18 +14,10 @@ import java.util.List;
  * 满优惠业务层
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 public interface FullDiscountService extends IService<FullDiscount> {
 
-    /**
-     * 当前满优惠活动
-     *
-     * @param storeId 商家编号
-     * @return 满优惠活动信息
-     */
-    FullDiscountVO currentPromotion(String storeId);
-
     /**
      * 当前满优惠活动
      *
@@ -53,8 +46,8 @@ public interface FullDiscountService extends IService<FullDiscount> {
     /**
      * 从mongo中分页获取满优惠列表
      *
-     * @param searchParams    搜索参数
-     * @param page            分页参数
+     * @param searchParams 搜索参数
+     * @param page         分页参数
      * @return 满优惠列表
      */
     IPage<FullDiscountVO> getFullDiscountByPageFromMongo(FullDiscountSearchParams searchParams, PageVO page);
@@ -84,4 +77,13 @@ public interface FullDiscountService extends IService<FullDiscount> {
      */
     boolean deleteFullDiscount(String id);
 
+    /**
+     * 更新满额活动状态
+     *
+     * @param id              优惠券编号
+     * @param promotionStatus 促销状态
+     * @return 更新结果
+     */
+    boolean updateFullDiscountStatus(String id, PromotionStatusEnum promotionStatus);
+
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/MemberAddressService.java b/framework/src/main/java/cn/lili/modules/promotion/service/MemberAddressService.java
index d7b471eb..dd330b5f 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/MemberAddressService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/MemberAddressService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 收货地址业务层
  *
  * @author Chopper
- * @date 2020/11/18 9:45 上午
+ * @since 2020/11/18 9:45 上午
  */
 public interface MemberAddressService extends IService<MemberAddress> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java b/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java
index d2de9d52..524aa935 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 会员优惠券业务层
  *
  * @author Chopper
- * @date 2020/11/18 9:45 上午
+ * @since 2020/11/18 9:45 上午
  */
 public interface MemberCouponService extends IService<MemberCoupon> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PintuanService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PintuanService.java
index e3162511..cc2cd853 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/PintuanService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/PintuanService.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 拼图活动业务层
  *
  * @author Chopper
- * @date 2020/11/18 9:45 上午
+ * @since 2020/11/18 9:45 上午
  */
 public interface PintuanService extends IService<Pintuan> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsCategoryService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsCategoryService.java
index 7f0d7a89..2de42b43 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsCategoryService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsCategoryService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 积分商品分类业务层
  *
  * @author paulG
- * @date 2020/11/18 9:45 上午
+ * @since 2020/11/18 9:45 上午
  **/
 public interface PointsGoodsCategoryService extends IService<PointsGoodsCategory> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java
index 1217efbf..faac3f07 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 积分商品业务层
  *
  * @author paulG
- * @date 2020/11/18 9:45 上午
+ * @since 2020/11/18 9:45 上午
  **/
 public interface PointsGoodsService extends IService<PointsGoods> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java
index de04aea4..96517f02 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java
@@ -1,10 +1,10 @@
 package cn.lili.modules.promotion.service;
 
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;
 import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,7 +17,7 @@ import java.util.List;
  * 促销商品业务层
  *
  * @author Chopper
- * @date 2020/11/18 9:45 上午
+ * @since 2020/11/18 9:45 上午
  */
 public interface PromotionGoodsService extends IService<PromotionGoods> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionPriceService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionPriceService.java
index c50948a1..4d8e56f7 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionPriceService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionPriceService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 促销计算
  *
  * @author paulG
- * @date 2020/8/21
+ * @since 2020/8/21
  **/
 public interface PromotionPriceService {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java
index 6698bbd2..54d07cc8 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.promotion.service;
 
-import cn.lili.common.trigger.message.PromotionMessage;
+import cn.lili.trigger.message.PromotionMessage;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 
 import java.util.Map;
@@ -9,7 +9,7 @@ import java.util.Map;
  * 促销业务层
  *
  * @author Chopper
- * @date 2020/11/18 9:45 上午
+ * @since 2020/11/18 9:45 上午
  */
 public interface PromotionService {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillApplyService.java b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillApplyService.java
index 07e1c0cf..d83b0cbb 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillApplyService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillApplyService.java
@@ -15,7 +15,7 @@ import java.util.List;
  * 秒杀申请业务层
  *
  * @author Chopper
- * @date 2020/11/18 9:45 上午
+ * @since 2020/11/18 9:45 上午
  */
 public interface SeckillApplyService extends IService<SeckillApply> {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java
index 27fdc908..5b01da74 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 秒杀业务层
  *
  * @author Chopper
- * @date 2020/11/18 9:45 上午
+ * @since 2020/11/18 9:45 上午
  */
 public interface SeckillService extends IService<Seckill> {
 
@@ -44,8 +44,6 @@ public interface SeckillService extends IService<Seckill> {
 
     /**
      * 初始化秒杀活动，默认开启三十天的秒杀活动
-     *
-     * @return 是否保存成功
      */
     void init();
     /**
@@ -103,7 +101,6 @@ public interface SeckillService extends IService<Seckill> {
     /**
      * 更新秒杀活动的商品数量
      * @param seckillId 秒杀活动ID
-     * @return 更新结果
      */
     void updateSeckillGoodsNum(String seckillId);
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java
index caa7a589..68775595 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java
@@ -14,7 +14,7 @@ import java.util.List;
  * 优惠券活动关联优惠券业务层实现
  *
  * @author Bulbasaur
- * @date: 2021/5/21 6:42 下午
+ * @since: 2021/5/21 6:42 下午
  */
 @Service
 public class CouponActivityItemServiceImpl extends ServiceImpl<CouponActivityItemMapper, CouponActivityItem> implements CouponActivityItemService {
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
index 35f0556a..bd0ece91 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
@@ -3,14 +3,14 @@ package cn.lili.modules.promotion.serviceimpl;
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.message.PromotionMessage;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.message.PromotionMessage;
+import cn.lili.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.util.DelayQueueTools;
 import cn.lili.common.utils.DateUtil;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
 import cn.lili.modules.promotion.entity.dos.Coupon;
@@ -21,7 +21,7 @@ import cn.lili.modules.promotion.entity.dto.CouponActivityDTO;
 import cn.lili.modules.promotion.entity.enums.CouponActivitySendTypeEnum;
 import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum;
 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.CouponActivityVO;
 import cn.lili.modules.promotion.mapper.CouponActivityMapper;
 import cn.lili.modules.promotion.service.CouponActivityItemService;
@@ -42,7 +42,7 @@ import java.util.*;
  * 优惠券活动业务层实现
  *
  * @author Bulbasaur
- * @date: 2021/5/20 6:10 下午
+ * @since: 2021/5/20 6:10 下午
  */
 @Slf4j
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
index 666b7539..e12c770f 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
@@ -3,17 +3,18 @@ package cn.lili.modules.promotion.serviceimpl;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.message.PromotionMessage;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.common.enums.PromotionTypeEnum;
+import cn.lili.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.message.PromotionMessage;
+import cn.lili.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.util.DelayQueueTools;
 import cn.lili.common.utils.DateUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.promotion.entity.dos.*;
@@ -44,7 +45,7 @@ import java.util.stream.Collectors;
  * 优惠券活动业务层实现
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -156,16 +157,14 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
             couponVO.setPromotionStatus(promotionStatus.name());
             this.updateById(couponVO);
             this.mongoTemplate.save(couponVO);
-            if (promotionStatus.name().equals(PromotionStatusEnum.START.name())) {
-                PromotionMessage promotionMessage = new PromotionMessage(couponVO.getId(), PromotionTypeEnum.COUPON.name(), PromotionStatusEnum.START.name(), couponVO.getStartTime(), couponVO.getEndTime());
-                //更新延时任务
-                this.timeTrigger.edit(TimeExecuteConstant.PROMOTION_EXECUTOR,
-                        promotionMessage,
-                        couponVO.getStartTime().getTime(), couponVO.getStartTime().getTime(),
-                        DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
-                        DateUtil.getDelayTime(couponVO.getStartTime().getTime()),
-                        rocketmqCustomProperties.getPromotionTopic());
-            }
+            PromotionMessage promotionMessage = new PromotionMessage(couponVO.getId(), PromotionTypeEnum.COUPON.name(), promotionStatus.name(), couponVO.getStartTime(), couponVO.getEndTime());
+            //更新延时任务
+            this.timeTrigger.edit(TimeExecuteConstant.PROMOTION_EXECUTOR,
+                    promotionMessage,
+                    couponVO.getStartTime().getTime(), couponVO.getStartTime().getTime(),
+                    DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
+                    DateUtil.getDelayTime(couponVO.getStartTime().getTime()),
+                    rocketmqCustomProperties.getPromotionTopic());
         }
         return true;
     }
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
index b2b0a962..8f0b24a9 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
@@ -1,29 +1,29 @@
 package cn.lili.modules.promotion.serviceimpl;
 
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.common.enums.ResultCode;
-import cn.lili.common.trigger.util.DelayQueueTools;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.message.PromotionMessage;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.common.utils.DateUtil;
-import cn.lili.common.utils.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
 import cn.lili.modules.promotion.entity.dos.Coupon;
 import cn.lili.modules.promotion.entity.dos.FullDiscount;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams;
 import cn.lili.modules.promotion.mapper.FullDiscountMapper;
 import cn.lili.modules.promotion.service.CouponService;
 import cn.lili.modules.promotion.service.FullDiscountService;
 import cn.lili.modules.promotion.service.PromotionGoodsService;
 import cn.lili.modules.promotion.tools.PromotionTools;
+import cn.lili.mybatis.util.PageUtil;
+import cn.lili.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.message.PromotionMessage;
+import cn.lili.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.util.DelayQueueTools;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -42,7 +42,7 @@ import java.util.List;
  * 满优惠业务层实现
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -77,13 +77,6 @@ public class FullDiscountServiceImpl extends ServiceImpl<FullDiscountMapper, Ful
     @Autowired
     private PromotionGoodsService promotionGoodsService;
 
-    @Override
-    public FullDiscountVO currentPromotion(String storeId) {
-        Query query = this.getMongoQuery();
-        query.addCriteria(Criteria.where(SELLER_ID_COLUMN).is(storeId));
-        return mongoTemplate.findOne(query, FullDiscountVO.class);
-    }
-
     @Override
     public List<FullDiscountVO> currentPromotion(List<String> storeId) {
         Query query = this.getMongoQuery();
@@ -203,6 +196,48 @@ public class FullDiscountServiceImpl extends ServiceImpl<FullDiscountMapper, Ful
         return result;
     }
 
+    @Override
+    public boolean updateFullDiscountStatus(String id, PromotionStatusEnum promotionStatus) {
+        Query query = new Query();
+        query.addCriteria(Criteria.where("id").is(id));
+        List<FullDiscountVO> fullDiscountVOList = this.mongoTemplate.find(query, FullDiscountVO.class);
+
+        //判断满额活动是否为空
+        if (fullDiscountVOList.isEmpty() || fullDiscountVOList == null) {
+            throw new ServiceException(ResultCode.FULL_DISCOUNT_NOT_EXIST_ERROR);
+        }
+        FullDiscountVO fullDiscountVO = fullDiscountVOList.get(0);
+
+        //如果是开启活动则需要校验参数
+        if (promotionStatus.equals(PromotionStatusEnum.START)) {
+            //验证是否是有效参数
+            PromotionTools.paramValid(fullDiscountVO.getStartTime().getTime(), fullDiscountVO.getEndTime().getTime(), fullDiscountVO.getNumber(), fullDiscountVO.getPromotionGoodsList());
+            //当前时间段是否存在同类活动
+            this.checkSameActiveExist(fullDiscountVO.getStartTime(), fullDiscountVO.getEndTime(), fullDiscountVO.getStoreId(), null);
+            //检查满减参数
+            this.checkFullDiscount(fullDiscountVO);
+        }
+
+        //填写活动状态
+        fullDiscountVO.setPromotionStatus(promotionStatus.name());
+
+        //保存到MYSQL中
+        this.updateById(fullDiscountVO);
+
+        //添加促销消息
+        PromotionMessage promotionMessage = new PromotionMessage(fullDiscountVO.getId(), PromotionTypeEnum.FULL_DISCOUNT.name(),
+                promotionStatus.name(),
+                fullDiscountVO.getStartTime(), fullDiscountVO.getEndTime());
+        //添加延时任务
+        TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR,
+                fullDiscountVO.getStartTime().getTime(), promotionMessage,
+                DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
+                rocketmqCustomProperties.getPromotionTopic());
+        //发送促销活动开始的延时任务
+        this.timeTrigger.addDelay(timeTriggerMsg);
+        return true;
+    }
+
     /**
      * 检查满优惠活动是否存在
      *
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java
index 95dc3ef2..3d3da41c 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java
@@ -2,18 +2,12 @@ package cn.lili.modules.promotion.serviceimpl;
 
 
 import cn.hutool.core.util.StrUtil;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.message.PromotionMessage;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.common.utils.DateUtil;
-import cn.lili.common.utils.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import cn.lili.modules.goods.service.GoodsSkuService;
@@ -21,13 +15,19 @@ import cn.lili.modules.promotion.entity.dos.KanjiaActivityGoods;
 import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsDTO;
 import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsOperationDTO;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.entity.vos.kanjia.KanjiaActivityGoodsListVO;
 import cn.lili.modules.promotion.entity.vos.kanjia.KanjiaActivityGoodsParams;
 import cn.lili.modules.promotion.entity.vos.kanjia.KanjiaActivityGoodsVO;
 import cn.lili.modules.promotion.mapper.KanJiaActivityGoodsMapper;
 import cn.lili.modules.promotion.service.KanjiaActivityGoodsService;
 import cn.lili.modules.promotion.tools.PromotionTools;
+import cn.lili.mybatis.util.PageUtil;
+import cn.lili.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.message.PromotionMessage;
+import cn.lili.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.util.DelayQueueTools;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java
index 5b18f279..cda873f1 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java
@@ -5,18 +5,18 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.common.utils.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.promotion.entity.dos.KanjiaActivity;
 import cn.lili.modules.promotion.entity.dos.KanjiaActivityGoods;
 import cn.lili.modules.promotion.entity.dos.KanjiaActivityLog;
-import cn.lili.modules.promotion.entity.dto.KanjiaActivityDTO;
 import cn.lili.modules.promotion.entity.dto.KanJiaActivityLogQuery;
+import cn.lili.modules.promotion.entity.dto.KanjiaActivityDTO;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
 import cn.lili.modules.promotion.mapper.KanJiaActivityLogMapper;
 import cn.lili.modules.promotion.service.KanjiaActivityGoodsService;
 import cn.lili.modules.promotion.service.KanjiaActivityLogService;
 import cn.lili.modules.promotion.service.KanjiaActivityService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java
index 4711c42b..8a74fd8d 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java
@@ -8,7 +8,6 @@ import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.CurrencyUtil;
-import cn.lili.common.utils.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsSkuService;
@@ -27,6 +26,7 @@ import cn.lili.modules.promotion.mapper.KanJiaActivityMapper;
 import cn.lili.modules.promotion.service.KanjiaActivityGoodsService;
 import cn.lili.modules.promotion.service.KanjiaActivityLogService;
 import cn.lili.modules.promotion.service.KanjiaActivityService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java
index 17c2a70a..ca80e933 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.promotion.serviceimpl;
 
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.MemberAddress;
 import cn.lili.modules.member.mapper.MemberAddressMapper;
@@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,7 +20,7 @@ import java.util.List;
  * 收货地址业务层实现
  *
  * @author Chopper
- * @date 2020/11/18 9:44 上午
+ * @since 2020/11/18 9:44 上午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
index 467c20d4..cad0d870 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
@@ -3,7 +3,7 @@ package cn.lili.modules.promotion.serviceimpl;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.promotion.entity.dos.Coupon;
 import cn.lili.modules.promotion.entity.dos.MemberCoupon;
@@ -33,7 +33,7 @@ import java.util.List;
  * 会员优惠券业务层实现
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -58,8 +58,8 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
         if (coupon.getPublishNum() != 0 && coupon.getReceivedNum() >= coupon.getPublishNum()) {
             throw new ServiceException(ResultCode.COUPON_NUM_INSUFFICIENT_ERROR);
         }
-        if (haveCoupons >= coupon.getCouponLimitNum()) {
-            throw new ServiceException("此优惠券最多领取" + coupon.getCouponLimitNum() + "张");
+        if (!coupon.getCouponLimitNum().equals(0) && haveCoupons >= coupon.getCouponLimitNum()) {
+            throw new ServiceException(ResultCode.COUPON_LIMIT_ERROR, "此优惠券最多领取" + coupon.getCouponLimitNum() + "张");
         }
     }
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
index a094fd7d..9b1675fd 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
@@ -3,17 +3,17 @@ package cn.lili.modules.promotion.serviceimpl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.lili.common.enums.ResultCode;
-import cn.lili.common.trigger.util.DelayQueueTools;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.message.PromotionMessage;
+import cn.lili.trigger.util.DelayQueueTools;
+import cn.lili.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.message.PromotionMessage;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeTriggerMsg;
 import cn.lili.common.utils.DateUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
@@ -24,7 +24,7 @@ import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.promotion.entity.dos.Pintuan;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 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.PintuanSearchParams;
 import cn.lili.modules.promotion.entity.vos.PintuanShareVO;
@@ -55,7 +55,7 @@ import java.util.stream.Collectors;
  * 拼团业务层实现
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java
index ee27e9ff..d10f209d 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java
@@ -2,7 +2,7 @@ package cn.lili.modules.promotion.serviceimpl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.promotion.entity.dos.PointsGoodsCategory;
 import cn.lili.modules.promotion.mapper.PointsGoodsCategoryMapper;
@@ -10,8 +10,6 @@ import cn.lili.modules.promotion.service.PointsGoodsCategoryService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 积分商品分类业务层实现
  *
  * @author paulG
- * @date 2020/8/21
+ * @since 2020/8/21
  **/
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
index 38a4a78b..8d0f4c56 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
@@ -2,21 +2,21 @@ package cn.lili.modules.promotion.serviceimpl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.lili.common.enums.ResultCode;
-import cn.lili.common.trigger.util.DelayQueueTools;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.message.PromotionMessage;
+import cn.lili.trigger.util.DelayQueueTools;
+import cn.lili.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.message.PromotionMessage;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeTriggerMsg;
 import cn.lili.common.utils.DateUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.promotion.entity.dos.PointsGoods;
 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.PointsGoodsSearchParams;
 import cn.lili.modules.promotion.entity.vos.PointsGoodsVO;
 import cn.lili.modules.promotion.mapper.PointsGoodsMapper;
@@ -42,7 +42,7 @@ import java.util.List;
  * 积分商品业务层实现
  *
  * @author paulG
- * @date 2020/8/21
+ * @since 2020/8/21
  **/
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java
index b86536b5..ea669d90 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java
@@ -6,7 +6,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.DateUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.distribution.entity.dos.DistributionGoods;
 import cn.lili.modules.distribution.service.DistributionGoodsService;
@@ -23,7 +23,7 @@ import cn.lili.modules.promotion.entity.dto.BasePromotion;
 import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
 import cn.lili.modules.promotion.entity.enums.CouponScopeTypeEnum;
 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.CouponVO;
 import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;
 import cn.lili.modules.promotion.entity.vos.SeckillVO;
@@ -52,7 +52,7 @@ import java.util.List;
  * 促销商品业务层实现
  *
  * @author Chopper
- * @date 2021/3/18 9:22 上午
+ * @since 2021/3/18 9:22 上午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java
index 1a0645d5..b8a03a5e 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java
@@ -2,6 +2,7 @@ package cn.lili.modules.promotion.serviceimpl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.text.CharSequenceUtil;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.service.GoodsSkuService;
@@ -25,7 +26,7 @@ import java.util.stream.Collectors;
  * 促销价格计算业务层实现
  *
  * @author paulG
- * @date 2020/8/21
+ * @since 2020/8/21
  **/
 @Service
 @Slf4j
@@ -615,8 +616,8 @@ public class PromotionPriceServiceImpl implements PromotionPriceService {
                 goodsSkuPromotionPrice.setTotalDiscountPrice(distributeDiscountTotalPrice);
                 //单品成交价
                 double finalPrice = CurrencyUtil.sub(goodsSkuPromotionPrice.getTotalOriginalPrice(), distributeDiscountTotalPrice);
-                goodsSkuPromotionPrice.setFinalePrice(finalPrice);
-                goodsSkuPromotionPrice.setTotalFinalePrice(CurrencyUtil.mul(finalPrice, goodsSkuPromotionPrice.getNumber()));
+                goodsSkuPromotionPrice.setFinalePrice(CurrencyUtil.div(finalPrice, goodsSkuPromotionPrice.getNumber()));
+                goodsSkuPromotionPrice.setTotalFinalePrice(finalPrice);
                 fullDiscount.setPromotionName(PromotionTypeEnum.FULL_DISCOUNT.name());
                 goodsSkuPromotionPrice.getJoinPromotion().add(fullDiscount);
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java
index eae61d89..bffc9b21 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java
@@ -6,7 +6,8 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.trigger.message.PromotionMessage;
+import cn.lili.common.enums.PromotionTypeEnum;
+import cn.lili.trigger.message.PromotionMessage;
 import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
 import cn.lili.modules.promotion.entity.dos.*;
 import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsDTO;
@@ -36,7 +37,7 @@ import java.util.*;
  * 促销业务层实现
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 @Slf4j
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
index 5f3a916f..bc2b1b0d 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
@@ -6,7 +6,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.vo.PageVO;
@@ -17,7 +17,7 @@ import cn.lili.modules.promotion.entity.dos.Seckill;
 import cn.lili.modules.promotion.entity.dos.SeckillApply;
 import cn.lili.modules.promotion.entity.enums.PromotionApplyStatusEnum;
 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.*;
 import cn.lili.modules.promotion.mapper.SeckillApplyMapper;
 import cn.lili.modules.promotion.service.PromotionGoodsService;
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
  * 秒杀申请业务层实现
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
index 6787d5d3..b03c092c 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
@@ -1,24 +1,24 @@
 package cn.lili.modules.promotion.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
-import cn.lili.common.trigger.util.DelayQueueTools;
-import cn.lili.common.trigger.enums.DelayTypeEnums;
-import cn.lili.common.trigger.message.PromotionMessage;
+import cn.lili.trigger.util.DelayQueueTools;
+import cn.lili.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.message.PromotionMessage;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeExecuteConstant;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.model.TimeExecuteConstant;
+import cn.lili.trigger.model.TimeTriggerMsg;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.DateUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.dos.Seckill;
 import cn.lili.modules.promotion.entity.dos.SeckillApply;
 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.enums.SeckillApplyStatusEnum;
 import cn.lili.modules.promotion.entity.vos.SeckillSearchParams;
 import cn.lili.modules.promotion.entity.vos.SeckillVO;
@@ -54,7 +54,7 @@ import java.util.stream.Collectors;
  * 秒杀活动业务层实现
  *
  * @author Chopper
- * @date 2020/8/21
+ * @since 2020/8/21
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java
index b2a7a150..6281f779 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java
@@ -1,11 +1,11 @@
 package cn.lili.modules.promotion.tools;
 
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 
 /**
  * 满额活动缓存Key
  * @author paulG
- * @date 2020/10/12
+ * @since 2020/10/12
  **/
 public class PromotionCacheKeys {
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java
index 369a6e11..1571edbd 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java
@@ -8,7 +8,7 @@ import cn.lili.common.vo.PageVO;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.dto.BasePromotion;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -22,7 +22,7 @@ import java.util.List;
  * 优惠活动通用验证类
  *
  * @author paulG
- * @date 2020/8/18
+ * @since 2020/8/18
  **/
 public class PromotionTools {
 
diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java
index 0eac781d..28d2c877 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.purchase.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -15,7 +15,7 @@ import java.util.Date;
  * 供求单
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java
index c0b5449e..4e47ae62 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java
@@ -21,7 +21,7 @@ import java.util.Date;
  * 采购单子内容
  *
  * @author Bulbasaur
- * @date 2020/11/26 19:32
+ * @since 2020/11/26 19:32
  */
 @Data
 @Entity
@@ -39,7 +39,7 @@ public class PurchaseOrderItem {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java
index 5bfb2331..4c435c61 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java
@@ -1,7 +1,5 @@
 package cn.lili.modules.purchase.entity.dos;
 
-import cn.lili.base.BaseEntity;
-import cn.lili.common.utils.SnowFlake;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -23,7 +21,7 @@ import java.util.Date;
  * 报价单
  *
  * @author Chopper
- * @date 2020/11/26 20:43
+ * @since 2020/11/26 20:43
  */
 @Data
 @Entity
@@ -41,7 +39,7 @@ public class PurchaseQuoted {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java
index 16e85fcc..cccfe712 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java
@@ -22,7 +22,7 @@ import java.util.Date;
  * 报价单字内容
  *
  * @author Bulbasaur
- * @date 2020/11/26 20:43
+ * @since 2020/11/26 20:43
  */
 @Data
 @Entity
@@ -40,7 +40,7 @@ public class PurchaseQuotedItem {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/params/PurchaseOrderSearchParams.java b/framework/src/main/java/cn/lili/modules/purchase/entity/params/PurchaseOrderSearchParams.java
index 0be43cd2..50446405 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/entity/params/PurchaseOrderSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/entity/params/PurchaseOrderSearchParams.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 供求单查询参数
  *
  * @author Bulbasaur
- * @date 2020/11/27 11:29
+ * @since 2020/11/27 11:29
  */
 @Data
 public class PurchaseOrderSearchParams extends PageVO {
diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseOrderVO.java b/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseOrderVO.java
index 53e9f9f7..373b5bb5 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseOrderVO.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseOrderVO.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 采购单VO
  *
  * @author Bulbasaur
- * @date 2020/11/26 19:54
+ * @since 2020/11/26 19:54
  */
 @Data
 public class PurchaseOrderVO extends PurchaseOrder {
diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseQuotedVO.java b/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseQuotedVO.java
index e0524fbd..57d4964f 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseQuotedVO.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseQuotedVO.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 报价单VO
  *
  * @author Bulbasaur
- * @date 2020/11/26 19:54
+ * @since 2020/11/26 19:54
  */
 @Data
 public class PurchaseQuotedVO extends PurchaseQuoted {
diff --git a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderItemMapper.java b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderItemMapper.java
index 41547acc..cdd20032 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderItemMapper.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderItemMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 采购单子内容数据处理层
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:11
+ * @since 2020/11/26 16:11
  */
 public interface PurchaseOrderItemMapper extends BaseMapper<PurchaseOrderItem> {
 
diff --git a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderMapper.java b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderMapper.java
index f7f6f1c1..7d508945 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderMapper.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 采购单数据处理层
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:11
+ * @since 2020/11/26 16:11
  */
 public interface PurchaseOrderMapper extends BaseMapper<PurchaseOrder> {
 
diff --git a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedItemMapper.java b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedItemMapper.java
index 78ae523e..df857064 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedItemMapper.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedItemMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 采购单子内容数据处理层
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:11
+ * @since 2020/11/26 16:11
  */
 public interface PurchaseQuotedItemMapper extends BaseMapper<PurchaseQuotedItem> {
 
diff --git a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedMapper.java b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedMapper.java
index a6587903..0ca28701 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedMapper.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 采购报价数据处理层
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:11
+ * @since 2020/11/26 16:11
  */
 public interface PurchaseQuotedMapper extends BaseMapper<PurchaseQuoted> {
 
diff --git a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderItemService.java b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderItemService.java
index 2d289a1b..048845af 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderItemService.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderItemService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 采购单子内容业务层
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:12
+ * @since 2020/11/26 16:12
  */
 public interface PurchaseOrderItemService extends IService<PurchaseOrderItem> {
 
diff --git a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderService.java b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderService.java
index ba92322b..fc9780bb 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderService.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderService.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 采购单业务层
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:12
+ * @since 2020/11/26 16:12
  */
 public interface PurchaseOrderService extends IService<PurchaseOrder> {
 
diff --git a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedItemService.java b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedItemService.java
index 7ee68777..7536a63b 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedItemService.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedItemService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 采购单子内容业务层
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:12
+ * @since 2020/11/26 16:12
  */
 public interface PurchaseQuotedItemService extends IService<PurchaseQuotedItem> {
 
diff --git a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedService.java b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedService.java
index b4a0646a..523ea6a8 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedService.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 采购单报价业务层
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:12
+ * @since 2020/11/26 16:12
  */
 public interface PurchaseQuotedService extends IService<PurchaseQuoted> {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderItemServiceImpl.java
index 7a2aecc7..50f75d78 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderItemServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderItemServiceImpl.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 采购单子内容业务层实现
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:13
+ * @since 2020/11/26 16:13
  */
 @Service
 public class PurchaseOrderItemServiceImpl extends ServiceImpl<PurchaseOrderItemMapper, PurchaseOrderItem> implements PurchaseOrderItemService {
diff --git a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java
index c063855a..0728d28d 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * 采购单业务层实现
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:13
+ * @since 2020/11/26 16:13
  */
 @Service
 public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, PurchaseOrder> implements PurchaseOrderService {
diff --git a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedItemServiceImpl.java
index d653dd94..868e53f1 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedItemServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedItemServiceImpl.java
@@ -14,7 +14,7 @@ import java.util.List;
  * 采购单子内容业务层实现
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:13
+ * @since 2020/11/26 16:13
  */
 @Service
 public class PurchaseQuotedItemServiceImpl extends ServiceImpl<PurchaseQuotedItemMapper, PurchaseQuotedItem> implements PurchaseQuotedItemService {
diff --git a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java
index 4a3e6e12..52b44d91 100644
--- a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java
@@ -20,7 +20,7 @@ import java.util.List;
  * 采购单报价业务层实现
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:13
+ * @since 2020/11/26 16:13
  */
 @Service
 public class PurchaseQuotedServiceImpl extends ServiceImpl<PurchaseQuotedMapper, PurchaseQuoted> implements PurchaseQuotedService {
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java
index c7908e43..7486127e 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java
+++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.search.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +15,7 @@ import javax.validation.constraints.NotEmpty;
  * 自定义分词
  *
  * @author paulG
- * @date 2020/10/15
+ * @since 2020/10/15
  **/
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsAttribute.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsAttribute.java
index 5c153e9c..09254bae 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsAttribute.java
+++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsAttribute.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
 /**
  * 商品属性索引
  * @author paulG
- * @date 2020/10/14
+ * @since 2020/10/14
  **/
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java
index 89148a92..1fbad5e4 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java
+++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java
@@ -1,6 +1,7 @@
 package cn.lili.modules.search.entity.dos;
 
-import cn.lili.common.elasticsearch.EsSuffix;
+import cn.lili.common.enums.PromotionTypeEnum;
+import cn.lili.elasticsearch.EsSuffix;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -24,7 +25,6 @@ import java.util.Map;
  * 商品索引
  *
  * @author paulG
- * @date 2020/10/13
  **/
 @Data
 @Document(indexName = "#{elasticsearchProperties.indexPrefix}_" + EsSuffix.GOODS_INDEX_NAME)
@@ -239,7 +239,7 @@ public class EsGoodsIndex implements Serializable {
      * 商品促销活动集合
      * key 为 促销活动类型
      *
-     * @see cn.lili.modules.promotion.entity.enums.PromotionTypeEnum
+     * @see PromotionTypeEnum
      * value 为 促销活动实体信息
      */
     @Field(type = FieldType.Nested)
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsRelatedInfo.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsRelatedInfo.java
index d45a8be1..a6b56e60 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsRelatedInfo.java
+++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsRelatedInfo.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 搜索相关商品品牌名称，分类名称及属性
  *
  * @author paulG
- * @date 2020/10/20
+ * @since 2020/10/20
  **/
 @Data
 public class EsGoodsRelatedInfo {
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoods.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoods.java
index e2c4da78..a1df7a71 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoods.java
+++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoods.java
@@ -6,7 +6,7 @@ import lombok.Data;
  * 商品搜索结果实体
  *
  * @author paulG
- * @date 2020/10/16
+ * @since 2020/10/16
  **/
 @Data
 public class EsGoods {
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java
index 7451615f..c9f046bd 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java
+++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java
@@ -9,7 +9,7 @@ import java.util.Map;
 
 /**
  * @author paulG
- * @date 2020/10/15
+ * @since 2020/10/15
  **/
 @Data
 public class EsGoodsSearchDTO {
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/HotWordsDTO.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/HotWordsDTO.java
new file mode 100644
index 00000000..8756dcf2
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/HotWordsDTO.java
@@ -0,0 +1,24 @@
+package cn.lili.modules.search.entity.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 搜索热词
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2021-07-26 15:46
+ */
+@Data
+public class HotWordsDTO {
+
+    @NotBlank(message = "搜索热词不能为空")
+    private String keywords;
+
+    @NotNull(message = "分数不能为空")
+    private Integer point;
+}
+
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/ParamOptions.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/ParamOptions.java
index 141d1e54..d23f1944 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/dto/ParamOptions.java
+++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/ParamOptions.java
@@ -8,7 +8,7 @@ import java.util.List;
  * 参数属性选择器
  *
  * @author paulG
- * @date 2020/10/20
+ * @since 2020/10/20
  **/
 @Data
 public class ParamOptions {
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/SelectorOptions.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/SelectorOptions.java
index 1264c9a7..e701b30f 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/dto/SelectorOptions.java
+++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/SelectorOptions.java
@@ -6,7 +6,7 @@ import java.util.List;
 
 /**
  * @author paulG
- * @date 2020/10/20
+ * @since 2020/10/20
  **/
 @Data
 public class SelectorOptions {
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/enums/HotWordsRedisKeyEnum.java b/framework/src/main/java/cn/lili/modules/search/entity/enums/HotWordsRedisKeyEnum.java
deleted file mode 100644
index 932e032a..00000000
--- a/framework/src/main/java/cn/lili/modules/search/entity/enums/HotWordsRedisKeyEnum.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.lili.modules.search.entity.enums;
-
-/**
- * @author paulG
- * @date 2021/1/20
- **/
-public enum HotWordsRedisKeyEnum {
-
-    /**
-     * "搜索热词"
-     */
-    SEARCH_HOT_WORD("搜索热词");
-
-
-    private final String description;
-
-    HotWordsRedisKeyEnum(String description) {
-        this.description = description;
-    }
-
-    public String description() {
-        return description;
-    }
-}
diff --git a/framework/src/main/java/cn/lili/modules/search/entity/vo/CustomWordsVO.java b/framework/src/main/java/cn/lili/modules/search/entity/vo/CustomWordsVO.java
index 51899c0a..d6596b37 100644
--- a/framework/src/main/java/cn/lili/modules/search/entity/vo/CustomWordsVO.java
+++ b/framework/src/main/java/cn/lili/modules/search/entity/vo/CustomWordsVO.java
@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 
 /**
  * @author paulG
- * @date 2020/12/7
+ * @since 2020/12/7
  **/
 @EqualsAndHashCode(callSuper = true)
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/search/mapper/CustomWordsMapper.java b/framework/src/main/java/cn/lili/modules/search/mapper/CustomWordsMapper.java
index 10c04a76..359cd238 100644
--- a/framework/src/main/java/cn/lili/modules/search/mapper/CustomWordsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/search/mapper/CustomWordsMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 自定义分词数据处理层
  *
  * @author paulG
- * @date 2020/10/15
+ * @since 2020/10/15
  **/
 public interface CustomWordsMapper extends BaseMapper<CustomWords> {
 }
diff --git a/framework/src/main/java/cn/lili/modules/search/repository/EsGoodsIndexRepository.java b/framework/src/main/java/cn/lili/modules/search/repository/EsGoodsIndexRepository.java
index 3c5e9cf7..a2088b22 100644
--- a/framework/src/main/java/cn/lili/modules/search/repository/EsGoodsIndexRepository.java
+++ b/framework/src/main/java/cn/lili/modules/search/repository/EsGoodsIndexRepository.java
@@ -5,7 +5,7 @@ import org.springframework.data.elasticsearch.repository.ElasticsearchRepository
 
 /**
  * @author paulG
- * @date 2020/10/15
+ * @since 2020/10/15
  **/
 public interface EsGoodsIndexRepository extends ElasticsearchRepository<EsGoodsIndex, String> {
 
diff --git a/framework/src/main/java/cn/lili/modules/search/service/CustomWordsService.java b/framework/src/main/java/cn/lili/modules/search/service/CustomWordsService.java
index 6ca9f654..5193cdf1 100644
--- a/framework/src/main/java/cn/lili/modules/search/service/CustomWordsService.java
+++ b/framework/src/main/java/cn/lili/modules/search/service/CustomWordsService.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 自定义分词业务层
  *
  * @author paulG
- * @date 2020/10/15
+ * @since 2020/10/15
  **/
 public interface CustomWordsService extends IService<CustomWords> {
 
diff --git a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java
index 1d696cb2..466dad43 100644
--- a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java
+++ b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java
@@ -4,7 +4,7 @@ import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.dto.BasePromotion;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.Map;
  * 商品索引业务层
  *
  * @author paulG
- * @date 2020/10/14
+ * @since 2020/10/14
  **/
 public interface EsGoodsIndexService {
 
diff --git a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java
index 2b33fc99..c4cfbebb 100644
--- a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java
+++ b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java
@@ -4,6 +4,7 @@ import cn.lili.common.vo.PageVO;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 import cn.lili.modules.search.entity.dos.EsGoodsRelatedInfo;
 import cn.lili.modules.search.entity.dto.EsGoodsSearchDTO;
+import cn.lili.modules.search.entity.dto.HotWordsDTO;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
@@ -12,7 +13,7 @@ import java.util.List;
  * ES商品搜索业务层
  *
  * @author paulG
- * @date 2020/10/15
+ * @since 2020/10/15
  **/
 public interface EsGoodsSearchService {
 
@@ -34,6 +35,12 @@ public interface EsGoodsSearchService {
      */
     List<String> getHotWords(Integer start, Integer end);
 
+    /**
+     * 设置热门关键词
+     * @param hotWords 热词分数
+     */
+    void setHotWords(HotWordsDTO hotWords);
+
     /**
      * 获取筛选器
      *
diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java
index 4797774e..2cb3b7e8 100644
--- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java
@@ -2,9 +2,9 @@ package cn.lili.modules.search.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.context.ThreadContextHolder;
+import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.modules.search.entity.dos.CustomWords;
 import cn.lili.modules.search.entity.vo.CustomWordsVO;
 import cn.lili.modules.search.mapper.CustomWordsMapper;
@@ -20,7 +20,7 @@ import java.util.List;
 /**
  * 自定义分词业务层实现
  * @author paulG
- * @date 2020/10/15
+ * @since 2020/10/15
  **/
 @Service
 public class CustomWordsServiceImpl extends ServiceImpl<CustomWordsMapper, CustomWords> implements CustomWordsService {
diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java
index 65c4415e..c6b04f29 100644
--- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java
@@ -5,9 +5,9 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.extra.pinyin.PinyinUtil;
-import cn.lili.common.elasticsearch.BaseElasticsearchService;
-import cn.lili.common.elasticsearch.EsSuffix;
-import cn.lili.config.elasticsearch.ElasticsearchProperties;
+import cn.lili.elasticsearch.BaseElasticsearchService;
+import cn.lili.elasticsearch.EsSuffix;
+import cn.lili.elasticsearch.config.ElasticsearchProperties;
 import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.dos.GoodsWords;
@@ -16,7 +16,7 @@ import cn.lili.modules.goods.service.GoodsWordsService;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.dto.BasePromotion;
 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.service.PromotionService;
 import cn.lili.modules.search.entity.dos.EsGoodsAttribute;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
index 72239a17..55233623 100644
--- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
@@ -1,7 +1,9 @@
 package cn.lili.modules.search.serviceimpl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
+import cn.lili.cache.CachePrefix;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.Brand;
@@ -13,15 +15,16 @@ import cn.lili.modules.goods.service.CategoryService;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 import cn.lili.modules.search.entity.dos.EsGoodsRelatedInfo;
 import cn.lili.modules.search.entity.dto.EsGoodsSearchDTO;
+import cn.lili.modules.search.entity.dto.HotWordsDTO;
 import cn.lili.modules.search.entity.dto.ParamOptions;
 import cn.lili.modules.search.entity.dto.SelectorOptions;
-import cn.lili.modules.search.entity.enums.HotWordsRedisKeyEnum;
 import cn.lili.modules.search.repository.EsGoodsIndexRepository;
 import cn.lili.modules.search.service.EsGoodsSearchService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.common.lucene.search.function.FunctionScoreQuery;
 import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.Operator;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
@@ -49,6 +52,7 @@ import java.util.*;
 
 /**
  * ES商品搜索业务层实现
+ *
  * @author paulG
  * @since 2020/10/16
  **/
@@ -88,7 +92,7 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
     @Override
     public Page<EsGoodsIndex> searchGoods(EsGoodsSearchDTO searchDTO, PageVO pageVo) {
         if (CharSequenceUtil.isNotEmpty(searchDTO.getKeyword())) {
-            cache.incrementScore(HotWordsRedisKeyEnum.SEARCH_HOT_WORD.name(), searchDTO.getKeyword());
+            cache.incrementScore(CachePrefix.HOT_WORD.getPrefix(), searchDTO.getKeyword());
         }
         NativeSearchQueryBuilder searchQueryBuilder = createSearchQueryBuilder(searchDTO, pageVo, true);
         NativeSearchQuery searchQuery = searchQueryBuilder.build();
@@ -100,13 +104,18 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
     @Override
     public List<String> getHotWords(Integer start, Integer end) {
         List<String> hotWords = new ArrayList<>();
-        Set<DefaultTypedTuple> set = cache.reverseRangeWithScores(HotWordsRedisKeyEnum.SEARCH_HOT_WORD.name(), start, end);
+        Set<DefaultTypedTuple> set = cache.reverseRangeWithScores(CachePrefix.HOT_WORD.getPrefix(), start, end);
         for (DefaultTypedTuple defaultTypedTuple : set) {
             hotWords.add(Objects.requireNonNull(defaultTypedTuple.getValue()).toString());
         }
         return hotWords;
     }
 
+    @Override
+    public void setHotWords(HotWordsDTO hotWords) {
+        cache.incrementScore(CachePrefix.HOT_WORD.getPrefix(), hotWords.getKeywords(), hotWords.getPoint());
+    }
+
     @Override
     public EsGoodsRelatedInfo getSelector(EsGoodsSearchDTO goodsSearch, PageVO pageVo) {
         NativeSearchQueryBuilder builder = createSearchQueryBuilder(goodsSearch, null, true);
@@ -316,6 +325,7 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
 
     /**
      * 查询属性处理
+     *
      * @param filterBuilder
      * @param queryBuilder
      * @param searchDTO
@@ -389,14 +399,14 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
         //价格区间判定
         if (CharSequenceUtil.isNotEmpty(searchDTO.getPrice())) {
             String[] prices = searchDTO.getPrice().split("_");
-            if(prices.length==0){
+            if (prices.length == 0) {
                 return;
             }
-            double min = StringUtils.toDouble(prices[0], 0.0);
+            double min = Convert.toDouble(prices[0], 0.0);
             double max = Integer.MAX_VALUE;
 
             if (prices.length == 2) {
-                max = StringUtils.toDouble(prices[1], Double.MAX_VALUE);
+                max = Convert.toDouble(prices[1], Double.MAX_VALUE);
             }
             filterBuilder.must(QueryBuilders.rangeQuery("price").from(min).to(max).includeLower(true).includeUpper(true));
         }
@@ -404,6 +414,7 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
 
     /**
      * 关键字查询处理
+     *
      * @param filterBuilder
      * @param queryBuilder
      * @param keyword
@@ -411,12 +422,23 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
      */
     private void keywordSearch(BoolQueryBuilder filterBuilder, BoolQueryBuilder queryBuilder, String keyword, boolean isAggregation) {
         List<FunctionScoreQueryBuilder.FilterFunctionBuilder> filterFunctionBuilders = new ArrayList<>();
-        //商品名字匹配
-        filterFunctionBuilders.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(QueryBuilders.wildcardQuery("goodsName", "*" + keyword + "*"),
-                ScoreFunctionBuilders.weightFactorFunction(10)));
-        //属性匹配
-        filterFunctionBuilders.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(QueryBuilders.nestedQuery(ATTR_PATH, QueryBuilders.wildcardQuery(ATTR_VALUE, "*" + keyword + "*"), ScoreMode.None),
-                ScoreFunctionBuilders.weightFactorFunction(8)));
+        if (keyword.contains(" ")) {
+            for (String s : keyword.split(" ")) {
+                filterFunctionBuilders.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(QueryBuilders.matchQuery("goodsName", s).operator(Operator.AND),
+                        ScoreFunctionBuilders.weightFactorFunction(10)));
+                //属性匹配
+                filterFunctionBuilders.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(QueryBuilders.nestedQuery(ATTR_PATH, QueryBuilders.wildcardQuery(ATTR_VALUE, "*" + s + "*"), ScoreMode.None),
+                        ScoreFunctionBuilders.weightFactorFunction(8)));
+            }
+        } else {
+            //分词匹配
+            filterFunctionBuilders.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(QueryBuilders.matchQuery("goodsName", keyword).operator(Operator.AND),
+                    ScoreFunctionBuilders.weightFactorFunction(10)));
+            //属性匹配
+            filterFunctionBuilders.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(QueryBuilders.nestedQuery(ATTR_PATH, QueryBuilders.wildcardQuery(ATTR_VALUE, "*" + keyword + "*"), ScoreMode.None),
+                    ScoreFunctionBuilders.weightFactorFunction(8)));
+        }
+
 
         FunctionScoreQueryBuilder.FilterFunctionBuilder[] builders = new FunctionScoreQueryBuilder.FilterFunctionBuilder[filterFunctionBuilders.size()];
         filterFunctionBuilders.toArray(builders);
diff --git a/framework/src/main/java/cn/lili/modules/statistics/aop/PageViewPoint.java b/framework/src/main/java/cn/lili/modules/statistics/aop/PageViewPoint.java
index 862528a9..73250a2a 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/aop/PageViewPoint.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/aop/PageViewPoint.java
@@ -8,7 +8,7 @@ import java.lang.annotation.*;
  * 埋点统计
  *
  * @author Bulbasaur
- * @date: 2021/7/9 1:47 上午
+ * @since: 2021/7/9 1:47 上午
  */
 @Target({ElementType.PARAMETER, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java b/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java
index c72d0a37..605e85d3 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java
@@ -1,10 +1,10 @@
 package cn.lili.modules.statistics.aop.aspect;
 
-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.utils.SpelUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.connect.util.IpUtils;
+import cn.lili.common.utils.IpUtils;
 import cn.lili.modules.goods.entity.vos.GoodsSkuVO;
 import cn.lili.modules.statistics.aop.PageViewPoint;
 import cn.lili.modules.statistics.aop.enums.PageViewEnum;
@@ -26,7 +26,7 @@ import java.util.Map;
  * 页面浏览统计拦截
  *
  * @author Chopper
- * @date 2021-01-14 18:01
+ * @since 2021-01-14 18:01
  */
 @Aspect
 @Configuration
diff --git a/framework/src/main/java/cn/lili/modules/statistics/aop/enums/PageViewEnum.java b/framework/src/main/java/cn/lili/modules/statistics/aop/enums/PageViewEnum.java
index fb89dd0f..e823bf72 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/aop/enums/PageViewEnum.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/aop/enums/PageViewEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.statistics.aop.enums;
  * 统计页面类型
  *
  * @author Chopper
- * @date 2021-01-14 17:55
+ * @since 2021-01-14 17:55
  */
 public enum PageViewEnum {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java
index 6601a78d..e06c36f2 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 商品统计数据处理层
  *
  * @author Bulbasaur
- * @date 2020/11/17 7:34 下午
+ * @since 2020/11/17 7:34 下午
  */
 public interface GoodsStatisticsDataMapper extends BaseMapper<StoreFlow> {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java
index 435b1096..f0eb3ce1 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java
@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Select;
  * 会员统计数据处理层
  *
  * @author Bulbasaur
- * @date 2020/11/17 7:34 下午
+ * @since 2020/11/17 7:34 下午
  */
 public interface MemberStatisticsDataMapper extends BaseMapper<MemberStatisticsData> {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java
index ed9561b9..7843c21f 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java
@@ -14,7 +14,7 @@ import java.util.List;
  * 订单统计数据处理层
  *
  * @author Bulbasaur
- * @date 2020/11/17 7:34 下午
+ * @since 2020/11/17 7:34 下午
  */
 public interface OrderStatisticsDataMapper extends BaseMapper<StoreFlow> {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java
index 89185d8d..2efa59b9 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java
@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Select;
  * 平台流量数据
  *
  * @author Bulbasaur
- * @date 2020/11/17 7:34 下午
+ * @since 2020/11/17 7:34 下午
  */
 public interface PlatformViewDataMapper extends BaseMapper<PlatformViewData> {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java
index 6495deda..11e3d76e 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select;
  * 退款统计数据处理层
  *
  * @author Bulbasaur
- * @date 2020/12/10 11:22
+ * @since 2020/12/10 11:22
  */
 public interface RefundOrderStatisticsDataMapper extends BaseMapper<StoreFlow> {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java
index 718fe86d..6521fee0 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 店铺统计数据处理层
  *
  * @author Bulbasaur
- * @date 2020/11/17 7:34 下午
+ * @since 2020/11/17 7:34 下午
  */
 public interface StoreStatisticsDataMapper extends BaseMapper<StoreFlow> {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java b/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java
index 0d02c6a0..d9fd6d5e 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java
@@ -17,7 +17,7 @@ import java.util.Date;
 /**
  * 会员统计
  * @author Chopper
- * @date 2020/11/17 7:34 下午
+ * @since 2020/11/17 7:34 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java b/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java
index c82beed6..c6ceed09 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * 平台pv统计
  *
  * @author Chopper
- * @date 2020-06-19 17:50
+ * @since 2020-06-19 17:50
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java b/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java
index 03c0190f..c898b278 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 商品统计查询参数
  *
  * @author Chopper
- * @date 2020/11/17 7:34 下午
+ * @since 2020/11/17 7:34 下午
  */
 @Data
 public class GoodsStatisticsQueryParam extends StatisticsQueryParam {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java b/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java
index f0f57018..fec5ce06 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 统计查询参数
  *
  * @author Bulbasaur
- * @date 2020/12/9 14:20
+ * @since 2020/12/9 14:20
  */
 @Data
 public class StatisticsQueryParam {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java
index b05c7745..5377e040 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 分类统计VO
  *
  * @author Bulbasaur
- * @date 2020/12/10 15:42
+ * @since 2020/12/10 15:42
  */
 @Data
 public class CategoryStatisticsDataVO {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java
index 169d82e5..88082f48 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 商品统计VO
  *
  * @author Bulbasaur
- * @date 2020/12/9 14:25
+ * @since 2020/12/9 14:25
  */
 @Data
 public class GoodsStatisticsDataVO {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java
index e9956bf7..e2a1e8c2 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 消息提示
  *
  * @author Bulbasaur
- * @date 2020/12/9 14:25
+ * @since 2020/12/9 14:25
  */
 @Data
 public class IndexNoticeVO {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java
index 4e279d93..a7a6b068 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 首页统计内容
  *
  * @author Bulbasaur
- * @date 2020/12/22 14:23
+ * @since 2020/12/22 14:23
  */
 @Data
 public class IndexStatisticsVO {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java
index e91168e6..3ab00e7b 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java
@@ -10,7 +10,7 @@ import java.util.Date;
  * 在线会员
  *
  * @author Chopper
- * @date 2021-02-21 09:59
+ * @since 2021-02-21 09:59
  */
 @Data
 @AllArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java
index 70dda2b4..abe916d8 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 订单统计概述
  *
  * @author Chopper
- * @date 2021-03-03 10:27
+ * @since 2021-03-03 10:27
  */
 @Data
 public class OrderOverviewVO {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java
index 01b2e4ca..27a627c1 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * 订单统计数据VO
  *
  * @author Bulbasaur
- * @date 2020/12/9 17:13
+ * @since 2020/12/9 17:13
  */
 @Data
 public class OrderStatisticsDataVO {
@@ -26,7 +26,7 @@ public class OrderStatisticsDataVO {
     private Double price;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java
index 64ba5320..bd1c92c5 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java
@@ -10,7 +10,7 @@ import java.util.Date;
  * 流量数据展示VO
  *
  * @author Chopper
- * @date 2020-06-19 17:50
+ * @since 2020-06-19 17:50
  */
 @Data
 public class PlatformViewVO {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java
index 30512db4..5d620e59 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 退款统计VO
  *
  * @author Bulbasaur
- * @date 2020/12/10 11:24
+ * @since 2020/12/10 11:24
  */
 @Data
 public class RefundOrderStatisticsDataVO {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java
index 1b9b025d..4d282829 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 店铺首页数据
  *
  * @author Chopper
- * @date 2021/3/17 4:04 下午
+ * @since 2021/3/17 4:04 下午
  */
 @Data
 public class StoreIndexStatisticsVO {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java
index 14f6c306..8b90f6e0 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 商品统计VO
  *
  * @author Bulbasaur
- * @date 2020/12/9 14:25
+ * @since 2020/12/9 14:25
  */
 @Data
 public class StoreStatisticsDataVO {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java
index e45c6e33..48ba024c 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 商品统计业务层
  *
  * @author Bulbasaur
- * @date 2020/12/9 11:06
+ * @since 2020/12/9 11:06
  */
 public interface GoodsStatisticsDataService extends IService<StoreFlow> {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java
index a70fcf83..1a50bcd5 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 首页统计数据业务层
  *
  * @author Bulbasaur
- * @date 2020/12/15 17:57
+ * @since 2020/12/15 17:57
  */
 public interface IndexStatisticsService {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java
index 9d3e5011..8ec5fcb2 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 会员统计业务层
  *
  * @author Bulbasaur
- * @date 2020/12/9 11:06
+ * @since 2020/12/9 11:06
  */
 public interface MemberStatisticsDataService extends IService<MemberStatisticsData> {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java
index 4db9c32f..de9488b1 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java
@@ -13,7 +13,7 @@ import java.util.Map;
  * 订单统计业务层
  *
  * @author Bulbasaur
- * @date 2020/12/9 11:06
+ * @since 2020/12/9 11:06
  */
 public interface OrderStatisticsDataService extends IService<StoreFlow> {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java
index a1403c3a..9f306eab 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 平台PV统计
  *
  * @author Bulbasaur
- * @date 2020/12/9 11:06
+ * @since 2020/12/9 11:06
  */
 public interface PlatformViewDataService extends IService<PlatformViewData> {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java
index c7dcf070..c41c1c1b 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 退款订单统计业务层
  *
  * @author Bulbasaur
- * @date 2020/12/9 11:06
+ * @since 2020/12/9 11:06
  */
 public interface RefundOrderStatisticsService extends IService<StoreFlow> {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java
index 9dedc7e3..68177182 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java
@@ -24,7 +24,7 @@ import java.util.List;
  * 商品统计业务层实现
  *
  * @author Bulbasaur
- * @date 2020/12/9 11:30
+ * @since 2020/12/9 11:30
  */
 @Service
 public class GoodsStatisticsDataServiceImpl extends ServiceImpl<GoodsStatisticsDataMapper, StoreFlow> implements GoodsStatisticsDataService {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java
index 753eda6c..a5ff21ec 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java
@@ -40,7 +40,7 @@ import java.util.Map;
  * 首页统计数据业务层实现
  *
  * @author Bulbasaur
- * @date 2020/12/15 17:57
+ * @since 2020/12/15 17:57
  */
 @Service
 public class IndexStatisticsServiceImpl implements IndexStatisticsService {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java
index 20774471..145eb320 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java
@@ -20,7 +20,7 @@ import java.util.List;
  * 会员统计业务层实现
  *
  * @author Bulbasaur
- * @date 2020/12/9 18:33
+ * @since 2020/12/9 18:33
  */
 @Service
 public class MemberStatisticsDataServiceImpl extends ServiceImpl<MemberStatisticsDataMapper, MemberStatisticsData> implements MemberStatisticsDataService {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java
index 6876984e..e8a90ecb 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java
@@ -31,7 +31,7 @@ import java.util.*;
  * 订单统计业务层实现
  *
  * @author Bulbasaur
- * @date 2020/12/9 17:16
+ * @since 2020/12/9 17:16
  */
 @Service
 public class OrderStatisticsDataServiceImpl extends ServiceImpl<OrderStatisticsDataMapper, StoreFlow> implements OrderStatisticsDataService {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java
index 7a2258c5..d45c5136 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java
@@ -1,12 +1,12 @@
 package cn.lili.modules.statistics.serviceimpl;
 
-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.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.CurrencyUtil;
-import cn.lili.config.properties.StatisticsProperties;
+import cn.lili.common.properties.StatisticsProperties;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.modules.member.entity.vo.MemberDistributionVO;
 import cn.lili.modules.member.service.MemberService;
@@ -38,7 +38,6 @@ import java.util.List;
  *
  * @author Chopper
  * @version v1.0
- * @Description:
  * @since v7.0
  * 2021/1/18 12:07
  */
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java
index 346ba2e9..1d5dc682 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.statistics.serviceimpl;
 
 import cn.lili.common.utils.DateUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.order.order.entity.dos.StoreFlow;
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
  * 退款订单统计业务层实现
  *
  * @author Bulbasaur
- * @date 2020/12/10 11:30
+ * @since 2020/12/10 11:30
  */
 @Service
 public class RefundOrderStatisticsServiceImpl extends ServiceImpl<RefundOrderStatisticsDataMapper, StoreFlow> implements RefundOrderStatisticsService {
diff --git a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java
index 76ed86e0..cd1bd333 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java
@@ -13,7 +13,7 @@ import java.util.Date;
  * 统计缓存后缀工具
  *
  * @author Chopper
- * @date 2021-01-15 15:30
+ * @since 2021-01-15 15:30
  */
 public class StatisticsDateUtil {
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsSuffix.java b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsSuffix.java
index fcd9a232..f6826cd9 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsSuffix.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsSuffix.java
@@ -6,7 +6,7 @@ import java.util.Calendar;
  * 统计缓存后缀工具
  *
  * @author Chopper
- * @date 2021-01-15 15:30
+ * @since 2021-01-15 15:30
  */
 public class StatisticsSuffix {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java
index 19f96dd9..4a7c97ca 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java
@@ -21,7 +21,7 @@ import java.util.Date;
  * 结算单
  *
  * @author Chopper
- * @date 2020/11/17 4:27 下午
+ * @since 2020/11/17 4:27 下午
  */
 @Data
 @Entity
@@ -40,7 +40,7 @@ public class Bill {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
@@ -71,7 +71,7 @@ public class Bill {
 
     @ApiModelProperty(value = "平台付款时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
     private Date payTime;
 
     @ApiModelProperty(value = "银行开户名")
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java
index ffdbc8b0..e6c3a3e6 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.store.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.store.entity.enums.FreightTemplateEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -15,7 +15,7 @@ import javax.validation.constraints.NotEmpty;
  * 运费模板
  *
  * @author Chopper
- * @date 2020/11/17 4:27 下午
+ * @since 2020/11/17 4:27 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java
index 8cbe4ef9..ead8f4ee 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.store.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.persistence.Table;
  * 运费模板子配置
  *
  * @author Chopper
- * @date 2020/11/17 4:27 下午
+ * @since 2020/11/17 4:27 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java
index 27c2c9be..845f839e 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.store.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.store.entity.dto.AdminStoreApplyDTO;
@@ -24,7 +24,7 @@ import java.util.Date;
  * 店铺
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @Data
 @Entity
@@ -46,7 +46,7 @@ public class Store extends BaseEntity {
     private String storeName;
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "店铺关闭时间")
     private Date storeEndTime;
 
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java
index b2b91782..587eee2b 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.store.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty;
  * 店铺自提点
  *
  * @author Bulbasaur
- * @date 2020/12/7 15:09
+ * @since 2020/12/7 15:09
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java
index c9af0c94..bc4f47c6 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java
@@ -28,7 +28,7 @@ import java.util.Date;
  * 店铺详细
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @Data
 @Entity
@@ -153,7 +153,7 @@ public class StoreDetail {
     private String settlementCycle;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "结算日", hidden = true)
     private Date settlementDay;
 
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java
index 25da3db9..4b6cdbc2 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.store.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 店铺商品分类
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java
index 814ce4d5..838375ae 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.store.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull;
  * 店铺-物流公司设置
  *
  * @author Chopper
- * @date 2020/11/17 8:01 下午
+ * @since 2020/11/17 8:01 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/AdminStoreApplyDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/AdminStoreApplyDTO.java
index dd95640c..8b9ac536 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/AdminStoreApplyDTO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/AdminStoreApplyDTO.java
@@ -11,7 +11,7 @@ import javax.validation.constraints.*;
  * 后台添加店铺信息DTO
  *
  * @author Bulbasaur
- * @date 2020/12/12 11:35
+ * @since 2020/12/12 11:35
  */
 @Data
 public class AdminStoreApplyDTO {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java
index 36e0c602..59690e4d 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * 结算单传输对象
  *
  * @author Chopper
- * @date 2020/11/17 4:26 下午
+ * @since 2020/11/17 4:26 下午
  */
 @Data
 public class BillDTO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java
index 3765f843..0a8533c9 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java
@@ -15,18 +15,18 @@ import org.springframework.format.annotation.DateTimeFormat;
  * 结算单搜索参数
  *
  * @author Chopper
- * @date 2021/3/17 6:08 下午
+ * @since 2021/3/17 6:08 下午
  */
 @Data
 public class BillSearchParams extends PageVO {
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "起始日期")
     private String startDate;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "结束日期")
     private String endDate;
 
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/FreightTemplateChildDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/FreightTemplateChildDTO.java
index ae6bc9b1..81aeb8eb 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/FreightTemplateChildDTO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/FreightTemplateChildDTO.java
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty;
  * 模版详细配置
  *
  * @author pikachu
- * @date 2018-08-22 15:10:51
+ * @since 2018-08-22 15:10:51
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreAfterSaleAddressDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreAfterSaleAddressDTO.java
index a6c48a8f..36e3c869 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreAfterSaleAddressDTO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreAfterSaleAddressDTO.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 店铺售后收件地址
  *
  * @author pikachu
- * @date 2020-08-22 15:10:51
+ * @since 2020-08-22 15:10:51
  */
 @Data
 public class StoreAfterSaleAddressDTO {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreBankDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreBankDTO.java
index ca1c5a32..2d03ec1d 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreBankDTO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreBankDTO.java
@@ -10,7 +10,7 @@ import javax.validation.constraints.Size;
  * 店铺-银行信息
  *
  * @author Bulbasaur
- * @date 2020/12/7 15:54
+ * @since 2020/12/7 15:54
  */
 @Data
 public class StoreBankDTO {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java
index 56d7c0e5..022538bb 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java
@@ -11,7 +11,7 @@ import javax.validation.constraints.*;
  * 店铺-公司信息
  *
  * @author Bulbasaur
- * @date 2020/12/7 15:50
+ * @since 2020/12/7 15:50
  */
 @Data
 public class StoreCompanyDTO {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java
index 824bf81e..d91129fe 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java
@@ -19,7 +19,7 @@ import javax.validation.constraints.Size;
  * 店铺修改DTO
  *
  * @author pikachu
- * @date 2020-08-22 15:10:51
+ * @since 2020-08-22 15:10:51
  */
 @Data
 public class StoreEditDTO {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreOtherInfoDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreOtherInfoDTO.java
index db5e79cd..ab6caa35 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreOtherInfoDTO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreOtherInfoDTO.java
@@ -11,7 +11,7 @@ import javax.validation.constraints.Size;
  * 店铺入驻其他信息
  *
  * @author Bulbasaur
- * @date 2020/12/7 16:16
+ * @since 2020/12/7 16:16
  */
 @Data
 public class StoreOtherInfoDTO {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettingDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettingDTO.java
index c24b13de..1bc28a93 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettingDTO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettingDTO.java
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty;
  * 店铺设置
  *
  * @author Bulbasaur
- * @date 2020/12/16 15:15
+ * @since 2020/12/16 15:15
  */
 @Data
 public class StoreSettingDTO {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettlementDay.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettlementDay.java
index eda6eba8..0302f69c 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettlementDay.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettlementDay.java
@@ -9,7 +9,7 @@ import java.util.Date;
  * 店铺结算日
  *
  * @author Chopper
- * @date 2021/2/20 3:24 下午
+ * @since 2021/2/20 3:24 下午
  */
 @Data
 public class StoreSettlementDay {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/enums/BillStatusEnum.java b/framework/src/main/java/cn/lili/modules/store/entity/enums/BillStatusEnum.java
index 38566428..348b5c1b 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/enums/BillStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/enums/BillStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.store.entity.enums;
  * 结算单状态
  *
  * @author Chopper
- * @date 2020/11/17 4:27 下午
+ * @since 2020/11/17 4:27 下午
  */
 public enum BillStatusEnum {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/enums/FreightTemplateEnum.java b/framework/src/main/java/cn/lili/modules/store/entity/enums/FreightTemplateEnum.java
index e1a1a404..6c14bd4c 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/enums/FreightTemplateEnum.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/enums/FreightTemplateEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.store.entity.enums;
  * 模版枚举
  *
  * @author Chopper
- * @date 2020/12/23 15:59
+ * @since 2020/12/23 15:59
  */
 
 public enum FreightTemplateEnum {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/enums/StoreStatusEnum.java b/framework/src/main/java/cn/lili/modules/store/entity/enums/StoreStatusEnum.java
index c50aef58..7beb62f9 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/enums/StoreStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/enums/StoreStatusEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.store.entity.enums;
  * 店铺状态枚举
  *
  * @author pikachu
- * @date 2020年3月07日 上午11:04:25
+ * @since 2020年3月07日 上午11:04:25
  */
 public enum StoreStatusEnum {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/BillListVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/BillListVO.java
index ab7d25f6..496d82ee 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/vos/BillListVO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/BillListVO.java
@@ -11,7 +11,7 @@ import java.util.Date;
  * 结算单VO
  *
  * @author pikachu
- * @date 2020年3月07日 上午11:04:25
+ * @since 2020年3月07日 上午11:04:25
  */
 @Data
 public class BillListVO {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/FreightTemplateVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/FreightTemplateVO.java
index fc9ab7a7..6b618ad9 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/vos/FreightTemplateVO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/FreightTemplateVO.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 店铺运费模板
  *
  * @author Bulbasaur
- * @date 2020/11/24 14:29
+ * @since 2020/11/24 14:29
  */
 @Data
 public class FreightTemplateVO extends FreightTemplate {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java
index f337722a..26b76abb 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 店铺基本信息DTO
  *
  * @author Bulbasaur
- * @date 2020/12/7 14:43
+ * @since 2020/12/7 14:43
  */
 @Data
 public class StoreBasicInfoVO {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreDetailVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreDetailVO.java
index 8fd392bd..d64fd3d7 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreDetailVO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreDetailVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 店铺详细VO
  *
  * @author pikachu
- * @date 2020-03-09 21:53:20
+ * @since 2020-03-09 21:53:20
  */
 @Data
 public class StoreDetailVO extends StoreEditDTO {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreGoodsLabelVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreGoodsLabelVO.java
index 5ab532fe..fd627c4b 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreGoodsLabelVO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreGoodsLabelVO.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 店铺商品分类VO
  *
  * @author Bulbasaur
- * @date 2020/12/11 16:18
+ * @since 2020/12/11 16:18
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreManagementCategoryVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreManagementCategoryVO.java
index 6d6aad3a..922d33d1 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreManagementCategoryVO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreManagementCategoryVO.java
@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
 /**
  * 店铺经营范围
  * @author Bulbasaur
- * @date 2020/12/11 16:18
+ * @since 2020/12/11 16:18
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java
index 1933841e..617332b9 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java
@@ -13,7 +13,7 @@ import java.io.Serializable;
  * 店铺搜索参数VO
  *
  * @author pikachu
- * @date 2020-03-07 17:02:05
+ * @since 2020-03-07 17:02:05
  */
 @Data
 public class StoreSearchParams implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreVO.java
index cf45db28..90980742 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreVO.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 店铺VO
  *
  * @author pikachu
- * @date 2020-03-07 17:02:05
+ * @since 2020-03-07 17:02:05
  */
 @Data
 public class StoreVO extends Store {
diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/BillMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/BillMapper.java
index 040ab507..d9bd6c76 100644
--- a/framework/src/main/java/cn/lili/modules/store/mapper/BillMapper.java
+++ b/framework/src/main/java/cn/lili/modules/store/mapper/BillMapper.java
@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Select;
  * 结算单数据处理层
  *
  * @author Chopper
- * @date 2020/11/17 4:27 下午
+ * @since 2020/11/17 4:27 下午
  */
 public interface BillMapper extends BaseMapper<Bill> {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateChildMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateChildMapper.java
index 6b1fba54..e4f939ae 100644
--- a/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateChildMapper.java
+++ b/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateChildMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 店铺配送子模板数据处理层
  *
  * @author Bulbasaur
- * @date 2020-03-07 09:18:56
+ * @since 2020-03-07 09:18:56
  */
 public interface FreightTemplateChildMapper extends BaseMapper<FreightTemplateChild> {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateMapper.java
index 2b612969..459d1dc3 100644
--- a/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateMapper.java
+++ b/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 店铺配送模板数据处理层
  *
  * @author Bulbasaur
- * @date 2020-03-07 09:18:56
+ * @since 2020-03-07 09:18:56
  */
 public interface FreightTemplateMapper extends BaseMapper<FreightTemplate> {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreAddressMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/StoreAddressMapper.java
index a0b7f31c..19b02bac 100644
--- a/framework/src/main/java/cn/lili/modules/store/mapper/StoreAddressMapper.java
+++ b/framework/src/main/java/cn/lili/modules/store/mapper/StoreAddressMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 店铺地址(自提点）数据处理层
  *
  * @author Bulbasaur
- * @date 2020-03-07 09:18:56
+ * @since 2020-03-07 09:18:56
  */
 public interface StoreAddressMapper extends BaseMapper<StoreAddress> {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java
index ba0d9cdd..39f827f9 100644
--- a/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java
+++ b/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java
@@ -16,7 +16,7 @@ import java.util.List;
  * 店铺详细数据处理层
  *
  * @author pikachu
- * @date 2020-03-07 09:18:56
+ * @since 2020-03-07 09:18:56
  */
 public interface StoreDetailMapper extends BaseMapper<StoreDetail> {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreGoodsLabelMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/StoreGoodsLabelMapper.java
index c59c46bc..addd2591 100644
--- a/framework/src/main/java/cn/lili/modules/store/mapper/StoreGoodsLabelMapper.java
+++ b/framework/src/main/java/cn/lili/modules/store/mapper/StoreGoodsLabelMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 店铺商品分类数据处理层
  *
  * @author pikachu
- * @date 2020-03-07 09:18:56
+ * @since 2020-03-07 09:18:56
  */
 public interface StoreGoodsLabelMapper extends BaseMapper<StoreGoodsLabel> {
 }
diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/StoreMapper.java
index af894ec2..ab9594f0 100644
--- a/framework/src/main/java/cn/lili/modules/store/mapper/StoreMapper.java
+++ b/framework/src/main/java/cn/lili/modules/store/mapper/StoreMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select;
  * 店铺数据处理层
  *
  * @author pikachu
- * @date2020-03-07 09:18:56
+ * @since2020-03-07 09:18:56
  */
 public interface StoreMapper extends BaseMapper<Store> {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/service/BillService.java b/framework/src/main/java/cn/lili/modules/store/service/BillService.java
index e626c98e..afba9cc1 100644
--- a/framework/src/main/java/cn/lili/modules/store/service/BillService.java
+++ b/framework/src/main/java/cn/lili/modules/store/service/BillService.java
@@ -17,7 +17,7 @@ import java.util.Date;
  * 结算单业务层
  *
  * @author Chopper
- * @date 2020/11/17 4:28 下午
+ * @since 2020/11/17 4:28 下午
  */
 @CacheConfig(cacheNames = "bill")
 public interface BillService extends IService<Bill> {
diff --git a/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateChildService.java b/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateChildService.java
index 18b0e81c..bb34cdf3 100644
--- a/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateChildService.java
+++ b/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateChildService.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 配送子模板业务层
  *
  * @author Bulbasaur
- * @date 2020-03-07 09:24:33
+ * @since 2020-03-07 09:24:33
  */
 public interface FreightTemplateChildService extends IService<FreightTemplateChild> {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java b/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java
index da6a020b..75225f99 100644
--- a/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java
+++ b/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 店铺地址（自提点）详细业务层
  *
  * @author Bulbasaur
- * @date 2020-03-07 09:24:33
+ * @since 2020-03-07 09:24:33
  */
 public interface FreightTemplateService extends IService<FreightTemplate> {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/service/StoreAddressService.java b/framework/src/main/java/cn/lili/modules/store/service/StoreAddressService.java
index e6dca6e4..2689a384 100644
--- a/framework/src/main/java/cn/lili/modules/store/service/StoreAddressService.java
+++ b/framework/src/main/java/cn/lili/modules/store/service/StoreAddressService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 店铺地址（自提点）详细业务层
  *
  * @author Bulbasaur
- * @date 2020-03-07 09:24:33
+ * @since 2020-03-07 09:24:33
  */
 public interface StoreAddressService extends IService<StoreAddress> {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java b/framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java
index dbc8b1af..dd2c518e 100644
--- a/framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java
+++ b/framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 店铺详细业务层
  *
  * @author pikachu
- * @date 2020-03-07 09:24:33
+ * @since 2020-03-07 09:24:33
  */
 public interface StoreDetailService extends IService<StoreDetail> {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/store/service/StoreGoodsLabelService.java b/framework/src/main/java/cn/lili/modules/store/service/StoreGoodsLabelService.java
index 2a886deb..6332fef0 100644
--- a/framework/src/main/java/cn/lili/modules/store/service/StoreGoodsLabelService.java
+++ b/framework/src/main/java/cn/lili/modules/store/service/StoreGoodsLabelService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 店铺商品分类业务层
  *
  * @author Bulbasaur
- * @date 2020-03-07 09:24:33
+ * @since 2020-03-07 09:24:33
  */
 public interface StoreGoodsLabelService extends IService<StoreGoodsLabel> {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/service/StoreService.java b/framework/src/main/java/cn/lili/modules/store/service/StoreService.java
index ca70226f..0fa2ab0b 100644
--- a/framework/src/main/java/cn/lili/modules/store/service/StoreService.java
+++ b/framework/src/main/java/cn/lili/modules/store/service/StoreService.java
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 店铺业务层
  *
  * @author pikachu
- * @date 2020/11/18 11:45 上午
+ * @since 2020/11/18 11:45 上午
  */
 public interface StoreService extends IService<Store> {
 
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
index 6dfe5fdd..986f2734 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
@@ -7,7 +7,7 @@ import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.CurrencyUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
@@ -38,7 +38,7 @@ import java.util.Date;
  * 结算单业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 4:28 下午
+ * @since 2020/11/17 4:28 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java
index e3ea52be..12a7c64b 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java
@@ -15,7 +15,7 @@ import java.util.List;
  * 配送子模板业务层实现
  *
  * @author Bulbasaur
- * @date 2020-03-07 09:24:33
+ * @since 2020-03-07 09:24:33
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java
index 509b0c81..f92bc25f 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java
@@ -1,13 +1,13 @@
 package cn.lili.modules.store.serviceimpl;
 
-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.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.store.entity.dos.FreightTemplate;
 import cn.lili.modules.store.entity.dos.FreightTemplateChild;
@@ -31,7 +31,7 @@ import java.util.List;
  * 店铺运费模板业务层实现
  *
  * @author Bulbasaur
- * @date 2020/11/22 16:00
+ * @since 2020/11/22 16:00
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java
index 99f0c8a8..8eb78866 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java
@@ -2,7 +2,7 @@ package cn.lili.modules.store.serviceimpl;
 
 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.vo.PageVO;
 import cn.lili.modules.store.entity.dos.StoreAddress;
 import cn.lili.modules.store.mapper.StoreAddressMapper;
@@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 店铺地址（自提点）业务层实现
  *
  * @author Bulbasaur
- * @date 2020/11/22 16:00
+ * @since 2020/11/22 16:00
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java
index 70b50c23..a8b54127 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java
@@ -30,7 +30,7 @@ import java.util.List;
  * 店铺详细业务层实现
  *
  * @author pikachu
- * @date 2020-03-07 16:18:56
+ * @since 2020-03-07 16:18:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java
index 95cb3090..8e379368 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.store.serviceimpl;
 
-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.context.UserContext;
 import cn.lili.modules.store.entity.dos.StoreGoodsLabel;
@@ -24,7 +24,7 @@ import java.util.List;
  * 店铺商品分类业务层实现
  *
  * @author Bulbasaur
- * @date 2020-03-07 16:18:56
+ * @since 2020-03-07 16:18:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
index 9240fe9d..60614ced 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
@@ -6,7 +6,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.BeanUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.dos.Goods;
@@ -44,7 +44,7 @@ import java.util.Optional;
  * 店铺业务层实现
  *
  * @author pikachu
- * @date 2020-03-07 16:18:56
+ * @since 2020-03-07 16:18:56
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java b/framework/src/main/java/cn/lili/modules/system/aspect/annotation/DemoSite.java
similarity index 71%
rename from framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java
rename to framework/src/main/java/cn/lili/modules/system/aspect/annotation/DemoSite.java
index eb2d8769..9de79890 100644
--- a/framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java
+++ b/framework/src/main/java/cn/lili/modules/system/aspect/annotation/DemoSite.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.system.aspect;
+package cn.lili.modules.system.aspect.annotation;
 
 import java.lang.annotation.*;
 
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
  * 演示站点注解
  *
  * @author Bulbasaur
- * @date: 2021/7/9 1:40 上午
+ * @since: 2021/7/9 1:40 上午
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/framework/src/main/java/cn/lili/common/aop/syslog/annotation/SystemLogPoint.java b/framework/src/main/java/cn/lili/modules/system/aspect/annotation/SystemLogPoint.java
similarity index 89%
rename from framework/src/main/java/cn/lili/common/aop/syslog/annotation/SystemLogPoint.java
rename to framework/src/main/java/cn/lili/modules/system/aspect/annotation/SystemLogPoint.java
index 1928d019..9718fd6f 100644
--- a/framework/src/main/java/cn/lili/common/aop/syslog/annotation/SystemLogPoint.java
+++ b/framework/src/main/java/cn/lili/modules/system/aspect/annotation/SystemLogPoint.java
@@ -1,4 +1,4 @@
-package cn.lili.common.aop.syslog.annotation;
+package cn.lili.modules.system.aspect.annotation;
 
 import java.lang.annotation.*;
 
diff --git a/framework/src/main/java/cn/lili/modules/system/aspect/DemoInterceptor.java b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/DemoInterceptor.java
similarity index 69%
rename from framework/src/main/java/cn/lili/modules/system/aspect/DemoInterceptor.java
rename to framework/src/main/java/cn/lili/modules/system/aspect/interceptor/DemoInterceptor.java
index ce0ffce7..3a6fc434 100644
--- a/framework/src/main/java/cn/lili/modules/system/aspect/DemoInterceptor.java
+++ b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/DemoInterceptor.java
@@ -1,8 +1,9 @@
-package cn.lili.modules.system.aspect;
+package cn.lili.modules.system.aspect.interceptor;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.config.properties.SystemSetting;
+import cn.lili.common.properties.SystemSettingProperties;
+import cn.lili.modules.system.aspect.annotation.DemoSite;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,11 +22,11 @@ import org.springframework.stereotype.Component;
 public class DemoInterceptor {
 
     @Autowired
-    private SystemSetting systemSetting;
+    private SystemSettingProperties systemSettingProperties;
 
     @Before("@annotation(demoSite)")
     public void doAfter(DemoSite demoSite) {
-        if (systemSetting.getIsDemoSite()) {
+        if (systemSettingProperties.getIsDemoSite()) {
             throw new ServiceException(ResultCode.DEMO_SITE_EXCEPTION);
         }
     }
diff --git a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/SystemLogAspect.java
similarity index 96%
rename from framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java
rename to framework/src/main/java/cn/lili/modules/system/aspect/interceptor/SystemLogAspect.java
index aec4771b..53412601 100644
--- a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java
+++ b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/SystemLogAspect.java
@@ -1,6 +1,6 @@
-package cn.lili.common.aop.syslog.interceptor;
+package cn.lili.modules.system.aspect.interceptor;
 
-import cn.lili.common.aop.syslog.annotation.SystemLogPoint;
+import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
@@ -8,7 +8,7 @@ import cn.lili.common.utils.IpHelper;
 import cn.lili.common.utils.SpelUtil;
 import cn.lili.common.utils.ThreadPoolUtil;
 import cn.lili.modules.permission.entity.vo.SystemLogVO;
-import cn.lili.modules.connect.util.IpUtils;
+import cn.lili.common.utils.IpUtils;
 import cn.lili.modules.permission.service.SystemLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -51,7 +51,7 @@ public class SystemLogAspect {
     /**
      * Controller层切点,注解方式
      */
-    @Pointcut("@annotation(cn.lili.common.aop.syslog.annotation.SystemLogPoint)")
+    @Pointcut("@annotation(cn.lili.modules.system.aspect.annotation.SystemLogPoint)")
     public void controllerAspect() {
 
     }
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java
index b4619a59..4e183c98 100755
--- a/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java
@@ -23,7 +23,7 @@ import java.util.Date;
  * app历史版本维护
  *
  * @author zh
- * @date 2020-06-20 09:29:19
+ * @since 2020-06-20 09:29:19
  */
 @Data
 @Entity
@@ -43,7 +43,7 @@ public class AppVersion {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
@@ -74,7 +74,7 @@ public class AppVersion {
     @ApiModelProperty(value = "类型")
     private String type;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "版本更新时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date versionUpdateDate;
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java
index 324aaf6d..03559f7a 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.system.entity.dos;
 
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.system.entity.vo.InstantDeliveryVO;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.google.gson.Gson;
@@ -19,7 +19,7 @@ import javax.persistence.Table;
  * 即时配送
  *
  * @author pikachu
- * @date 2020/12/01 15:58
+ * @since 2020/12/01 15:58
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java
index 0eef125b..e06e996b 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java
@@ -27,7 +27,7 @@ import java.util.Date;
  * 即时配送日志
  *
  * @author pikachu
- * @date 2020/12/01 15:58
+ * @since 2020/12/01 15:58
  */
 
 @Data
@@ -48,7 +48,7 @@ public class InstantDeliveryLog {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java
index bdb99e35..4ee34140 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.system.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty;
  * 物流公司设置
  *
  * @author Chopper
- * @date 2020/11/17 8:01 下午
+ * @since 2020/11/17 8:01 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java
index 2b52d99e..e5882df3 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.system.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
 /**
  * 行政地区
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java
index dca87da8..1854a80a 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.system.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java
index 6bc02c3a..13916af1 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.system.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import javax.persistence.Table;
 /**
  * 服务订阅消息
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java
index d1d71421..daed12a1 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.system.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +13,7 @@ import javax.persistence.Table;
 /**
  * 设置
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java
index 9acdfb9a..304823aa 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.system.entity.dos;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import cn.lili.modules.system.entity.enums.VerificationSourceEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -13,7 +13,7 @@ import javax.persistence.Table;
 /**
  * 验证码资源维护
  * @author Chopper
- * @date 2021/1/30 4:13 下午
+ * @since 2021/1/30 4:13 下午
  */
 @Data
 @Entity
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java
index 8f2a5026..98b8cacc 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
  * 基础设置
  *
  * @author Chopper
- * @date 2020/11/17 7:58 下午
+ * @since 2020/11/17 7:58 下午
  */
 @Data
 public class BaseSetting implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/DistributionSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/DistributionSetting.java
index 289d1b84..3a8bcbf4 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/DistributionSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/DistributionSetting.java
@@ -8,7 +8,7 @@ import java.io.Serializable;
  * 分销配置
  *
  * @author Chopper
- * @date 2020/12/23 18:35
+ * @since 2020/12/23 18:35
  */
 @Data
 public class DistributionSetting implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/EmailSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/EmailSetting.java
index c7657318..3e969302 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/EmailSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/EmailSetting.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
  * 邮箱设置
  *
  * @author Chopper
- * @date 2020/11/26 15:58
+ * @since 2020/11/26 15:58
  */
 @Data
 public class EmailSetting implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/ExperienceSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/ExperienceSetting.java
index be6d0a72..69e5aa64 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/ExperienceSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/ExperienceSetting.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
  * 经验值设置
  *
  * @author Bulbasaur
- * @date: 2021/5/16 11:10 下午
+ * @since: 2021/5/16 11:10 下午
  */
 @Data
 public class ExperienceSetting implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/GoodsSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/GoodsSetting.java
index ed6c26d4..ba2c888a 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/GoodsSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/GoodsSetting.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
  * 商品设置
  *
  * @author Chopper
- * @date 2020/11/17 7:58 下午
+ * @since 2020/11/17 7:58 下午
  */
 @Data
 public class GoodsSetting implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/KuaidiSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/KuaidiSetting.java
index 3b300b02..c06d5676 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/KuaidiSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/KuaidiSetting.java
@@ -8,7 +8,7 @@ import java.io.Serializable;
  * 快递设置
  *
  * @author Chopper
- * @date 2020-03-10 10:04 上午
+ * @since 2020-03-10 10:04 上午
  */
 @Data
 public class KuaidiSetting implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java
index bc2d20c5..7187c2ba 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
  * 订单设置
  *
  * @author Chopper
- * @date 2020/11/17 7:59 下午
+ * @since 2020/11/17 7:59 下午
  */
 @Data
 public class OrderSetting implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java
index ef0414c0..04eb6a40 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java
@@ -8,7 +8,7 @@ import java.io.Serializable;
  * OSS设置
  *
  * @author Chopper
- * @date 2020/11/26 15:50
+ * @since 2020/11/26 15:50
  */
 
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSetting.java
index 15d4c46b..0f32c8a1 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSetting.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 积分设置
  *
  * @author Chopper
- * @date 2020/11/17 7:59 下午
+ * @since 2020/11/17 7:59 下午
  */
 @Data
 public class PointSetting implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSettingItem.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSettingItem.java
index 5759d6e4..31a7b7da 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSettingItem.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSettingItem.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * 积分签到设置
  *
  * @author Chopper
- * @date 2021-02-26 11:48
+ * @since 2021-02-26 11:48
  */
 @Data
 public class PointSettingItem implements Comparable<PointSettingItem> {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/SeckillSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/SeckillSetting.java
index d5c0075e..df4082a4 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/SeckillSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/SeckillSetting.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * 秒杀活动设置
  *
  * @author Bulbasaur
- * @date: 2021/5/24 3:27 下午
+ * @since: 2021/5/24 3:27 下午
  */
 @Data
 public class SeckillSetting implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/SmsSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/SmsSetting.java
index ca5281a2..683a0663 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/SmsSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/SmsSetting.java
@@ -8,7 +8,7 @@ import java.io.Serializable;
  * 短信配置
  * 这里在前台不做调整，方便客户直接把服务商的内容配置在我们平台
  * @author Chopper
- * @date 2020/11/30 15:23
+ * @since 2020/11/30 15:23
  */
 @Data
 public class SmsSetting implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/WithdrawalSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/WithdrawalSetting.java
index baffc079..932bbab4 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/WithdrawalSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/WithdrawalSetting.java
@@ -8,7 +8,7 @@ import java.io.Serializable;
  * 提现配置
  *
  * @author pikachu
- * @date 2020/11/30 15:23
+ * @since 2020/11/30 15:23
  */
 @Data
 public class WithdrawalSetting implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/QQConnectSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/QQConnectSetting.java
index fb0ed185..ceafe10e 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/QQConnectSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/QQConnectSetting.java
@@ -9,7 +9,7 @@ import java.util.List;
  * QQ联合登录设置
  *
  * @author Chopper
- * @date 2020/11/17 7:59 下午
+ * @since 2020/11/17 7:59 下午
  */
 @Data
 public class QQConnectSetting {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/WechatConnectSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/WechatConnectSetting.java
index 9d4ddb64..577f0a88 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/WechatConnectSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/WechatConnectSetting.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 微信设置
  *
  * @author Chopper
- * @date 2020/11/17 8:00 下午
+ * @since 2020/11/17 8:00 下午
  */
 @Data
 public class WechatConnectSetting {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/QQConnectSettingItem.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/QQConnectSettingItem.java
index 7a9da594..ecc0cd22 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/QQConnectSettingItem.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/QQConnectSettingItem.java
@@ -7,7 +7,7 @@ import lombok.Data;
  * QQ联合登录具体配置
  *
  * @author Chopper
- * @date 2020/11/17 7:59 下午
+ * @since 2020/11/17 7:59 下午
  */
 @Data
 public class QQConnectSettingItem {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/WechatConnectSettingItem.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/WechatConnectSettingItem.java
index 9fdbc17f..68aff383 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/WechatConnectSettingItem.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/WechatConnectSettingItem.java
@@ -6,7 +6,7 @@ import lombok.Data;
  * 微信设置
  *
  * @author Chopper
- * @date 2020/11/17 8:00 下午
+ * @since 2020/11/17 8:00 下午
  */
 @Data
 public class WechatConnectSettingItem {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/AlipayPaymentSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/AlipayPaymentSetting.java
index eeae1694..f3bfe460 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/AlipayPaymentSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/AlipayPaymentSetting.java
@@ -7,7 +7,7 @@ import lombok.experimental.Accessors;
  * 支付宝支付设置
  *
  * @author Chopper
- * @date 2020-12-02 10:09
+ * @since 2020-12-02 10:09
  */
 @Data
 @Accessors(chain = true)
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java
index ed86b3ee..2a5a3128 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java
@@ -14,7 +14,7 @@ import java.util.List;
  * 支持的支付方式
  *
  * @author Chopper
- * @date 2021-01-26 15:52
+ * @since 2021-01-26 15:52
  */
 @Data
 @Accessors(chain = true)
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java
index 380fce0f..b1aa7a39 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java
@@ -7,7 +7,7 @@ import lombok.experimental.Accessors;
  * 微信支付设置
  *
  * @author Chopper
- * @date 2020-12-02 10:08
+ * @since 2020-12-02 10:08
  */
 @Data
 @Accessors(chain = true)
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/AppType.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/AppType.java
index 86da8abe..7312be6f 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/enums/AppType.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/AppType.java
@@ -5,7 +5,7 @@ package cn.lili.modules.system.entity.enums;
  * app类型 安卓 IOS
  *
  * @author Chopper
- * @date 2020/9/11 17:03
+ * @since 2020/9/11 17:03
  */
 public enum AppType {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/InstantDeliveryUrl.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/InstantDeliveryUrl.java
index dbd5e25b..bee60f65 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/enums/InstantDeliveryUrl.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/InstantDeliveryUrl.java
@@ -8,7 +8,7 @@ import lombok.Setter;
  * 即时配送url接口地址
  *
  * @author pikachu
- * @date 2020/9/11 17:03
+ * @since 2020/9/11 17:03
  */
 public enum InstantDeliveryUrl {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java
index 23c8fbda..727f1a83 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java
@@ -4,7 +4,7 @@ package cn.lili.modules.system.entity.enums;
  * 系统设置常量
  *
  * @author Chopper
- * @date 2020/9/11 17:03
+ * @since 2020/9/11 17:03
  */
 public enum SettingEnum {
     //基础配置
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java
index a107cf7f..43617de3 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java
@@ -5,7 +5,7 @@ package cn.lili.modules.system.entity.enums;
  * 验证码资源枚举
  *
  * @author Chopper
- * @date 2021/1/26 15:55
+ * @since 2021/1/26 15:55
  */
 public enum VerificationSourceEnum {
     /**
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/ConfigItem.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/ConfigItem.java
index 598035d7..c0659173 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/ConfigItem.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/plugin/ConfigItem.java
@@ -10,7 +10,6 @@ import java.util.List;
  *
  * @author pikachu
  * @version v4.0
- * @Description:
  * @since 2020/12/01 15:58
  */
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/InstantDeliveryPlugin.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/InstantDeliveryPlugin.java
index 298ef77f..b0e048a5 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/InstantDeliveryPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/InstantDeliveryPlugin.java
@@ -14,7 +14,6 @@ import java.util.Map;
  *
  * @author pikachu
  * @version v1.0
- * @Description:
  * @since 2020/12/01 15:58
  */
 public interface InstantDeliveryPlugin {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/DadaPlugin.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/DadaPlugin.java
index a0d29e2b..cf24dc5c 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/DadaPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/DadaPlugin.java
@@ -34,7 +34,6 @@ import java.util.Map;
  *
  * @author pikachu
  * @version v4.0
- * @Description:
  * @since 2020/12/01 15:58
  */
 @Slf4j
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/vo/DdOrderBackVO.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/vo/DdOrderBackVO.java
index 4ce90bb1..6bd9e9f5 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/vo/DdOrderBackVO.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/vo/DdOrderBackVO.java
@@ -10,7 +10,7 @@ import lombok.ToString;
 /**
  * @author 86133
  * @description: pikachu
- * @date 2020/9/1215:35
+ * @since 2020/9/1215:35
  */
 @ApiModel(description = "达达订单回调参数")
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/CityResult.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/CityResult.java
index 07d45bbc..29c4bf2e 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/vo/CityResult.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/CityResult.java
@@ -6,7 +6,7 @@ import lombok.Data;
  * 获取城市结果
  *
  * @author pikachu
- * @date 18/6/27 上午9:28
+ * @since 18/6/27 上午9:28
  */
 @Data
 public class CityResult {
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryResultVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryResultVO.java
index 9b774068..b9542c24 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryResultVO.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryResultVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 达达返回值
  *
  * @author Chopper
- * @date 2020/9/12 14:05
+ * @since 2020/9/12 14:05
  */
 @ApiModel
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/RegionVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/RegionVO.java
index e2a60641..21870879 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/vo/RegionVO.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/RegionVO.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 地区VO
  *
  * @author Chopper
- * @date 2021-02-08 09:49
+ * @since 2021-02-08 09:49
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java
index 9ae3fd04..1c7f1cbf 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.system.entity.vo;
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * 物流公司设置
  *
  * @author Chopper
- * @date 2020/11/17 8:01 下午
+ * @since 2020/11/17 8:01 下午
  */
 
 @Data
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/Traces.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/Traces.java
index 1052be21..99ea005e 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/vo/Traces.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/Traces.java
@@ -11,7 +11,7 @@ import java.util.Map;
  * 物流信息
  *
  * @author Chopper
- * @date 2021/1/18 3:28 下午
+ * @since 2021/1/18 3:28 下午
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java
index 02633434..a6b96721 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 验证码资源缓存VO
  *
  * @author Chopper
- * @date 2020/12/2 17:50
+ * @since 2020/12/2 17:50
  */
 @Data
 public class VerificationVO implements Serializable {
diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/AppVersionMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/AppVersionMapper.java
index 62dbad5d..a8a2be17 100644
--- a/framework/src/main/java/cn/lili/modules/system/mapper/AppVersionMapper.java
+++ b/framework/src/main/java/cn/lili/modules/system/mapper/AppVersionMapper.java
@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Select;
  * app版本控制数据处理层
  *
  * @author Chopper
- * @date 2020/11/17 8:01 下午
+ * @since 2020/11/17 8:01 下午
  */
 public interface AppVersionMapper extends BaseMapper<AppVersion> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryLogMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryLogMapper.java
index 979588be..05b7d3ab 100644
--- a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryLogMapper.java
+++ b/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryLogMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 即时配送日志数据处理层
  *
  * @author pikachu
- * @date 2020/11/17 8:01 下午
+ * @since 2020/11/17 8:01 下午
  */
 public interface InstantDeliveryLogMapper extends BaseMapper<InstantDeliveryLog> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryMapper.java
index 563c4d36..6c71025b 100644
--- a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryMapper.java
+++ b/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 即时配送数据处理层
  *
  * @author pikachu
- * @date 2020/11/17 8:01 下午
+ * @since 2020/11/17 8:01 下午
  */
 public interface InstantDeliveryMapper extends BaseMapper<InstantDelivery> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/LogisticsMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/LogisticsMapper.java
index 677820ae..676bdf22 100644
--- a/framework/src/main/java/cn/lili/modules/system/mapper/LogisticsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/system/mapper/LogisticsMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 物流公司数据处理层
  *
  * @author Chopper
- * @date 2020/11/17 8:01 下午
+ * @since 2020/11/17 8:01 下午
  */
 public interface LogisticsMapper extends BaseMapper<Logistics> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java
index 809f8fae..25a1bb28 100644
--- a/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java
+++ b/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 行政地区数据处理层
  *
  * @author Chopper
- * @date 2020/12/8 9:46
+ * @since 2020/12/8 9:46
  */
 public interface RegionMapper extends BaseMapper<Region> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/SensitiveWordsMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/SensitiveWordsMapper.java
index 94091bfb..f5307c45 100644
--- a/framework/src/main/java/cn/lili/modules/system/mapper/SensitiveWordsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/system/mapper/SensitiveWordsMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 敏感词数据处理层
  * @author Bulbasaur
- * @date 2020/11/17 8:01 下午
+ * @since 2020/11/17 8:01 下午
  */
 public interface SensitiveWordsMapper extends BaseMapper<SensitiveWords> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/ServiceNoticeMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/ServiceNoticeMapper.java
index 433cf38e..a02491af 100644
--- a/framework/src/main/java/cn/lili/modules/system/mapper/ServiceNoticeMapper.java
+++ b/framework/src/main/java/cn/lili/modules/system/mapper/ServiceNoticeMapper.java
@@ -6,7 +6,7 @@ import cn.lili.modules.system.entity.dos.ServiceNotice;
 /**
  * 服务订阅消息数据处理层
  * @author Chopper
- * @date 2020/11/17 8:01 下午
+ * @since 2020/11/17 8:01 下午
  */
 public interface ServiceNoticeMapper extends BaseMapper<ServiceNotice> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/SettingMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/SettingMapper.java
index e1c8bba5..40b966c7 100644
--- a/framework/src/main/java/cn/lili/modules/system/mapper/SettingMapper.java
+++ b/framework/src/main/java/cn/lili/modules/system/mapper/SettingMapper.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 配置数据处理层
  * @author Chopper
- * @date 2020/11/17 8:01 下午
+ * @since 2020/11/17 8:01 下午
  */
 public interface SettingMapper extends BaseMapper<Setting> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java
index 56afb49e..3c5e8a0a 100644
--- a/framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java
+++ b/framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 物流公司数据处理层
  *
  * @author Chopper
- * @date 2020/11/17 8:01 下午
+ * @since 2020/11/17 8:01 下午
  */
 public interface StoreLogisticsMapper extends BaseMapper<StoreLogistics> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java
index 13fa054f..f11b3bde 100644
--- a/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java
+++ b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 验证码资源维护数据处理层
  *
  * @author Chopper
- * @date 2021/1/30 4:17 下午
+ * @since 2021/1/30 4:17 下午
  */
 public interface VerificationSourceMapper extends BaseMapper<VerificationSource> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java b/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java
index 4952123a..430eb6df 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * app版本业务层
  *
  * @author Chopper
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 public interface AppVersionService extends IService<AppVersion> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryLogService.java b/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryLogService.java
index fd4e5ce1..45fd3c26 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryLogService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryLogService.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 即时配送日志业务层
  *
  * @author Chopper
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 public interface InstantDeliveryLogService extends IService<InstantDeliveryLog> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryService.java b/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryService.java
index 97f983f4..e0b5d9d9 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryService.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 即时配送业务层
  *
  * @author Chopper
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 public interface InstantDeliveryService extends IService<InstantDelivery> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/service/LogisticsService.java b/framework/src/main/java/cn/lili/modules/system/service/LogisticsService.java
index ba46d90d..b3f1c16e 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/LogisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/LogisticsService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 物流公司业务层
  *
  * @author Chopper
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 public interface LogisticsService extends IService<Logistics> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/service/RegionService.java b/framework/src/main/java/cn/lili/modules/system/service/RegionService.java
index dc71e82e..53261699 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/RegionService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/RegionService.java
@@ -14,7 +14,7 @@ import java.util.Map;
  * 行政地区业务层
  *
  * @author Chopper
- * @date 2020/12/2 14:14
+ * @since 2020/12/2 14:14
  */
 @CacheConfig(cacheNames = "{regions}")
 public interface RegionService extends IService<Region> {
diff --git a/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java b/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java
index 9ef46972..239fa94d 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 敏感词业务层
  *
  * @author Bulbasaur
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 public interface SensitiveWordsService extends IService<SensitiveWords> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/service/ServiceNoticeService.java b/framework/src/main/java/cn/lili/modules/system/service/ServiceNoticeService.java
index f23d7753..c430433f 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/ServiceNoticeService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/ServiceNoticeService.java
@@ -7,7 +7,7 @@ import cn.lili.modules.system.entity.dos.ServiceNotice;
  * 服务订阅消息业务层
  *
  * @author Chopper
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 public interface ServiceNoticeService extends IService<ServiceNotice> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/service/SettingService.java b/framework/src/main/java/cn/lili/modules/system/service/SettingService.java
index 50f33937..9e1fc0ea 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/SettingService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/SettingService.java
@@ -10,7 +10,7 @@ import org.springframework.cache.annotation.Cacheable;
  * 配置业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:46 下午
+ * @since 2020/11/17 3:46 下午
  */
 @CacheConfig(cacheNames = "{setting}")
 public interface SettingService extends IService<Setting> {
diff --git a/framework/src/main/java/cn/lili/modules/system/service/StoreLogisticsService.java b/framework/src/main/java/cn/lili/modules/system/service/StoreLogisticsService.java
index 8d4e39be..5c637997 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/StoreLogisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/StoreLogisticsService.java
@@ -10,7 +10,7 @@ import java.util.List;
  * 店铺-物流公司业务层
  *
  * @author Chopper
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 public interface StoreLogisticsService extends IService<StoreLogistics> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java b/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java
index 4dc5b478..88542976 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.system.service;
 
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.CachePrefix;
 import cn.lili.modules.system.entity.dos.VerificationSource;
 import cn.lili.modules.system.entity.vo.VerificationVO;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 验证码资源维护 业务层
  *
  * @author Chopper
- * @date 2020/11/17 3:44 下午
+ * @since 2020/11/17 3:44 下午
  */
 public interface VerificationSourceService extends IService<VerificationSource> {
 
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java
index f4966910..98e79b7b 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java
@@ -16,7 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
  * APP版本控制业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java
index 942f853b..3bf4ec01 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java
@@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 即时配送业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 @Service
 public class InstantDeliveryLogServiceImpl extends ServiceImpl<InstantDeliveryLogMapper, InstantDeliveryLog> implements InstantDeliveryLogService {
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java
index 0939156c..aaf2b1c4 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.system.serviceimpl;
 
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.system.entity.dos.InstantDelivery;
 import cn.lili.modules.system.entity.plugin.InstantDelivery.InstantDeliveryPlugin;
@@ -27,7 +27,7 @@ import java.util.Map;
  * 即时配送业务层实现
  *
  * @author pikachu
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java
index 9d9e0f2f..80e52cfc 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java
@@ -34,7 +34,7 @@ import java.util.Map;
  * 物流公司业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 @Slf4j
 @Service
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java
index 896f8489..a6b5708e 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.system.serviceimpl;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.HttpClientUtils;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
@@ -24,7 +24,7 @@ import java.util.*;
  * 行政地区业务层实现
  *
  * @author Chopper
- * @date 2020/12/2 11:11
+ * @since 2020/12/2 11:11
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java
index 875fa4c3..9a16a185 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java
@@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 敏感词业务层实现
  *
  * @author Bulbasaur
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 @Service
 public class SensitiveWordsServiceImpl extends ServiceImpl<SensitiveWordsMapper, SensitiveWords> implements SensitiveWordsService {
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java
index 7123df2d..72f8677c 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java
@@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 /**
  * 服务订阅消息业务层实现
  * @author Chopper
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 @Service
 public class ServiceNoticeServiceImpl extends ServiceImpl<ServiceNoticeMapper, ServiceNotice> implements ServiceNoticeService {
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java
index ca8517b8..bbe09e56 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java
@@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
  * 配置业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:52 下午
+ * @since 2020/11/17 3:52 下午
  */
 @Service
 public class SettingServiceImpl extends ServiceImpl<SettingMapper, Setting> implements SettingService {
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java
index bc99bd52..f25ee47b 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java
@@ -17,7 +17,7 @@ import java.util.List;
  * 物流公司业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 8:02 下午
+ * @since 2020/11/17 8:02 下午
  */
 @Service
 public class StoreLogisticsServiceImpl extends ServiceImpl<StoreLogisticsMapper, StoreLogistics> implements StoreLogisticsService {
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java
index dd7f0b39..37395abf 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java
@@ -1,6 +1,6 @@
 package cn.lili.modules.system.serviceimpl;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.modules.system.entity.dos.VerificationSource;
 import cn.lili.modules.system.entity.enums.VerificationSourceEnum;
 import cn.lili.modules.system.entity.vo.VerificationVO;
@@ -18,7 +18,7 @@ import java.util.List;
  * 验证码资源维护 业务层实现
  *
  * @author Chopper
- * @date 2020/11/17 3:48 下午
+ * @since 2020/11/17 3:48 下午
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java b/framework/src/main/java/cn/lili/modules/system/sms/AliSmsUtil.java
similarity index 97%
rename from framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java
rename to framework/src/main/java/cn/lili/modules/system/sms/AliSmsUtil.java
index ebc0e2f9..1cbdf9b3 100644
--- a/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java
+++ b/framework/src/main/java/cn/lili/modules/system/sms/AliSmsUtil.java
@@ -1,4 +1,4 @@
-package cn.lili.common.sms;
+package cn.lili.modules.system.sms;
 
 import cn.lili.modules.message.entity.dos.SmsSign;
 import cn.lili.modules.message.entity.dos.SmsTemplate;
@@ -8,7 +8,6 @@ import java.util.Map;
 /**
  * @author Chopper
  * @version v4.1
- * @Description:
  * @since 2021/2/1 6:05 下午
  */
 public interface AliSmsUtil {
diff --git a/framework/src/main/java/cn/lili/common/sms/SmsUtil.java b/framework/src/main/java/cn/lili/modules/system/sms/SmsUtil.java
similarity index 92%
rename from framework/src/main/java/cn/lili/common/sms/SmsUtil.java
rename to framework/src/main/java/cn/lili/modules/system/sms/SmsUtil.java
index 2f2cf4a2..de177e12 100644
--- a/framework/src/main/java/cn/lili/common/sms/SmsUtil.java
+++ b/framework/src/main/java/cn/lili/modules/system/sms/SmsUtil.java
@@ -1,6 +1,6 @@
-package cn.lili.common.sms;
+package cn.lili.modules.system.sms;
 
-import cn.lili.common.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.enums.VerificationEnums;
 
 import java.util.List;
 import java.util.Map;
@@ -10,7 +10,6 @@ import java.util.Map;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/11/30 15:44
  */
 public interface SmsUtil {
diff --git a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java
similarity index 93%
rename from framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java
rename to framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java
index adf9c124..ad7776b4 100644
--- a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java
+++ b/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java
@@ -1,19 +1,19 @@
-package cn.lili.common.sms.impl;
+package cn.lili.modules.system.sms.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-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.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.sms.AliSmsUtil;
-import cn.lili.common.sms.SmsUtil;
+import cn.lili.modules.system.sms.AliSmsUtil;
+import cn.lili.modules.system.sms.SmsUtil;
 import cn.lili.common.utils.CommonUtil;
-import cn.lili.common.verification.enums.VerificationEnums;
-import cn.lili.config.properties.SmsTemplateSetting;
-import cn.lili.config.properties.SystemSetting;
-import cn.lili.modules.connect.util.Base64Utils;
+import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.common.properties.SmsTemplateProperties;
+import cn.lili.common.properties.SystemSettingProperties;
+import cn.lili.common.utils.Base64Utils;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
 import cn.lili.modules.message.entity.dos.SmsSign;
@@ -40,7 +40,6 @@ import java.util.Map;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/11/30 15:44
  */
 @Component
@@ -55,10 +54,10 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
     private MemberService memberService;
 
     @Autowired
-    private SmsTemplateSetting smsTemplateSetting;
+    private SmsTemplateProperties smsTemplateProperties;
 
     @Autowired
-    private SystemSetting systemSetting;
+    private SystemSettingProperties systemSettingProperties;
 
     @Override
     public void sendSmsCode(String mobile, VerificationEnums verificationEnums, String uuid) {
@@ -84,17 +83,17 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
         switch (verificationEnums) {
             //登录
             case LOGIN: {
-                templateCode = smsTemplateSetting.getLOGIN();
+                templateCode = smsTemplateProperties.getLOGIN();
                 break;
             }
             //注册
             case REGISTER: {
-                templateCode = smsTemplateSetting.getREGISTER();
+                templateCode = smsTemplateProperties.getREGISTER();
                 break;
             }
             //找回密码
             case FIND_USER: {
-                templateCode = smsTemplateSetting.getFIND_USER();
+                templateCode = smsTemplateProperties.getFIND_USER();
                 break;
             }
             //修改密码
@@ -105,7 +104,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
                 }
                 //更新为用户最新手机号
                 mobile = member.getMobile();
-                templateCode = smsTemplateSetting.getUPDATE_PASSWORD();
+                templateCode = smsTemplateProperties.getUPDATE_PASSWORD();
                 break;
             }
             //设置支付密码
@@ -113,7 +112,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
                 Member member = memberService.getById(UserContext.getCurrentUser().getId());
                 //更新为用户最新手机号
                 mobile = member.getMobile();
-                templateCode = smsTemplateSetting.getWALLET_PASSWORD();
+                templateCode = smsTemplateProperties.getWALLET_PASSWORD();
                 break;
             }
             //如果不是有效的验证码手段，则此处不进行短信操作
@@ -121,7 +120,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
                 return;
         }
         //如果是测试模式 默认验证码 6个1
-        if (systemSetting.getIsTestModel()) {
+        if (systemSettingProperties.getIsTestModel()) {
             code = "111111";
         } else {
             //发送短信
@@ -343,10 +342,9 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
 
 
     /**
-     * 使用AK&SK初始化账号Client
+     * 初始化账号Client
      *
-     * @return Client
-     * @throws Exception
+     * @return Client 短信操作util
      */
     public com.aliyun.dysmsapi20170525.Client createClient() {
         try {
diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java
similarity index 85%
rename from framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java
rename to framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java
index e4c629b6..3948977c 100644
--- a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java
+++ b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java
@@ -1,13 +1,13 @@
-package cn.lili.common.token.base.generate;
+package cn.lili.modules.system.token;
 
-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.PermissionEnum;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.token.PermissionEnum;
-import cn.lili.common.token.Token;
-import cn.lili.common.token.TokenUtil;
-import cn.lili.common.token.base.AbstractTokenGenerate;
+import cn.lili.common.security.token.Token;
+import cn.lili.common.security.token.TokenUtil;
+import cn.lili.common.security.token.base.AbstractTokenGenerate;
 import cn.lili.modules.permission.entity.dos.AdminUser;
 import cn.lili.modules.permission.entity.vo.UserMenuVO;
 import cn.lili.modules.permission.service.AdminUserService;
@@ -25,7 +25,6 @@ import java.util.Map;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/11/16 10:51
  */
 @Component
@@ -117,11 +116,19 @@ public class ManagerTokenGenerate extends AbstractTokenGenerate {
      */
     void initPermission(List<String> superPermissions, List<String> queryPermissions) {
         //用户信息维护
-        superPermissions.add("/manager/user/info");
-        superPermissions.add("/manager/user/edit");
+        superPermissions.add("/manager/user/info*");
+        superPermissions.add("/manager/user/edit*");
         superPermissions.add("/manager/user/editPassword*");
-        //统计查看
+
+        //统计查看权限
         queryPermissions.add("/manager/statistics*");
+        //菜单查看权限
+        queryPermissions.add("/manager/menu*");
+        //商品分类查看权限
+        queryPermissions.add("/manager/goods/category*");
+        //查看地区接口
+        queryPermissions.add("/manager/region*");
+
     }
 
 }
diff --git a/framework/src/main/java/cn/lili/modules/system/utils/CharacterConstant.java b/framework/src/main/java/cn/lili/modules/system/utils/CharacterConstant.java
index 95030afa..44749097 100644
--- a/framework/src/main/java/cn/lili/modules/system/utils/CharacterConstant.java
+++ b/framework/src/main/java/cn/lili/modules/system/utils/CharacterConstant.java
@@ -2,7 +2,7 @@ package cn.lili.modules.system.utils;
 
 /**
  *
- * @Description: 字符常量
+ * 字符常量
  * @author Bulbasaur
  * @version v1.0
  * @since v1.0
diff --git a/framework/src/main/java/cn/lili/modules/system/utils/HttpUtils.java b/framework/src/main/java/cn/lili/modules/system/utils/HttpUtils.java
index 9dc27a06..8f01aaf8 100644
--- a/framework/src/main/java/cn/lili/modules/system/utils/HttpUtils.java
+++ b/framework/src/main/java/cn/lili/modules/system/utils/HttpUtils.java
@@ -15,7 +15,7 @@ import java.util.Map;
  * Http工具
  *
  * @author pikachu
- * @date 2018/3/13
+ * @since 2018/3/13
  */
 @Slf4j
 public final class HttpUtils {
diff --git a/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java b/framework/src/main/java/cn/lili/modules/system/utils/OperationalJudgment.java
similarity index 86%
rename from framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java
rename to framework/src/main/java/cn/lili/modules/system/utils/OperationalJudgment.java
index 4eb47a6d..085d2ca3 100644
--- a/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java
+++ b/framework/src/main/java/cn/lili/modules/system/utils/OperationalJudgment.java
@@ -1,9 +1,10 @@
-package cn.lili.common.utils;
+package cn.lili.modules.system.utils;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
+import cn.lili.common.utils.BeanUtil;
 
 /**
  * 全局统一判定是否可操作某属性
@@ -18,8 +19,8 @@ public class OperationalJudgment<t> {
      * 需要判定的对象必须包含属性 memberId，storeId 代表判定的角色
      *
      * @param object 判定的对象
-     * @param <t>
-     * @return
+     * @param <t> 判定处理对象
+     * @return 处理结果
      */
     public static <t> t judgment(t object) {
         return judgment(object, "memberId", "storeId");
@@ -28,10 +29,10 @@ public class OperationalJudgment<t> {
     /**
      * 需要判定的对象必须包含属性 memberId，storeId 代表判定的角色
      *
-     * @param object
-     * @param buyerIdField
-     * @param storeIdField
-     * @param <t>
+     * @param object 判定对象
+     * @param buyerIdField 买家id
+     * @param storeIdField 店铺id
+     * @param <t> 范型
      * @return 返回判定本身，防止多次查询对象
      */
     public static <t> t judgment(t object, String buyerIdField, String storeIdField) {
diff --git a/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java b/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java
index e1ea4d25..63a04787 100644
--- a/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java
+++ b/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java
@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
-import org.thymeleaf.util.ListUtils;
 
 import java.io.Serializable;
 import java.util.List;
@@ -39,6 +38,7 @@ public class SensitiveWordsFilter implements Serializable, ApplicationRunner {
      * 使用2个字符的hash定位。
      */
     protected static SensitiveWordsNode[] nodes;
+
     @Autowired
     private SensitiveWordsService sensitiveWordsService;
 
@@ -47,8 +47,8 @@ public class SensitiveWordsFilter implements Serializable, ApplicationRunner {
      * 增加一个敏感词，如果词的长度（trim后）小于2，则丢弃<br/>
      * 此方法（构建）并不是主要的性能优化点。
      *
-     * @param word
-     * @return
+     * @param word 敏感词
+     * @return 操作结果
      */
     public static boolean put(String word) {
 
@@ -236,15 +236,13 @@ public class SensitiveWordsFilter implements Serializable, ApplicationRunner {
             nodes = new SensitiveWordsNode[DEFAULT_INITIAL_CAPACITY];
             //加入平台添加的敏感词
             List<SensitiveWords> list = sensitiveWordsService.list();
-            if (ListUtils.isEmpty(list)) {
+            if (list != null && list.size() > 0) {
                 for (SensitiveWords sensitiveWords : list) {
                     put(sensitiveWords.getSensitiveWord());
                 }
             }
         } catch (Exception e) {
-            log.error("初始化敏感词错误",e);
+            log.error("初始化敏感词错误", e);
         }
-
-
     }
 }
diff --git a/framework/src/main/java/cn/lili/modules/system/utils/StringPointer.java b/framework/src/main/java/cn/lili/modules/system/utils/StringPointer.java
index 001fdd2d..1f211a02 100644
--- a/framework/src/main/java/cn/lili/modules/system/utils/StringPointer.java
+++ b/framework/src/main/java/cn/lili/modules/system/utils/StringPointer.java
@@ -5,7 +5,7 @@ import java.io.Serializable;
 /**
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 public class StringPointer implements Serializable, CharSequence, Comparable<StringPointer>{
 
diff --git a/framework/src/main/java/cn/lili/common/verification/ImageUtil.java b/framework/src/main/java/cn/lili/modules/verification/ImageUtil.java
similarity index 96%
rename from framework/src/main/java/cn/lili/common/verification/ImageUtil.java
rename to framework/src/main/java/cn/lili/modules/verification/ImageUtil.java
index 98891ec5..98805297 100644
--- a/framework/src/main/java/cn/lili/common/verification/ImageUtil.java
+++ b/framework/src/main/java/cn/lili/modules/verification/ImageUtil.java
@@ -1,4 +1,4 @@
-package cn.lili.common.verification;
+package cn.lili.modules.verification;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
@@ -16,9 +16,9 @@ public class ImageUtil {
     /**
      * 添加水印
      *
-     * @param oriImage
-     * @param text
-     * @throws IOException
+     * @param oriImage 原图
+     * @param text     文字
+     * @throws IOException 流操作异常
      */
     public static void addWatermark(BufferedImage oriImage, String text) {
         Graphics2D graphics2D = oriImage.createGraphics();
diff --git a/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java b/framework/src/main/java/cn/lili/modules/verification/SliderImageUtil.java
similarity index 96%
rename from framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java
rename to framework/src/main/java/cn/lili/modules/verification/SliderImageUtil.java
index 69339d02..90ca90a3 100644
--- a/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java
+++ b/framework/src/main/java/cn/lili/modules/verification/SliderImageUtil.java
@@ -1,4 +1,4 @@
-package cn.lili.common.verification;
+package cn.lili.modules.verification;
 
 import cn.lili.common.utils.Base64DecodeMultipartFile;
 import cn.lili.common.vo.SerializableStream;
@@ -19,7 +19,6 @@ import java.util.Random;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/11/17 14:34
  */
 @Component
diff --git a/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java b/framework/src/main/java/cn/lili/modules/verification/VerificationSDK.java
similarity index 83%
rename from framework/src/main/java/cn/lili/common/verification/VerificationSDK.java
rename to framework/src/main/java/cn/lili/modules/verification/VerificationSDK.java
index 4508033a..2d98b28e 100644
--- a/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java
+++ b/framework/src/main/java/cn/lili/modules/verification/VerificationSDK.java
@@ -1,7 +1,7 @@
-package cn.lili.common.verification;
+package cn.lili.modules.verification;
 
-import cn.lili.common.cache.Cache;
-import cn.lili.common.cache.CachePrefix;
+import cn.lili.cache.Cache;
+import cn.lili.cache.CachePrefix;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -10,7 +10,6 @@ import org.springframework.stereotype.Component;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/11/17 15:43
  */
 @Component
diff --git a/framework/src/main/java/cn/lili/common/verification/aop/VerificationInterceptor.java b/framework/src/main/java/cn/lili/modules/verification/aop/VerificationInterceptor.java
similarity index 77%
rename from framework/src/main/java/cn/lili/common/verification/aop/VerificationInterceptor.java
rename to framework/src/main/java/cn/lili/modules/verification/aop/VerificationInterceptor.java
index 8bb64702..0948babd 100644
--- a/framework/src/main/java/cn/lili/common/verification/aop/VerificationInterceptor.java
+++ b/framework/src/main/java/cn/lili/modules/verification/aop/VerificationInterceptor.java
@@ -1,11 +1,10 @@
-package cn.lili.common.verification.aop;
+package cn.lili.modules.verification.aop;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.verification.aop.annotation.Verification;
-import cn.lili.common.verification.enums.VerificationEnums;
-import cn.lili.common.verification.service.VerificationService;
-import lombok.RequiredArgsConstructor;
+import cn.lili.modules.verification.aop.annotation.Verification;
+import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.service.VerificationService;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
@@ -29,7 +28,7 @@ public class VerificationInterceptor {
     @Autowired
     private VerificationService verificationService;
 
-    @Before("@annotation(cn.lili.common.verification.aop.annotation.Verification)")
+    @Before("@annotation(cn.lili.modules.verification.aop.annotation.Verification)")
     public void interceptor(JoinPoint pjp) {
         MethodSignature signature = (MethodSignature) pjp.getSignature();
         Method method = signature.getMethod();
diff --git a/framework/src/main/java/cn/lili/common/verification/aop/annotation/Verification.java b/framework/src/main/java/cn/lili/modules/verification/aop/annotation/Verification.java
similarity index 77%
rename from framework/src/main/java/cn/lili/common/verification/aop/annotation/Verification.java
rename to framework/src/main/java/cn/lili/modules/verification/aop/annotation/Verification.java
index 74af5437..a6bd95e0 100644
--- a/framework/src/main/java/cn/lili/common/verification/aop/annotation/Verification.java
+++ b/framework/src/main/java/cn/lili/modules/verification/aop/annotation/Verification.java
@@ -1,7 +1,7 @@
-package cn.lili.common.verification.aop.annotation;
+package cn.lili.modules.verification.aop.annotation;
 
 
-import cn.lili.common.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.enums.VerificationEnums;
 
 import java.lang.annotation.*;
 
diff --git a/framework/src/main/java/cn/lili/common/verification/enums/VerificationEnums.java b/framework/src/main/java/cn/lili/modules/verification/enums/VerificationEnums.java
similarity index 87%
rename from framework/src/main/java/cn/lili/common/verification/enums/VerificationEnums.java
rename to framework/src/main/java/cn/lili/modules/verification/enums/VerificationEnums.java
index 4cb72339..4825c9a6 100644
--- a/framework/src/main/java/cn/lili/common/verification/enums/VerificationEnums.java
+++ b/framework/src/main/java/cn/lili/modules/verification/enums/VerificationEnums.java
@@ -1,4 +1,4 @@
-package cn.lili.common.verification.enums;
+package cn.lili.modules.verification.enums;
 
 /**
  * VerificationEnums
diff --git a/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java b/framework/src/main/java/cn/lili/modules/verification/service/VerificationService.java
similarity index 87%
rename from framework/src/main/java/cn/lili/common/verification/service/VerificationService.java
rename to framework/src/main/java/cn/lili/modules/verification/service/VerificationService.java
index 382a6868..497edbe5 100644
--- a/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java
+++ b/framework/src/main/java/cn/lili/modules/verification/service/VerificationService.java
@@ -1,6 +1,6 @@
-package cn.lili.common.verification.service;
+package cn.lili.modules.verification.service;
 
-import cn.lili.common.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.enums.VerificationEnums;
 
 import java.io.IOException;
 import java.util.Map;
@@ -9,7 +9,7 @@ import java.util.Map;
  * 验证码模块
  *
  * @author Bulbasaur
- * @date: 2021/7/9 1:42 上午
+ * @since: 2021/7/9 1:42 上午
  */
 public interface VerificationService {
     /**
diff --git a/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java
similarity index 95%
rename from framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java
rename to framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java
index 023734a9..d37275ab 100644
--- a/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java
@@ -1,13 +1,13 @@
-package cn.lili.common.verification.service.impl;
+package cn.lili.modules.verification.service.impl;
 
-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.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.common.verification.SliderImageUtil;
-import cn.lili.common.verification.enums.VerificationEnums;
-import cn.lili.common.verification.service.VerificationService;
+import cn.lili.modules.verification.SliderImageUtil;
+import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.service.VerificationService;
 import cn.lili.common.vo.SerializableStream;
 import cn.lili.modules.system.entity.dos.VerificationSource;
 import cn.lili.modules.system.entity.vo.VerificationVO;
diff --git a/framework/src/main/java/cn/lili/base/BaseEntity.java b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java
similarity index 95%
rename from framework/src/main/java/cn/lili/base/BaseEntity.java
rename to framework/src/main/java/cn/lili/mybatis/BaseEntity.java
index b87c511a..a37fa984 100644
--- a/framework/src/main/java/cn/lili/base/BaseEntity.java
+++ b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java
@@ -1,4 +1,4 @@
-package cn.lili.base;
+package cn.lili.mybatis;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -57,7 +57,7 @@ public abstract class BaseEntity implements Serializable {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
@@ -69,7 +69,7 @@ public abstract class BaseEntity implements Serializable {
 
     @LastModifiedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.UPDATE)
     @ApiModelProperty(value = "更新时间", hidden = true)
     private Date updateTime;
diff --git a/framework/src/main/java/cn/lili/base/IdEntity.java b/framework/src/main/java/cn/lili/mybatis/IdEntity.java
similarity index 97%
rename from framework/src/main/java/cn/lili/base/IdEntity.java
rename to framework/src/main/java/cn/lili/mybatis/IdEntity.java
index 5909ebce..5e17357a 100644
--- a/framework/src/main/java/cn/lili/base/IdEntity.java
+++ b/framework/src/main/java/cn/lili/mybatis/IdEntity.java
@@ -1,4 +1,4 @@
-package cn.lili.base;
+package cn.lili.mybatis;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/framework/src/main/java/cn/lili/common/heath/DataSourceHealthConfig.java b/framework/src/main/java/cn/lili/mybatis/heath/DataSourceHealthConfig.java
similarity index 96%
rename from framework/src/main/java/cn/lili/common/heath/DataSourceHealthConfig.java
rename to framework/src/main/java/cn/lili/mybatis/heath/DataSourceHealthConfig.java
index 2437cc99..ec1e7037 100644
--- a/framework/src/main/java/cn/lili/common/heath/DataSourceHealthConfig.java
+++ b/framework/src/main/java/cn/lili/mybatis/heath/DataSourceHealthConfig.java
@@ -1,4 +1,4 @@
-package cn.lili.common.heath;
+package cn.lili.mybatis.heath;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Value;
@@ -17,7 +17,6 @@ import java.util.Map;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/12/24 19:31
  */
 
diff --git a/framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java
similarity index 97%
rename from framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java
rename to framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java
index e7a2e74f..b6d3e49e 100644
--- a/framework/src/main/java/cn/lili/base/mybatisplus/MyMetaObjectHandler.java
+++ b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MyMetaObjectHandler.java
@@ -1,4 +1,4 @@
-package cn.lili.base.mybatisplus;
+package cn.lili.mybatis.mybatisplus;
 
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
diff --git a/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MybatisPlusConfig.java
similarity index 96%
rename from framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java
rename to framework/src/main/java/cn/lili/mybatis/mybatisplus/MybatisPlusConfig.java
index 7407971c..de13d972 100644
--- a/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java
+++ b/framework/src/main/java/cn/lili/mybatis/mybatisplus/MybatisPlusConfig.java
@@ -1,4 +1,4 @@
-package cn.lili.base.mybatisplus;
+package cn.lili.mybatis.mybatisplus;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
diff --git a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingDatabaseAlgorithm.java b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingDatabaseAlgorithm.java
similarity index 97%
rename from framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingDatabaseAlgorithm.java
rename to framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingDatabaseAlgorithm.java
index dc1f6b66..164c2027 100644
--- a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingDatabaseAlgorithm.java
+++ b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingDatabaseAlgorithm.java
@@ -1,4 +1,4 @@
-package cn.lili.config.sharding;
+package cn.lili.mybatis.sharding;
 
 import cn.lili.common.utils.DateUtil;
 import com.google.common.collect.Range;
diff --git a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithm.java b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithm.java
similarity index 98%
rename from framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithm.java
rename to framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithm.java
index 619da8cd..5d07ec38 100644
--- a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithm.java
+++ b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithm.java
@@ -1,4 +1,4 @@
-package cn.lili.config.sharding;
+package cn.lili.mybatis.sharding;
 
 import cn.hutool.core.convert.Convert;
 import cn.lili.common.utils.DateUtil;
diff --git a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithmBak.java b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithmBak.java
similarity index 97%
rename from framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithmBak.java
rename to framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithmBak.java
index 98a27c1a..a35f7b52 100644
--- a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithmBak.java
+++ b/framework/src/main/java/cn/lili/mybatis/sharding/CreateTimeShardingTableAlgorithmBak.java
@@ -1,4 +1,4 @@
-package cn.lili.config.sharding;
+package cn.lili.mybatis.sharding;
 
 import cn.lili.common.utils.DateUtil;
 import org.apache.shardingsphere.api.sharding.standard.PreciseShardingAlgorithm;
diff --git a/framework/src/main/java/cn/lili/common/utils/PageUtil.java b/framework/src/main/java/cn/lili/mybatis/util/PageUtil.java
similarity index 89%
rename from framework/src/main/java/cn/lili/common/utils/PageUtil.java
rename to framework/src/main/java/cn/lili/mybatis/util/PageUtil.java
index 3fcb5e0d..691da042 100644
--- a/framework/src/main/java/cn/lili/common/utils/PageUtil.java
+++ b/framework/src/main/java/cn/lili/mybatis/util/PageUtil.java
@@ -1,7 +1,9 @@
-package cn.lili.common.utils;
+package cn.lili.mybatis.util;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.lili.common.utils.BeanUtil;
+import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.SearchVO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,7 +19,6 @@ import java.util.List;
  *
  * @author Chopper
  * @version v4.0
- * @Description:
  * @since 2020/11/26 15:23
  */
 public class PageUtil {
@@ -26,8 +27,9 @@ public class PageUtil {
     /**
      * Mybatis-Plus分页封装
      *
-     * @param page
-     * @return
+     * @param page 分页VO
+     * @param <T> 范型
+     * @return 分页响应
      */
     public static <T> Page<T> initPage(PageVO page) {
 
@@ -74,8 +76,8 @@ public class PageUtil {
      * 生成条件搜索 全对象对比 equals
      * 如果需要like 需要另行处理
      *
-     * @param object
-     * @return
+     * @param object 对象（根据对象构建查询条件）
+     * @return 查询wrapper
      */
     public static <T> QueryWrapper<T> initWrapper(Object object) {
         return initWrapper(object, null);
@@ -84,9 +86,9 @@ public class PageUtil {
     /**
      * 生成条件搜索 全对象对比
      *
-     * @param object
-     * @param searchVo
-     * @return
+     * @param object 对象
+     * @param searchVo 查询条件
+     * @return 查询wrapper
      */
     public static <T> QueryWrapper<T> initWrapper(Object object, SearchVO searchVo) {
         QueryWrapper<T> queryWrapper = new QueryWrapper<>();
@@ -118,9 +120,9 @@ public class PageUtil {
     /**
      * List 手动分页
      *
-     * @param page
-     * @param list
-     * @return
+     * @param page 分页对象
+     * @param list 分页集合
+     * @return 范型结果
      */
     public static <T> List<T> listToPage(PageVO page, List<T> list) {
 
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallback.java b/framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallback.java
similarity index 94%
rename from framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallback.java
rename to framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallback.java
index 088420b3..797bc467 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallback.java
+++ b/framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallback.java
@@ -1,4 +1,4 @@
-package cn.lili.common.rocketmq;
+package cn.lili.rocketmq;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.producer.SendCallback;
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallbackBuilder.java b/framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallbackBuilder.java
similarity index 85%
rename from framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallbackBuilder.java
rename to framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallbackBuilder.java
index d29c25eb..13691db7 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/RocketmqSendCallbackBuilder.java
+++ b/framework/src/main/java/cn/lili/rocketmq/RocketmqSendCallbackBuilder.java
@@ -1,4 +1,4 @@
-package cn.lili.common.rocketmq;
+package cn.lili.rocketmq;
 
 /**
  * @author paulG
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/AfterSaleTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/AfterSaleTagsEnum.java
similarity index 92%
rename from framework/src/main/java/cn/lili/common/rocketmq/tags/AfterSaleTagsEnum.java
rename to framework/src/main/java/cn/lili/rocketmq/tags/AfterSaleTagsEnum.java
index b668ee79..174f3ecc 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/tags/AfterSaleTagsEnum.java
+++ b/framework/src/main/java/cn/lili/rocketmq/tags/AfterSaleTagsEnum.java
@@ -1,4 +1,4 @@
-package cn.lili.common.rocketmq.tags;
+package cn.lili.rocketmq.tags;
 
 /**
  * 售后标签枚举
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/GoodsTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/GoodsTagsEnum.java
similarity index 95%
rename from framework/src/main/java/cn/lili/common/rocketmq/tags/GoodsTagsEnum.java
rename to framework/src/main/java/cn/lili/rocketmq/tags/GoodsTagsEnum.java
index f4dbd25b..089b24a9 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/tags/GoodsTagsEnum.java
+++ b/framework/src/main/java/cn/lili/rocketmq/tags/GoodsTagsEnum.java
@@ -1,4 +1,4 @@
-package cn.lili.common.rocketmq.tags;
+package cn.lili.rocketmq.tags;
 
 /**
  * @author paulG
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/MemberTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java
similarity index 94%
rename from framework/src/main/java/cn/lili/common/rocketmq/tags/MemberTagsEnum.java
rename to framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java
index 88fb01fe..0d8c02a2 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/tags/MemberTagsEnum.java
+++ b/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java
@@ -1,4 +1,4 @@
-package cn.lili.common.rocketmq.tags;
+package cn.lili.rocketmq.tags;
 
 /**
  * 会员操作枚举
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/MqOrderTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/MqOrderTagsEnum.java
similarity index 92%
rename from framework/src/main/java/cn/lili/common/rocketmq/tags/MqOrderTagsEnum.java
rename to framework/src/main/java/cn/lili/rocketmq/tags/MqOrderTagsEnum.java
index fde73145..cfe9ba87 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/tags/MqOrderTagsEnum.java
+++ b/framework/src/main/java/cn/lili/rocketmq/tags/MqOrderTagsEnum.java
@@ -1,4 +1,4 @@
-package cn.lili.common.rocketmq.tags;
+package cn.lili.rocketmq.tags;
 
 /**
  * 订单操作枚举
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/OtherTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/OtherTagsEnum.java
similarity index 92%
rename from framework/src/main/java/cn/lili/common/rocketmq/tags/OtherTagsEnum.java
rename to framework/src/main/java/cn/lili/rocketmq/tags/OtherTagsEnum.java
index 6117c636..c4c2000e 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/tags/OtherTagsEnum.java
+++ b/framework/src/main/java/cn/lili/rocketmq/tags/OtherTagsEnum.java
@@ -1,4 +1,4 @@
-package cn.lili.common.rocketmq.tags;
+package cn.lili.rocketmq.tags;
 
 /**
  * 其他操作枚举
diff --git a/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java b/framework/src/main/java/cn/lili/trigger/delay/AbstractDelayQueueMachineFactory.java
similarity index 93%
rename from framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
rename to framework/src/main/java/cn/lili/trigger/delay/AbstractDelayQueueMachineFactory.java
index 4470b395..18d3b7bd 100644
--- a/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
+++ b/framework/src/main/java/cn/lili/trigger/delay/AbstractDelayQueueMachineFactory.java
@@ -1,6 +1,6 @@
-package cn.lili.common.trigger.delay;
+package cn.lili.trigger.delay;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java b/framework/src/main/java/cn/lili/trigger/delay/queue/PromotionDelayQueue.java
similarity index 60%
rename from framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java
rename to framework/src/main/java/cn/lili/trigger/delay/queue/PromotionDelayQueue.java
index 28f92713..523756bb 100644
--- a/framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java
+++ b/framework/src/main/java/cn/lili/trigger/delay/queue/PromotionDelayQueue.java
@@ -1,7 +1,7 @@
-package cn.lili.common.trigger.delay.queue;
+package cn.lili.trigger.delay.queue;
 
-import cn.lili.common.trigger.delay.AbstractDelayQueueMachineFactory;
-import cn.lili.common.trigger.enums.DelayQueueEnums;
+import cn.lili.trigger.delay.AbstractDelayQueueMachineFactory;
+import cn.lili.trigger.enums.DelayQueueEnums;
 import org.springframework.stereotype.Component;
 
 /**
@@ -9,8 +9,7 @@ import org.springframework.stereotype.Component;
  *
  * @author paulG
  * @version v4.1
- * @date 2020/11/17 7:19 下午
- * @description
+ * @since 2020/11/17 7:19 下午
  * @since 1
  */
 @Component
diff --git a/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java b/framework/src/main/java/cn/lili/trigger/enums/DelayQueueEnums.java
similarity index 79%
rename from framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java
rename to framework/src/main/java/cn/lili/trigger/enums/DelayQueueEnums.java
index 54998fda..df1a488f 100644
--- a/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java
+++ b/framework/src/main/java/cn/lili/trigger/enums/DelayQueueEnums.java
@@ -1,10 +1,9 @@
-package cn.lili.common.trigger.enums;
+package cn.lili.trigger.enums;
 
 /**
  * 队列枚举
  *
  * @author Bulbasaur
- * @date: 2021/7/9 1:40 上午
  */
 public enum DelayQueueEnums {
 
diff --git a/framework/src/main/java/cn/lili/common/trigger/enums/DelayTypeEnums.java b/framework/src/main/java/cn/lili/trigger/enums/DelayTypeEnums.java
similarity index 91%
rename from framework/src/main/java/cn/lili/common/trigger/enums/DelayTypeEnums.java
rename to framework/src/main/java/cn/lili/trigger/enums/DelayTypeEnums.java
index 2369fa52..85345f90 100644
--- a/framework/src/main/java/cn/lili/common/trigger/enums/DelayTypeEnums.java
+++ b/framework/src/main/java/cn/lili/trigger/enums/DelayTypeEnums.java
@@ -1,4 +1,4 @@
-package cn.lili.common.trigger.enums;
+package cn.lili.trigger.enums;
 
 /**
  * 延时任务类型
diff --git a/framework/src/main/java/cn/lili/common/trigger/interfaces/TimeTrigger.java b/framework/src/main/java/cn/lili/trigger/interfaces/TimeTrigger.java
similarity index 92%
rename from framework/src/main/java/cn/lili/common/trigger/interfaces/TimeTrigger.java
rename to framework/src/main/java/cn/lili/trigger/interfaces/TimeTrigger.java
index 820314ae..3e2e95b2 100644
--- a/framework/src/main/java/cn/lili/common/trigger/interfaces/TimeTrigger.java
+++ b/framework/src/main/java/cn/lili/trigger/interfaces/TimeTrigger.java
@@ -1,6 +1,6 @@
-package cn.lili.common.trigger.interfaces;
+package cn.lili.trigger.interfaces;
 
-import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.model.TimeTriggerMsg;
 
 /**
  * 延时执行接口
diff --git a/framework/src/main/java/cn/lili/common/trigger/interfaces/impl/RocketmqTimerTrigger.java b/framework/src/main/java/cn/lili/trigger/interfaces/impl/RocketmqTimerTrigger.java
similarity index 91%
rename from framework/src/main/java/cn/lili/common/trigger/interfaces/impl/RocketmqTimerTrigger.java
rename to framework/src/main/java/cn/lili/trigger/interfaces/impl/RocketmqTimerTrigger.java
index b6589bc1..32ce4084 100644
--- a/framework/src/main/java/cn/lili/common/trigger/interfaces/impl/RocketmqTimerTrigger.java
+++ b/framework/src/main/java/cn/lili/trigger/interfaces/impl/RocketmqTimerTrigger.java
@@ -1,12 +1,12 @@
-package cn.lili.common.trigger.interfaces.impl;
+package cn.lili.trigger.interfaces.impl;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.common.cache.Cache;
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.trigger.delay.queue.PromotionDelayQueue;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import cn.lili.common.trigger.model.TimeTriggerMsg;
-import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.cache.Cache;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.trigger.delay.queue.PromotionDelayQueue;
+import cn.lili.trigger.interfaces.TimeTrigger;
+import cn.lili.trigger.model.TimeTriggerMsg;
+import cn.lili.trigger.util.DelayQueueTools;
 import cn.lili.common.utils.DateUtil;
 import cn.lili.common.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
diff --git a/framework/src/main/java/cn/lili/common/trigger/message/BroadcastMessage.java b/framework/src/main/java/cn/lili/trigger/message/BroadcastMessage.java
similarity index 77%
rename from framework/src/main/java/cn/lili/common/trigger/message/BroadcastMessage.java
rename to framework/src/main/java/cn/lili/trigger/message/BroadcastMessage.java
index 42e96cbf..2f057dfe 100644
--- a/framework/src/main/java/cn/lili/common/trigger/message/BroadcastMessage.java
+++ b/framework/src/main/java/cn/lili/trigger/message/BroadcastMessage.java
@@ -1,16 +1,13 @@
-package cn.lili.common.delayqueue;
+package cn.lili.trigger.message;
 
-import cn.hutool.core.date.DateTime;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
-
 /**
  * 直播消息实体
  *
  * @author Bulbasaur
- * @date: 2021/6/1 4:48 下午
+ * @since: 2021/6/1 4:48 下午
  */
 @Data
 @NoArgsConstructor
diff --git a/framework/src/main/java/cn/lili/common/trigger/message/PintuanOrderMessage.java b/framework/src/main/java/cn/lili/trigger/message/PintuanOrderMessage.java
similarity index 90%
rename from framework/src/main/java/cn/lili/common/trigger/message/PintuanOrderMessage.java
rename to framework/src/main/java/cn/lili/trigger/message/PintuanOrderMessage.java
index e8acf50f..b331ee22 100644
--- a/framework/src/main/java/cn/lili/common/trigger/message/PintuanOrderMessage.java
+++ b/framework/src/main/java/cn/lili/trigger/message/PintuanOrderMessage.java
@@ -1,4 +1,4 @@
-package cn.lili.common.trigger.message;
+package cn.lili.trigger.message;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/framework/src/main/java/cn/lili/common/trigger/message/PromotionMessage.java b/framework/src/main/java/cn/lili/trigger/message/PromotionMessage.java
similarity index 90%
rename from framework/src/main/java/cn/lili/common/trigger/message/PromotionMessage.java
rename to framework/src/main/java/cn/lili/trigger/message/PromotionMessage.java
index 1ec5c1ae..a49c907c 100644
--- a/framework/src/main/java/cn/lili/common/trigger/message/PromotionMessage.java
+++ b/framework/src/main/java/cn/lili/trigger/message/PromotionMessage.java
@@ -1,4 +1,4 @@
-package cn.lili.common.trigger.message;
+package cn.lili.trigger.message;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -10,7 +10,7 @@ import java.util.Date;
  * 信息队列传输促销信息实体
  *
  * @author paulG
- * @date 2020/10/30
+ * @since 2020/10/30
  **/
 @Data
 @AllArgsConstructor
diff --git a/framework/src/main/java/cn/lili/common/trigger/model/TimeExecuteConstant.java b/framework/src/main/java/cn/lili/trigger/model/TimeExecuteConstant.java
similarity index 91%
rename from framework/src/main/java/cn/lili/common/trigger/model/TimeExecuteConstant.java
rename to framework/src/main/java/cn/lili/trigger/model/TimeExecuteConstant.java
index e9136ee4..2e79068f 100644
--- a/framework/src/main/java/cn/lili/common/trigger/model/TimeExecuteConstant.java
+++ b/framework/src/main/java/cn/lili/trigger/model/TimeExecuteConstant.java
@@ -1,4 +1,4 @@
-package cn.lili.common.trigger.model;
+package cn.lili.trigger.model;
 
 /**
  * 延时任务执行器常量
diff --git a/framework/src/main/java/cn/lili/common/trigger/model/TimeTriggerMsg.java b/framework/src/main/java/cn/lili/trigger/model/TimeTriggerMsg.java
similarity index 95%
rename from framework/src/main/java/cn/lili/common/trigger/model/TimeTriggerMsg.java
rename to framework/src/main/java/cn/lili/trigger/model/TimeTriggerMsg.java
index 09ed7b00..8b620c00 100644
--- a/framework/src/main/java/cn/lili/common/trigger/model/TimeTriggerMsg.java
+++ b/framework/src/main/java/cn/lili/trigger/model/TimeTriggerMsg.java
@@ -1,4 +1,4 @@
-package cn.lili.common.trigger.model;
+package cn.lili.trigger.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/framework/src/main/java/cn/lili/common/trigger/util/DelayQueueTools.java b/framework/src/main/java/cn/lili/trigger/util/DelayQueueTools.java
similarity index 90%
rename from framework/src/main/java/cn/lili/common/trigger/util/DelayQueueTools.java
rename to framework/src/main/java/cn/lili/trigger/util/DelayQueueTools.java
index c8ce87be..22074a45 100644
--- a/framework/src/main/java/cn/lili/common/trigger/util/DelayQueueTools.java
+++ b/framework/src/main/java/cn/lili/trigger/util/DelayQueueTools.java
@@ -1,6 +1,6 @@
-package cn.lili.common.trigger.util;
+package cn.lili.trigger.util;
 
-import cn.lili.common.trigger.enums.DelayTypeEnums;
+import cn.lili.trigger.enums.DelayTypeEnums;
 
 /**
  * 延时任务工具类
diff --git a/framework/src/main/resources/templates/controller.btl b/framework/src/main/resources/templates/controller.btl
index fb4b1ed8..5fa132f3 100644
--- a/framework/src/main/resources/templates/controller.btl
+++ b/framework/src/main/resources/templates/controller.btl
@@ -1,6 +1,6 @@
 package ${entity.controllerPackage};
 
-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.SearchVO;
diff --git a/framework/src/main/resources/templates/entity.btl b/framework/src/main/resources/templates/entity.btl
index 0c4df5e6..54047fd0 100644
--- a/framework/src/main/resources/templates/entity.btl
+++ b/framework/src/main/resources/templates/entity.btl
@@ -1,6 +1,6 @@
 package ${entity.entityPackage};
 
-import cn.lili.base.BaseEntity;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModel;
diff --git a/framework/src/test/java/cn/lili/test/script/ScriptTest.java b/framework/src/test/java/cn/lili/test/script/ScriptTest.java
index 6dd5b284..d2312a02 100644
--- a/framework/src/test/java/cn/lili/test/script/ScriptTest.java
+++ b/framework/src/test/java/cn/lili/test/script/ScriptTest.java
@@ -1,6 +1,5 @@
 package cn.lili.test.script;
 
-import cn.lili.common.test.BaseTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -35,7 +34,7 @@ import java.util.List;
 @ContextConfiguration
 @Configuration
 @ComponentScan("cn.lili")
-public class ScriptTest extends BaseTest {
+public class ScriptTest {
     @Resource
     private DefaultRedisScript<Boolean> redisScript;
     @Resource
diff --git a/manager-api/src/main/java/cn/lili/ManagerApiApplication.java b/manager-api/src/main/java/cn/lili/ManagerApiApplication.java
index c9d22b70..d246b8ab 100644
--- a/manager-api/src/main/java/cn/lili/ManagerApiApplication.java
+++ b/manager-api/src/main/java/cn/lili/ManagerApiApplication.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
 @EnableCaching
diff --git a/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java b/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java
index e70781d6..8580607e 100644
--- a/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java
@@ -21,7 +21,7 @@ import java.util.List;
  * 管理端,文件管理管理接口
  *
  * @author Chopper
- * @date 2020/11/26 15:41
+ * @since 2020/11/26 15:41
  */
 @RestController
 @Api(tags = "管理端,文件管理管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java
index 6db36c2c..4b187583 100644
--- a/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java
@@ -27,7 +27,7 @@ import java.util.List;
  * 管理端,品牌接口
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @RestController
 @Api(tags = "管理端,品牌接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java
index 4bef3c3c..0256364c 100644
--- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java
@@ -20,7 +20,7 @@ import java.util.List;
  * 管理端,分类品牌接口
  *
  * @author pikachu
- * @date 2020-02-27 15:18:56
+ * @since 2020-02-27 15:18:56
  */
 @RestController
 @Api(tags = "管理端,分类品牌接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java
index f20b9ab5..ec72c1f2 100644
--- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java
@@ -24,7 +24,7 @@ import java.util.List;
  * 管理端,商品分类接口
  *
  * @author pikachu
- * @date 2020-02-27 15:18:56
+ * @since 2020-02-27 15:18:56
  */
 @RestController
 @Api(tags = "管理端,商品分类接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java
index 4658ab88..af99cdd5 100644
--- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java
@@ -23,7 +23,7 @@ import java.util.List;
  * 管理端,分类绑定参数组接口
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @RestController
 @Api(tags = "管理端,分类绑定参数组接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java
index 43993b99..bde97a6b 100644
--- a/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java
@@ -21,7 +21,7 @@ import java.util.List;
  * 管理端,商品分类规格接口
  *
  * @author pikachu
- * @date 2020-02-27 15:18:56
+ * @since 2020-02-27 15:18:56
  */
 @RestController
 @Api(tags = "管理端,商品分类规格接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java
index c0f5cc39..8004783c 100644
--- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java
@@ -28,7 +28,7 @@ import java.util.List;
  * 管理端,商品管理接口
  *
  * @author pikachu
- * @date 2020-02-23 15:18:56
+ * @since 2020-02-23 15:18:56
  */
 @RestController
 @Api(tags = "管理端,商品管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java
index e52178b2..1bcf9107 100644
--- 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,8 +1,7 @@
 package cn.lili.controller.goods;
 
 
-import cn.lili.common.enums.ResultCode;
-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;
@@ -23,7 +22,7 @@ import java.util.List;
  * 管理端,商品计量单位接口
  *
  * @author Bulbasaur
- * @date: 2020/11/26 16:15
+ * @since: 2020/11/26 16:15
  */
 @RestController
 @Api(tags = "管理端,商品计量单位接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java
index 78d7a0e5..0d7187e2 100644
--- 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
- * @date: 2020/11/26 16:15
+ * @since: 2020/11/26 16:15
  */
 @RestController
 @Api(tags = "管理端,分类绑定参数组管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java
index 41b114d5..36c8a258 100644
--- a/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java
@@ -2,7 +2,7 @@ package cn.lili.controller.goods;
 
 
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -23,7 +23,7 @@ import java.util.List;
  * 管理端,商品规格接口
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @RestController
 @Api(tags = "管理端,商品规格接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java
index fbe2cfe9..c49ebdd5 100644
--- a/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java
@@ -17,7 +17,7 @@ import java.util.List;
  * 管理端,联合登陆配置接口
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @RestController
 @Api(tags = "管理端,联合登陆配置接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java
index af20657b..77881b55 100644
--- a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java
@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest;
  * 管理端,IP接口
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @RestController
 @Api(tags = "管理端,IP接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java
index 2bda4814..83acd865 100644
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java
@@ -18,7 +18,7 @@ import javax.validation.Valid;
  * 管理端,会员地址API
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @RestController
 @Api(tags = "管理端,会员地址API")
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java
index 1ef688f6..e1d3d241 100644
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java
@@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull;
  * 管理端,会员商品评价接口
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @RestController
 @Api(tags = "管理端,会员商品评价接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java
index 95c7e5e0..fc2a60d4 100644
--- 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,7 +3,7 @@ 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.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.member.entity.dos.MemberGrade;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
  * 管理端,会员等级接口
  *
  * @author Bulbasaur
- * @date: 2021/5/16 11:29 下午
+ * @since: 2021/5/16 11:29 下午
  */
 @RestController
 @Api(tags = "管理端,会员等级接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
index a42b9ea1..9382fb9d 100644
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
@@ -3,12 +3,13 @@ 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.system.aspect.DemoSite;
+import cn.lili.modules.system.aspect.annotation.DemoSite;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dto.ManagerMemberEditDTO;
 import cn.lili.modules.member.entity.dto.MemberAddDTO;
 import cn.lili.modules.member.entity.vo.MemberSearchVO;
 import cn.lili.modules.member.service.MemberService;
+import cn.lili.modules.system.aspect.annotation.DemoSite;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -24,7 +25,7 @@ import java.util.List;
  * 管理端,会员接口
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @RestController
 @Api(tags = "管理端,会员接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java
index 804ab7e3..dff5bccd 100644
--- 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
- * @date: 2020/12/6 16:09
+ * @since: 2020/12/6 16:09
  */
 @RestController
 @Transactional(rollbackFor = Exception.class)
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java
index a0f9ab49..57f29a74 100644
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.member;
 
 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.member.entity.dos.MemberNoticeLog;
@@ -18,7 +18,7 @@ import java.util.List;
  * 管理端,会员消息接口
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @RestController
 @Api(tags = "管理端,会员消息接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java
index 139120c4..312852dd 100644
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.member;
 
 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.common.vo.SearchVO;
@@ -19,7 +19,7 @@ import java.util.List;
  * 管理端,会员消息接口
  *
  * @author Chopper
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @RestController
 @Api(tags = "管理端,会员消息接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java
index 229064ac..1e6bac6b 100644
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java
@@ -20,7 +20,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 = "管理端,会员积分历史接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java
index d63da28e..c79c0368 100644
--- 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
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
  */
 @RestController
 @Api(tags = "管理端,预存款接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java
index e796a0e7..8fa5cf2a 100644
--- 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
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
  */
 @RestController
 @Api(tags = "管理端,余额提现记录接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java
index 3d499455..a88142e6 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java
@@ -19,7 +19,7 @@ import java.util.List;
  * 管理端,文章分类管理接口
  *
  * @author pikachu
- * @date 2020-05-5 15:10:16
+ * @since 2020-05-5 15:10:16
  */
 @Slf4j
 @RestController
diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java
index 5fade9b3..aa9f7c8a 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java
@@ -21,7 +21,7 @@ import javax.validation.Valid;
  * 管理端,文章接口
  *
  * @author pikachu
- * @date 2020-05-06 15:18:56
+ * @since 2020-05-06 15:18:56
  */
 @RestController
 @Api(tags = "管理端,文章接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java
index 61af5e6e..543cbb35 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java
@@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull;
  * 管理端,自定义分词接口
  *
  * @author paulG
- * @date 2020/10/16
+ * @since 2020/10/16
  **/
 @RestController
 @Api(tags = "管理端,自定义分词接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java
index 26ea97ae..5e882def 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.other;
 
-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;
@@ -20,7 +20,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 = "管理端,意见反馈接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java
index 4deea20a..261c736f 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
  * 管理端,消息发送管理接口
  *
  * @author pikachu
- * @date 2020-05-06 15:18:56
+ * @since 2020-05-06 15:18:56
  */
 @RestController
 @Api(tags = "管理端,消息发送管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
index b677a291..0af0c47a 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
@@ -3,11 +3,12 @@ package cn.lili.controller.other;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.system.aspect.DemoSite;
+import cn.lili.modules.system.aspect.annotation.DemoSite;
 import cn.lili.modules.page.entity.dos.PageData;
 import cn.lili.modules.page.entity.dto.PageDataDTO;
 import cn.lili.modules.page.entity.vos.PageDataListVO;
 import cn.lili.modules.page.service.PageDataService;
+import cn.lili.modules.system.aspect.annotation.DemoSite;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -23,7 +24,7 @@ import javax.validation.constraints.NotNull;
  * 管理端,页面设置管理接口
  *
  * @author paulGao
- * @date 2020-05-06 15:18:56
+ * @since 2020-05-06 15:18:56
  */
 @RestController
 @Api(tags = "管理端,页面设置管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java
index 315d47ec..5ca04bc2 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.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.SensitiveWords;
@@ -21,7 +21,7 @@ import java.util.List;
  * 管理端,敏感词管理接口
  *
  * @author Bulbasaur
- * @date 2020-05-06 15:18:56
+ * @since 2020-05-06 15:18:56
  */
 @RestController
 @Api(tags = "管理端,敏感词管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java
index e5d34b39..4aab2f59 100644
--- 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,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.page.entity.dos.Special;
@@ -20,7 +20,7 @@ import java.util.List;
  * 管理端,专题活动接口
  *
  * @author Bulbasaur
- * @date: 2020/12/7 11:33
+ * @since: 2020/12/7 11:33
  */
 @RestController
 @Api(tags = "管理端,专题活动接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java
index 92f8a6ec..c89b946d 100644
--- 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,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.common.vo.SearchVO;
@@ -21,7 +21,7 @@ import java.util.List;
  * 管理端,验证码资源维护接口
  *
  * @author Chopper
- * @date: 2020/12/7 11:33
+ * @since: 2020/12/7 11:33
  */
 @RestController
 @Api(tags = "管理端,验证码资源维护接口")
diff --git 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
index 6b234cb3..e8c27ed8 100644
--- 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
- * @date: 2021/5/28 11:56 上午
+ * @since: 2021/5/28 11:56 上午
  */
 @RestController
 @Api(tags = "店铺端,直播商品接口")
diff --git 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
index b2957046..6f33569f 100644
--- 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
- * @date: 2021/5/28 11:56 上午
+ * @since: 2021/5/28 11:56 上午
  */
 @RestController
 @Api(tags = "店铺端,直播间接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java
index eafa7f26..67838270 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java
@@ -19,7 +19,7 @@ import javax.validation.constraints.NotNull;
  * 管理端,分销佣金管理接口
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @RestController
 @Api(tags = "管理端,分销佣金管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java
index 51f86c4e..59968852 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java
@@ -18,7 +18,7 @@ import java.util.List;
  * 管理端,分销商品管理接口
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @RestController
 @Api(tags = "管理端,分销商品管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java
index 9966328e..bbb98c1b 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java
@@ -22,7 +22,7 @@ import javax.validation.constraints.NotNull;
  * 管理端,分销员管理接口
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @RestController
 @Api(tags = "管理端,分销员管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java
index a1c52471..ae1c3d8f 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 管理端,分销订单管理接口
  *
  * @author pikachu
- * @date 2020-03-14 23:04:56
+ * @since 2020-03-14 23:04:56
  */
 @RestController
 @Api(tags = "管理端,分销订单管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
index 404067a7..a347eb48 100644
--- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
@@ -5,19 +5,25 @@ import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.token.Token;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.common.security.token.Token;
 import cn.lili.common.utils.StringUtils;
+<<<<<<< HEAD
 import cn.lili.common.verification.service.VerificationService;
+=======
+>>>>>>> master
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
-import cn.lili.modules.system.aspect.DemoSite;
+import cn.lili.modules.system.aspect.annotation.DemoSite;
 import cn.lili.modules.permission.entity.dos.AdminUser;
 import cn.lili.modules.permission.entity.dto.AdminUserDTO;
 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.service.VerificationService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
diff --git a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java
index 73724178..442a406f 100644
--- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.permission;
 
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
 import cn.lili.modules.permission.entity.dos.Department;
diff --git a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
index ba69cb2c..82f6806e 100644
--- a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
@@ -2,11 +2,12 @@ package cn.lili.controller.permission;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.system.aspect.DemoSite;
+import cn.lili.modules.system.aspect.annotation.DemoSite;
 import cn.lili.modules.permission.entity.dos.Menu;
 import cn.lili.modules.permission.entity.dto.MenuSearchParams;
 import cn.lili.modules.permission.entity.vo.MenuVO;
 import cn.lili.modules.permission.service.MenuService;
+import cn.lili.modules.system.aspect.annotation.DemoSite;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -21,7 +22,7 @@ import java.util.List;
  * 管理端,菜单管理接口
  *
  * @author Chopper
- * @date 2020/11/20 12:07
+ * @since 2020/11/20 12:07
  */
 @Slf4j
 @RestController
diff --git a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java
index 07edd0d9..4e4abbe7 100644
--- a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java
@@ -1,7 +1,6 @@
 package cn.lili.controller.permission;
 
-import cn.lili.common.enums.ResultCode;
-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;
@@ -20,7 +19,7 @@ import java.util.List;
  * 管理端,角色管理接口
  *
  * @author Chopper
- * @date 2020/11/20 18:50
+ * @since 2020/11/20 18:50
  */
 @RestController
 @Api(tags = "管理端,角色管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java
index 58633dc7..63b57355 100644
--- a/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java
@@ -17,7 +17,7 @@ import java.util.List;
  * 管理端,角色菜单接口
  *
  * @author Chopper
- * @date 2020/11/22 11:40
+ * @since 2020/11/22 11:40
  */
 @RestController
 @Api(tags = "管理端,角色菜单接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java
index 1cad5d54..b04971cb 100644
--- a/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java
@@ -17,7 +17,7 @@ import java.util.List;
  * 管理端,管理员角色接口
  *
  * @author Chopper
- * @date 2020/11/22 11:53
+ * @since 2020/11/22 11:53
  */
 @RestController
 @Api(tags = "管理端,管理员角色接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
index 5609a3e8..db837f99 100644
--- 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,7 @@ 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.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.promotion.entity.dos.CouponActivity;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
  * 优惠券活动
  *
  * @author Bulbasaur
- * @date: 2021/5/21 7:11 下午
+ * @since: 2021/5/21 7:11 下午
  */
 @RestController
 @Api(tags = "管理端,优惠券活动接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
index 69ac05ba..359dcff6 100644
--- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
@@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 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;
@@ -29,7 +29,7 @@ import java.util.List;
  * 管理端,优惠券接口
  *
  * @author paulG
- * @date 2020/10/9
+ * @since 2020/10/9
  **/
 @RestController
 @Api(tags = "管理端,优惠券接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java
index 8036f8e0..61206531 100644
--- a/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java
@@ -1,25 +1,26 @@
 package cn.lili.controller.promotion;
 
+import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
+import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
 import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams;
 import cn.lili.modules.promotion.service.FullDiscountService;
-import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 管理端,满额活动接口
  *
  * @author paulG
- * @date 2021/1/12
+ * @since 2021/1/12
  **/
 @RestController
 @Api(tags = "管理端,满额活动接口")
@@ -47,4 +48,16 @@ public class FullDiscountManagerController {
         return ResultUtil.data(fullDiscountService.getFullDiscount(id));
     }
 
+    @ApiOperation(value = "修改满额活动状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "满额活动ID", required = true, paramType = "path"),
+            @ApiImplicitParam(name = "promotionStatus", value = "满额活动状态", required = true, paramType = "path")
+    })
+    @PutMapping("/status/{id}/{promotionStatus}")
+    public ResultMessage<Object> updateCouponStatus(@PathVariable String id, @PathVariable String promotionStatus) {
+        if (fullDiscountService.updateFullDiscountStatus(id, PromotionStatusEnum.valueOf(promotionStatus))) {
+            return ResultUtil.success(ResultCode.SUCCESS);
+        }
+        return ResultUtil.error(ResultCode.ERROR);
+    }
 }
diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java
index 1f177fe0..350b9f20 100644
--- a/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java
@@ -7,7 +7,7 @@ import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.promotion.entity.dos.Pintuan;
 import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.entity.vos.PintuanSearchParams;
 import cn.lili.modules.promotion.entity.vos.PintuanVO;
 import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;
@@ -25,7 +25,7 @@ import java.util.Date;
  * 管理端,平台拼团接口
  *
  * @author paulG
- * @date 2020/10/9
+ * @since 2020/10/9
  **/
 @RestController
 @Api(tags = "管理端,平台拼团接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java
index d5429c81..5cdebfc1 100644
--- a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  * 管理端,积分商品分类接口
  *
  * @author paulG
- * @date 2021/1/14
+ * @since 2021/1/14
  **/
 @RestController
 @Api(tags = "管理端,积分商品分类接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java
index acfe4ca5..e31e9d0a 100644
--- a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java
@@ -24,7 +24,7 @@ import java.util.List;
  * 管理端,积分商品接口
  *
  * @author paulG
- * @date 2021/1/14
+ * @since 2021/1/14
  **/
 @RestController
 @Api(tags = "管理端,积分商品接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java
index 901e33dd..fea4cb30 100644
--- a/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java
@@ -21,7 +21,7 @@ import java.util.Map;
  * 管理端,促销接口
  *
  * @author paulG
- * @date 2021/2/2
+ * @since 2021/2/2
  **/
 @RestController
 @Api(tags = "管理端,促销接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java
index 91210d44..2877aa14 100644
--- a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  * 管理端,秒杀活动接口
  *
  * @author paulG
- * @date 2020/8/20
+ * @since 2020/8/20
  **/
 @RestController
 @Api(tags = "管理端,秒杀活动接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java b/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java
index 258cea23..e69648aa 100644
--- 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
- * @date: 2020/11/16 10:06 下午
+ * @since: 2020/11/16 10:06 下午
  */
 @Api(tags = "管理端,采购接口")
 @RestController
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java
index 51d180b2..0beb7cbc 100755
--- a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java
@@ -2,7 +2,7 @@ package cn.lili.controller.setting;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.PageUtil;
+import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
@@ -24,7 +24,7 @@ import javax.validation.Valid;
  * 管理端,app版本控制器
  *
  * @author Chopper
- * @date 2018-07-04 21:50:52
+ * @since 2018-07-04 21:50:52
  */
 @RestController
 @Api("管理端,app版本控制器")
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java
new file mode 100755
index 00000000..6722c921
--- /dev/null
+++ b/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java
@@ -0,0 +1,44 @@
+package cn.lili.controller.setting;
+
+import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.search.entity.dto.HotWordsDTO;
+import cn.lili.modules.search.service.EsGoodsSearchService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 管理端,app版本控制器
+ *
+ * @author Chopper
+ * @since 2018-07-04 21:50:52
+ */
+@RestController
+@Api(tags = "管理端,系统设置扩展接口")
+@RequestMapping("/manager/hotwords")
+public class HotWordsManagerController {
+
+    @Autowired
+    private EsGoodsSearchService esGoodsSearchService;
+
+    @ApiOperation(value = "获取热词")
+    @GetMapping
+    public ResultMessage getHotWords() {
+        return ResultUtil.data(esGoodsSearchService.getHotWords(0, 99));
+    }
+
+    @ApiOperation(value = "设置热词")
+    @PostMapping
+    public ResultMessage paymentForm(@Validated HotWordsDTO hotWords) {
+
+        esGoodsSearchService.setHotWords(hotWords);
+        return ResultUtil.success();
+    }
+
+}
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java
index 6fc50543..bd9e6dc6 100644
--- 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,7 +1,6 @@
 package cn.lili.controller.setting;
 
-import cn.lili.common.enums.ResultCode;
-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;
@@ -24,7 +23,7 @@ import java.util.List;
  * 管理端,即时配送接口
  *
  * @author pikachu
- * @date: 2020/11/17 7:56 下午
+ * @since: 2020/11/17 7:56 下午
  */
 @RestController
 @Api(tags = "管理端,即时配送接口")
@@ -40,7 +39,6 @@ public class InstantDeliveryManagerController {
         IPage<InstantDelivery> data = instantDeliveryService.page(PageUtil.initPage(page));
         //组织数据结构
         IPage<InstantDeliveryVO> newData = instantDeliveryService.getInstantDeliveryPage(data, page);
-        System.out.println();
         //返回数据
         return ResultUtil.data(newData);
     }
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java
index 846bff2c..b0891ebc 100644
--- 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
- * @date: 2020/11/17 7:56 下午
+ * @since: 2020/11/17 7:56 下午
  */
 @Slf4j
 @RestController
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java
index c836ebae..f5623706 100644
--- 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,7 +1,6 @@
 package cn.lili.controller.setting;
 
-import cn.lili.common.enums.ResultCode;
-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 +20,7 @@ import javax.validation.constraints.NotNull;
  * 管理端,物流公司接口
  *
  * @author Chopper
- * @date: 2020/11/17 7:56 下午
+ * @since: 2020/11/17 7:56 下午
  */
 @RestController
 @Api(tags = "管理端,物流公司接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java
index 9816d7a1..87b5bce0 100644
--- 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,8 +1,7 @@
 package cn.lili.controller.setting;
 
-import cn.lili.common.enums.ResultCode;
 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 +21,7 @@ import java.util.List;
  * 管理端,会员站内信管理接口
  *
  * @author Chopper
- * @date: 2020/11/17 4:31 下午
+ * @since: 2020/11/17 4:31 下午
  */
 @RestController
 @Api(tags = "管理端,会员站内信管理API")
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java
index 8eeac205..00e3e4e4 100644
--- a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java
@@ -30,7 +30,7 @@ import java.util.List;
  * 管理端,会员站内信管理接口
  *
  * @author Chopper
- * @date: 2020/11/17 4:31 下午
+ * @since: 2020/11/17 4:31 下午
  */
 @Slf4j
 @RestController
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
index dca3995d..558b6e2c 100644
--- a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
@@ -2,7 +2,7 @@ package cn.lili.controller.setting;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.system.aspect.DemoSite;
+import cn.lili.modules.system.aspect.annotation.DemoSite;
 import cn.lili.modules.system.service.RegionService;
 import cn.lili.modules.system.entity.dos.Region;
 import io.swagger.annotations.Api;
@@ -20,7 +20,7 @@ import java.util.List;
  * 管理端,行政地区管理接口
  *
  * @author Chopper
- * @date 2020/12/2 10:40
+ * @since 2020/12/2 10:40
  */
 @RestController
 @Api(tags = "管理端,行政地区管理接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java
index 491c3002..433d5054 100644
--- 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,7 +1,7 @@
 package cn.lili.controller.setting;
 
 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.common.vo.SearchVO;
@@ -20,7 +20,7 @@ import java.util.List;
  * 管理端,服务订阅消息接口
  *
  * @author Chopper
- * @date: 2020/11/17 4:33 下午
+ * @since: 2020/11/17 4:33 下午
  */
 @RestController
 @Api(tags = "管理端,服务订阅消息接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
index 5021c6d9..ee1ecd45 100644
--- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
@@ -2,10 +2,10 @@ package cn.lili.controller.setting;
 
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
-import cn.lili.common.exception.ServiceException;
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.exception.ServiceException;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.system.aspect.DemoSite;
+import cn.lili.modules.system.aspect.annotation.DemoSite;
 import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.dto.*;
 import cn.lili.modules.system.entity.dto.connect.QQConnectSetting;
@@ -28,7 +28,7 @@ import java.util.Collections;
  * 管理端,系统设置接口
  *
  * @author Chopper
- * @date 2020/11/26 15:53
+ * @since 2020/11/26 15:53
  */
 @RestController
 @Api(tags = "管理端,系统设置接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java
index 8a336f2d..a5caa8bb 100644
--- a/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 对一些系统设置的支持，例如动态表单等
  *
  * @author Chopper
- * @date 2020/11/26 15:53
+ * @since 2020/11/26 15:53
  */
 @RestController
 @Api(tags = "管理端,系统设置扩展接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java
index 5f72622e..204e1c92 100644
--- 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,7 +1,6 @@
 package cn.lili.controller.setting;
 
-import cn.lili.common.enums.ResultCode;
-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;
@@ -20,7 +19,7 @@ import java.util.List;
  * 管理端,短信接口
  *
  * @author Bulbasaur
- * @date: 2021/1/30 4:09 下午
+ * @since: 2021/1/30 4:09 下午
  */
 @RestController
 @Api(tags = "管理端,短信接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java
index c9e0a858..bc9da37b 100644
--- a/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java
@@ -19,7 +19,7 @@ import javax.validation.Valid;
  * 管理端,短信签名接口
  *
  * @author Chopper
- * @date: 2021/1/30 4:09 下午
+ * @since: 2021/1/30 4:09 下午
  */
 @RestController
 @Api(tags = "管理端,短信签名接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java
index 44a99f9f..a90c344a 100644
--- a/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java
@@ -19,7 +19,7 @@ import javax.validation.Valid;
  * 管理端,短信模板接口
  *
  * @author Bulbasaur
- * @date: 2021/1/30 4:09 下午
+ * @since: 2021/1/30 4:09 下午
  */
 @RestController
 @Api(tags = "管理端,短信模板接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java
index fe783888..366363ac 100644
--- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.setting;
 
 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.common.vo.SearchVO;
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java
index 1460e90f..f2f3634c 100644
--- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.setting;
 
 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.message.entity.dos.WechatMessage;
@@ -19,7 +19,7 @@ import java.util.List;
  * 管理端,微信消息接口
  *
  * @author Chopper
- * @date 2020/12/2 10:40
+ * @since 2020/12/2 10:40
  */
 @RestController
 @Api(tags = "管理端,微信消息接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java
index de2b59d4..58487a6d 100644
--- 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
- * @date: 2020/12/9 19:04
+ * @since: 2020/12/9 19:04
  */
 @Api(tags = "管理端,商品统计接口")
 @RestController
diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java
index 669d9e30..5774e0e9 100644
--- 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
- * @date: 2020/12/15 17:53
+ * @since: 2020/12/15 17:53
  */
 @Slf4j
 @Api(tags = "管理端,首页统计数据接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java
index 9c364405..7bccf0e7 100644
--- 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
- * @date: 2020/12/9 19:04
+ * @since: 2020/12/9 19:04
  */
 @Api(tags = "管理端,会员统计接口")
 @RestController
diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java
index 2094c62f..0ef29a00 100644
--- 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
- * @date: 2020/12/9 19:04
+ * @since: 2020/12/9 19:04
  */
 @Slf4j
 @Api(tags = "管理端,订单统计接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java
index ec77d92f..e555732e 100644
--- 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
- * @date: 2020/12/9 19:04
+ * @since: 2020/12/9 19:04
  */
 @Api(tags = "管理端,退款统计接口")
 @RestController
diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java
index df3406ff..78e09198 100644
--- a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java
@@ -20,7 +20,7 @@ import java.util.List;
  * 管理端,流量统计接口
  *
  * @author Chopper
- * @date 2021/2/9 11:19
+ * @since 2021/2/9 11:19
  */
 @Api(tags = "管理端,流量统计接口")
 @RestController
diff --git a/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java
index f82068ea..7933b125 100644
--- 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
- * @date: 2020/11/17 7:23 下午
+ * @since: 2020/11/17 7:23 下午
  */
 @RestController
 @Api(tags = "管理端,商家结算单接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
index 37c02320..5fe5eca7 100644
--- 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,7 @@ 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.DemoSite;
+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;
@@ -13,6 +13,7 @@ import cn.lili.modules.store.entity.vos.StoreSearchParams;
 import cn.lili.modules.store.entity.vos.StoreVO;
 import cn.lili.modules.store.service.StoreDetailService;
 import cn.lili.modules.store.service.StoreService;
+import cn.lili.modules.system.aspect.annotation.DemoSite;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
@@ -29,7 +30,7 @@ import java.util.List;
  * 管理端,店铺管理接口
  *
  * @author Bulbasaur
- * @date: 2020/12/6 16:09
+ * @since: 2020/12/6 16:09
  */
 @Api(tags = "管理端,店铺管理接口")
 @RestController
diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java
index aa0bacf7..6c9f9e18 100644
--- 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
- * @date: 2020/12/6 16:09
+ * @since: 2020/12/6 16:09
  */
 @RestController
 @Transactional(rollbackFor = Exception.class)
diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java
index 8ae8f5f0..f027ea03 100644
--- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java
@@ -6,6 +6,7 @@ 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.store.entity.dto.StoreAfterSaleAddressDTO;
 import cn.lili.modules.system.entity.vo.Traces;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
@@ -22,7 +23,7 @@ import java.util.List;
  * 管理端,售后接口
  *
  * @author Bulbasaur
- * @date: 2021/1/6 14:11
+ * @since: 2021/1/6 14:11
  */
 @RestController
 @RequestMapping("/manager/afterSale")
@@ -80,7 +81,7 @@ public class AfterSaleManagerController {
             @ApiImplicitParam(name = "remark", value = "备注", paramType = "query"),
             @ApiImplicitParam(name = "actualRefundPrice", value = "实际退款金额", paramType = "query")
     })
-    @PutMapping(value = "/review/{afterSaleSn}")
+    @PutMapping(value = "/confirm/{afterSaleSn}")
     public ResultMessage<AfterSale> review(@NotNull(message = "请选择售后单") @PathVariable String afterSaleSn,
                                            @NotNull(message = "请审核") String serviceStatus,
                                            String remark,
@@ -89,4 +90,10 @@ public class AfterSaleManagerController {
         return ResultUtil.data(afterSaleService.review(afterSaleSn, serviceStatus, remark,actualRefundPrice));
     }
 
+    @ApiOperation(value = "获取商家售后收件地址")
+    @ApiImplicitParam(name = "sn", value = "售后单号", required = true, paramType = "path")
+    @GetMapping(value = "/getStoreAfterSaleAddress/{sn}")
+    public ResultMessage<StoreAfterSaleAddressDTO> getStoreAfterSaleAddress(@NotNull(message = "售后单号") @PathVariable("sn") String sn) {
+        return ResultUtil.data(afterSaleService.getStoreAfterSaleAddressDTO(sn));
+    }
 }
diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java
index c4afdb76..396e4b97 100644
--- 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,7 +1,6 @@
 package cn.lili.controller.trade;
 
-import cn.lili.common.enums.ResultCode;
-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 +20,7 @@ import javax.validation.Valid;
  * 管理端,售后原因接口
  *
  * @author Bulbasaur
- * @date: 2021/1/6 14:11
+ * @since: 2021/1/6 14:11
  */
 @RestController
 @RequestMapping("/manager/afterSaleReason")
diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java
index fbb2c68c..f74d40d3 100644
--- 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
- * @date: 2020/12/5
+ * @since: 2020/12/5
  */
 @RestController
 @Api(tags = "管理端,交易投诉接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java
index 80b1cbbf..401461e2 100644
--- a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.trade;
 
-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 4:34 下午
+ * @since 2020/11/17 4:34 下午
  */
 @RestController
 @Transactional(rollbackFor = Exception.class)
diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java
index a88b4813..55aa9753 100644
--- a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java
@@ -27,7 +27,7 @@ import java.util.List;
  * 管理端,订单API
  *
  * @author Chopper
- * @date 2020/11/17 4:34 下午
+ * @since 2020/11/17 4:34 下午
  */
 @RestController
 @RequestMapping("/manager/orders")
diff --git a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java
index 7c16c31b..48a58eb4 100644
--- a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java
@@ -1,6 +1,6 @@
 package cn.lili.controller.trade;
 
-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 Chopper
- * @date 2020/11/17 4:34 下午
+ * @since 2020/11/17 4:34 下午
  */
 @RestController
 @Api(tags = "管理端,收款日志接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java
index d5b5d859..984ad00c 100644
--- a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 管理端,发票记录接口
  *
  * @author paulG
- * @date 2020/11/17 4:34 下午
+ * @since 2020/11/17 4:34 下午
  **/
 @RestController
 @Api(tags = "管理端,发票记录接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java
index bd3cd0fb..81079760 100644
--- a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
  * 管理端,预存款充值记录接口
  *
  * @author pikachu
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
  */
 @RestController
 @Api(tags = "管理端,预存款充值记录接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java
index 37aff972..8b735320 100644
--- 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,6 +1,6 @@
 package cn.lili.controller.trade;
 
-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/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
  */
 @RestController
 @Api(tags = "管理端,退款日志接口")
diff --git a/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java
index 2818bdde..ad664eab 100644
--- 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
- * @date: 2020/11/16 10:07 下午
+ * @since: 2020/11/16 10:07 下午
  */
 @RestController
 @Api(tags = "管理端,预存款充值记录接口")
diff --git a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java
index 5f311c2f..70706a82 100755
--- a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java
+++ b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java
@@ -1,12 +1,13 @@
 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.PermissionEnum;
 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;
@@ -20,6 +21,8 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
+import org.springframework.util.PatternMatchUtils;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 import javax.naming.NoPermissionException;
 import javax.servlet.FilterChain;
@@ -71,27 +74,28 @@ public class ManagerAuthenticationFilter extends BasicAuthenticationFilter {
      */
     private void customAuthentication(HttpServletRequest request, HttpServletResponse response, UsernamePasswordAuthenticationToken authentication) throws NoPermissionException {
         AuthUser authUser = (AuthUser) authentication.getDetails();
+        String requestUrl = request.getRequestURI();
         Map<String, List<String>> permission = (Map<String, List<String>>) cache.get(CachePrefix.PERMISSION_LIST.getPrefix(UserEnums.MANAGER) + authUser.getId());
-        if (authUser.getIsSuper()) {
-            return;
-        } else {
-            //用户是否拥有权限判定œ
+        //如果不是超级管理员， 不做鉴权
+        if (!authUser.getIsSuper()) {
             //获取数据权限
-//           if (request.getMethod().equals(RequestMethod.GET.name())) {
-//               if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER).toArray(new String[0]), request.getRequestURI()) ||
-//                       PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.QUERY).toArray(new String[0]), request.getRequestURI())) {
-//
-//                   ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限"));
-//                   throw new NoPermissionException("权限不足");
-//               }
-//           } else {
-//               if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER).toArray(new String[0]), request.getRequestURI())) {
-//
-//                   ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限"));
-//                   throw new NoPermissionException("权限不足");
-//               }
-//           }
-            return;
+            if (request.getMethod().equals(RequestMethod.GET.name())) {
+                //如果用户的超级权限和查阅权限都不包含当前请求的api
+                if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), requestUrl) &&
+                        !PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.QUERY.name()).toArray(new String[0]), requestUrl)) {
+
+                    ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限"));
+                    throw new NoPermissionException("权限不足");
+                }
+            }
+            //非get请求（数据操作） 判定
+            else {
+                if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), request.getRequestURI())) {
+
+                    ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限"));
+                    throw new NoPermissionException("权限不足");
+                }
+            }
         }
     }
 
diff --git a/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java b/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java
index 809105a5..32fb6e4f 100644
--- a/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java
+++ b/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java
@@ -1,8 +1,8 @@
 package cn.lili.security;
 
-import cn.lili.common.cache.Cache;
+import cn.lili.cache.Cache;
 import cn.lili.common.security.CustomAccessDeniedHandler;
-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;
@@ -17,7 +17,7 @@ import org.springframework.web.cors.CorsConfigurationSource;
  * spring Security 核心配置类 Manager安全配置中心
  *
  * @author Chopper
- * @date 2020/11/14 16:20
+ * @since 2020/11/14 16:20
  */
 @Slf4j
 @Configuration
diff --git a/manager-api/src/main/resources/application.yml b/manager-api/src/main/resources/application.yml
index 0d6ad253..99c408e5 100644
--- a/manager-api/src/main/resources/application.yml
+++ b/manager-api/src/main/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:
diff --git a/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java b/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java
index d0ed486a..3a4385f5 100644
--- a/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java
+++ b/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java
@@ -1,7 +1,7 @@
 package cn.lili.test.CacheTest;
 
-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.modules.statistics.util.StatisticsSuffix;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -18,7 +18,6 @@ import java.util.Set;
 /**
  * @author Chopper
  * @version v1.0
- * @Description:
  * @since v7.0
  * 2021/1/15 16:25
  */
diff --git a/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java b/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java
index 5c155fc6..3964d5b5 100644
--- a/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java
+++ b/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java
@@ -1,7 +1,8 @@
 package cn.lili.test.promotion;
 
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.common.vo.PageVO;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.promotion.entity.dos.Coupon;
diff --git a/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java b/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java
index ece3b3dd..068e60a2 100644
--- a/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java
+++ b/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java
@@ -8,7 +8,7 @@ import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.promotion.entity.dos.FullDiscount;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 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.FullDiscountSearchParams;
 import cn.lili.modules.promotion.service.FullDiscountService;
 import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
diff --git a/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java b/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java
index 6e593668..54f2105d 100644
--- a/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java
+++ b/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java
@@ -6,7 +6,7 @@ import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.promotion.entity.dto.BasePromotion;
 import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
-import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.service.PromotionPriceService;
 import cn.lili.modules.promotion.service.PromotionService;
 import cn.lili.modules.promotion.service.PromotionGoodsService;
diff --git a/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java b/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java
index f5f34bf1..36c9c20b 100644
--- a/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java
+++ b/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java
@@ -1,8 +1,8 @@
 package cn.lili.test.rocketmq;
 
-import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.common.rocketmq.tags.MqOrderTagsEnum;
-import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.MqOrderTagsEnum;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/pom.xml b/pom.xml
index 411f37da..453977cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,12 @@
                     </resources>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${maven-javadoc-plugin.version}</version>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/seller-api/src/main/java/cn/lili/StoreApiApplication.java b/seller-api/src/main/java/cn/lili/StoreApiApplication.java
index 26ced53e..58869a2d 100644
--- a/seller-api/src/main/java/cn/lili/StoreApiApplication.java
+++ b/seller-api/src/main/java/cn/lili/StoreApiApplication.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
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
index 9b1d761e..e4fe6bb9 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
@@ -21,7 +21,7 @@ import java.util.List;
  * 店铺端,分类绑定参数组管理接口
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @RestController
 @Api(tags = "店铺端,分类绑定参数组管理接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java
index e4aaebe9..656efb43 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java
@@ -18,7 +18,7 @@ import java.util.List;
  * 店铺端,商品分类规格接口
  *
  * @author pikachu
- * @date 2020-02-27 15:18:56
+ * @since 2020-02-27 15:18:56
  */
 @RestController
 @Api(tags = "店铺端,商品分类规格接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
index b2530cb1..9386ceb0 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
@@ -26,7 +26,7 @@ import java.util.List;
  * 店铺端,商品分类接口
  *
  * @author Chopper
- * @date 2021/2/20 2:26 下午
+ * @since 2021/2/20 2:26 下午
  */
 @RestController
 @Api(tags = "店铺端,商品分类接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java
index 2b2e04b4..91a08db4 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
  * 店铺端,草稿商品接口
  *
  * @author paulG
- * @date 2021/2/20 2:26 下午
+ * @since 2021/2/20 2:26 下午
  *
  */
 @RestController
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java
index a5b8e52c..cd122b55 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.goods;
 
 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.common.vo.SearchVO;
@@ -19,7 +19,7 @@ import java.util.List;
  * 店铺端,商品相册接口
  *
  * @author pikachu
- * @date 2020-03-13 11:18:56
+ * @since 2020-03-13 11:18:56
  */
 @RestController
 @Api(tags = "店铺端,商品相册接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java
index 9830dbfa..6d893887 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java
@@ -20,7 +20,7 @@ import java.util.List;
  * 店铺端,店铺分类接口
  *
  * @author Bulbasaur
- * @date 2020/11/17 2:32 下午
+ * @since 2020/11/17 2:32 下午
  */
 @Api(tags = "店铺端,店铺分类接口")
 @RestController
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
index a9661473..7870eebd 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
@@ -32,7 +32,7 @@ import java.util.List;
  * 店铺端,商品接口
  *
  * @author pikachu
- * @date 2020-02-23 15:18:56
+ * @since 2020-02-23 15:18:56
  */
 @RestController
 @Api(tags = "店铺端,商品接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
index f6e00d27..4a1ff764 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
@@ -1,7 +1,7 @@
 package cn.lili.controller.goods;
 
 
-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;
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 店铺端,商品计量单位接口
  *
  * @author Bulbasaur
- * @date 2020/11/26 16:15
+ * @since 2020/11/26 16:15
  */
 @RestController
 @Api(tags = "店铺端,商品计量单位接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java
index 1bdb6968..2d944079 100644
--- a/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java
@@ -18,7 +18,7 @@ import java.util.List;
  * 店铺端,规格管理接口
  *
  * @author pikachu
- * @date 2020-02-18 15:18:56
+ * @since 2020-02-18 15:18:56
  */
 @RestController
 @Api(tags = "店铺端,规格接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java
index 0846a3ad..8a6778f8 100644
--- a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java
+++ b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 店铺端,管理员接口
  *
  * @author Chopper
- * @date 2020/11/16 10:57
+ * @since 2020/11/16 10:57
  */
 @RestController
 @Api(tags = "店铺端,管理员接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java
index 28e3784f..73bd5b38 100644
--- a/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 店铺端,文章接口
  *
  * @author pikachu
- * @date 2020-05-06 15:18:56
+ * @since 2020-05-06 15:18:56
  */
 @RestController
 @Api(tags = "店铺端,文章接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java
index caea7622..eef1afab 100644
--- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java
@@ -22,7 +22,7 @@ import java.util.List;
  * 店铺端,直播商品接口
  *
  * @author Bulbasaur
- * @date: 2021/5/17 2:05 下午
+ * @since: 2021/5/17 2:05 下午
  */
 @RestController
 @Api(tags = "店铺端,直播商品接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java
index 3049975e..bb35cbda 100644
--- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
  * 店铺端,直播间接口
  *
  * @author Bulbasaur
- * @date: 2021/5/17 2:05 下午
+ * @since: 2021/5/17 2:05 下午
  */
 @RestController
 @Api(tags = "店铺端,直播间接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java
index eb6b6576..3bd675a4 100644
--- a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull;
  * 店铺端,分销商品接口
  *
  * @author Bulbasaur
- * @date 2020/11/16 10:06 下午
+ * @since 2020/11/16 10:06 下午
  */
 @RestController
 @Api(tags = "店铺端,分销商品接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java
index 5f844431..b5b9f0e9 100644
--- a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 店铺端,分销订单接口
  *
  * @author Bulbasaur
- * @date 2020/11/16 10:06 下午
+ * @since 2020/11/16 10:06 下午
  */
 @RestController
 @Api(tags = "店铺端,分销订单接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java
index d9c97762..639164e1 100644
--- a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java
+++ b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java
@@ -4,8 +4,8 @@ package cn.lili.controller.passport;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
-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.service.MemberService;
@@ -22,7 +22,7 @@ import javax.validation.constraints.NotNull;
  * 店铺端,商家登录接口
  *
  * @author Chopper
- * @date 2020/12/22 15:02
+ * @since 2020/12/22 15:02
  */
 
 @RestController
diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java
index 8ab6aa5d..06ba79dd 100644
--- a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java
@@ -25,7 +25,7 @@ import java.util.List;
  * 店铺端,优惠券接口
  *
  * @author paulG
- * @date 2020/8/28
+ * @since 2020/8/28
  **/
 @RestController
 @Api(tags = "店铺端,优惠券接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java
index fafdb403..8ba124f7 100644
--- a/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java
@@ -1,18 +1,20 @@
 package cn.lili.controller.promotion;
 
 import cn.lili.common.enums.ResultCode;
+import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
 import cn.lili.modules.promotion.entity.dos.FullDiscount;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
 import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams;
 import cn.lili.modules.promotion.service.FullDiscountService;
-import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
  * 店铺端,满额活动接口
  *
  * @author paulG
- * @date 2020/8/19
+ * @since 2020/8/19
  **/
 @RestController
 @Api(tags = "店铺端,满额活动接口")
@@ -75,4 +77,18 @@ public class FullDiscountStoreController {
         return ResultUtil.success(ResultCode.FULL_DISCOUNT_EDIT_DELETE);
     }
 
+
+    @ApiOperation(value = "修改满额活动状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "满额活动ID", required = true, paramType = "path"),
+            @ApiImplicitParam(name = "promotionStatus", value = "满额活动状态", required = true, paramType = "path")
+    })
+    @PutMapping("/status/{id}/{promotionStatus}")
+    public ResultMessage<Object> updateCouponStatus(@PathVariable String id, @PathVariable String promotionStatus) {
+        if (fullDiscountService.updateFullDiscountStatus(id, PromotionStatusEnum.valueOf(promotionStatus))) {
+            return ResultUtil.success(ResultCode.SUCCESS);
+        }
+        return ResultUtil.error(ResultCode.ERROR);
+    }
+
 }
diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java
index 205867e2..ba499b86 100644
--- a/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java
@@ -8,7 +8,7 @@ import cn.lili.common.enums.ResultUtil;
 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.PromotionTypeEnum;
+import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.entity.vos.PintuanSearchParams;
 import cn.lili.modules.promotion.entity.vos.PintuanVO;
 import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;
diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java
index c620777d..010ae363 100644
--- a/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java
@@ -25,7 +25,7 @@ import java.util.List;
  * 店铺端,秒杀活动接口
  *
  * @author paulG
- * @date 2020/8/26
+ * @since 2020/8/26
  **/
 @RestController
 @Api(tags = "店铺端,秒杀活动接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java
index c0a2ef1f..ef544589 100644
--- a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java
@@ -18,7 +18,7 @@ import java.util.List;
  * 店铺端,运费模板接口
  *
  * @author paulG
- * @date 2020/8/26
+ * @since 2020/8/26
  **/
 @RestController
 @Api(tags = "店铺端,运费模板接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
index 414e916f..a5c296bc 100644
--- a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 店铺端,日志管理接口
  *
  * @author Chopper
- * @date: 2020/11/22 14:23
+ * @since: 2020/11/22 14:23
  */
 @RestController
 @Transactional(rollbackFor = Exception.class)
diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java
index 26b6d955..721b5651 100644
--- a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java
@@ -19,7 +19,7 @@ import java.util.List;
  * 店铺端,物流公司接口
  *
  * @author Bulbasaur
- * @date: 2020/11/22 14:23
+ * @since: 2020/11/22 14:23
  */
 @RestController
 @Api(tags = "店铺端,物流公司接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java
index 94793f54..b6575e9b 100644
--- a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java
@@ -21,7 +21,7 @@ import javax.validation.Valid;
  * 店铺端,商家地址（自提点）接口
  *
  * @author Bulbasaur
- * @date: 2020/11/22 14:23
+ * @since: 2020/11/22 14:23
  */
 @RestController
 @Api(tags = "店铺端,商家地址（自提点）接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java
index 9214e1a0..4d76923e 100644
--- a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java
@@ -23,7 +23,7 @@ import java.util.Map;
  * 店铺端,消息接口
  *
  * @author Bulbasaur
- * @date: 2020/11/22 14:23
+ * @since: 2020/11/22 14:23
  */
 @RestController
 @Api(tags = "店铺端,消息接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java
index f8758ad0..9bb45b07 100644
--- a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java
@@ -23,7 +23,7 @@ import javax.validation.Valid;
  * 店铺端,页面接口
  *
  * @author paulGao
- * @date: 2020/11/22 14:23
+ * @since: 2020/11/22 14:23
  */
 @RestController
 @Api(tags = "店铺端,页面接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java
index 6a3b001b..3a9a5f11 100644
--- a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java
@@ -24,7 +24,7 @@ import javax.validation.Valid;
  * 店铺端,店铺设置接口
  *
  * @author Bulbasaur
- * @date: 2020/11/22 14:23
+ * @since: 2020/11/22 14:23
  */
 @RestController
 @Api(tags = "店铺端,店铺设置接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java
index 7cae959f..e2ed4f3f 100644
--- a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java
@@ -19,7 +19,7 @@ import java.util.List;
  * 店铺端,商品统计接口
  *
  * @author Bulbasaur
- * @date: 2020/11/22 14:23
+ * @since: 2020/11/22 14:23
  */
 @Api(tags = "店铺端,商品统计接口")
 @RestController
diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java
index 6146ebda..baa29a3d 100644
--- a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java
@@ -21,7 +21,7 @@ import java.util.List;
  * 店铺端,首页统计接口
  *
  * @author Bulbasaur
- * @date: 2020/12/9 19:04
+ * @since: 2020/12/9 19:04
  */
 @Api(tags = "店铺端,首页统计接口")
 @RestController
diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java
index 4a17cdef..1a0e6639 100644
--- a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java
@@ -27,7 +27,7 @@ import java.util.List;
  * 店铺端,订单统计接口
  *
  * @author Bulbasaur
- * @date: 2020/12/9 19:04
+ * @since: 2020/12/9 19:04
  */
 @Slf4j
 @Api(tags = "店铺端,订单统计接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java
index f0146d49..c31161c5 100644
--- a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 店铺端,退款统计接口
  *
  * @author Bulbasaur
- * @date: 2020/12/9 19:04
+ * @since: 2020/12/9 19:04
  */
 @Api(tags = "店铺端,退款统计接口")
 @RestController
diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java
index d4f97455..7bb78546 100644
--- a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java
@@ -19,7 +19,7 @@ import java.util.List;
  * 店铺端,流量统计接口
  *
  * @author Chopper
- * @date 2021/2/9 11:19
+ * @since 2021/2/9 11:19
  */
 @Api(tags = "店铺端,流量统计接口")
 @RestController
diff --git a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java
index 214f63b6..668e4e4e 100644
--- a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java
@@ -6,6 +6,7 @@ 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.store.entity.dto.StoreAfterSaleAddressDTO;
 import cn.lili.modules.system.entity.vo.Traces;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
@@ -22,7 +23,7 @@ import java.util.List;
  * 店铺端,售后管理接口
  *
  * @author Chopper
- * @date 2020/11/17 4:29 下午
+ * @since 2020/11/17 4:29 下午
  */
 @RestController
 @Api(tags = "店铺端,售后管理接口")
@@ -88,4 +89,11 @@ public class AfterSaleStoreController {
         return ResultUtil.data(afterSaleService.deliveryTraces(sn));
     }
 
+    @ApiOperation(value = "获取商家售后收件地址")
+    @ApiImplicitParam(name = "sn", value = "售后单号", required = true, paramType = "path")
+    @GetMapping(value = "/getStoreAfterSaleAddress/{sn}")
+    public ResultMessage<StoreAfterSaleAddressDTO> getStoreAfterSaleAddress(@NotNull(message = "售后单号") @PathVariable("sn") String sn) {
+        return ResultUtil.data(afterSaleService.getStoreAfterSaleAddressDTO(sn));
+    }
+
 }
diff --git a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java
index f967539c..8e18e1f4 100644
--- a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
  * 店铺端,结算单接口
  *
  * @author Chopper
- * @date 2020/11/17 4:29 下午
+ * @since 2020/11/17 4:29 下午
  */
 @RestController
 @Api(tags = "店铺端,结算单接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java
index 79279fc3..805d8c04 100644
--- a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
  * 店铺端,商品评价管理接口
  *
  * @author Bulbasaur
- * @date 2020-02-25 14:10:16
+ * @since 2020-02-25 14:10:16
  */
 @RestController
 @Api(tags = "店铺端,商品评价管理接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java
index 77e46b75..06857b21 100644
--- a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  * 店铺端,交易投诉接口
  *
  * @author paulG
- * @date 2020/12/5
+ * @since 2020/12/5
  **/
 @RestController
 @Api(tags = "店铺端,交易投诉接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java
index 274c0eed..3cb8c185 100644
--- a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java
@@ -19,7 +19,7 @@ import java.util.List;
  * 店铺端,订单日志接口
  *
  * @author Chopper
- * @date 2020/12/5
+ * @since 2020/12/5
  **/
 @RestController
 @Api(tags = "店铺端,订单日志接口")
diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java
index 1290ded1..f73bfec7 100644
--- a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java
@@ -1,13 +1,10 @@
 package cn.lili.controller.trade;
 
-import cn.hutool.poi.excel.ExcelReader;
-import cn.hutool.poi.excel.ExcelUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.config.context.ThreadContextHolder;
+import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.modules.member.entity.dto.MemberAddressDTO;
-import cn.lili.modules.order.order.entity.dto.OrderBatchDeliverDTO;
 import cn.lili.modules.order.order.entity.dto.OrderExportDTO;
 import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
 import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
@@ -30,15 +27,13 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 店铺端,订单接口
  *
  * @author Chopper
- * @date 2020/11/17 4:35 下午
+ * @since 2020/11/17 4:35 下午
  **/
 @Slf4j
 @RestController
diff --git a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java
index a25d7d6f..9486452c 100644
--- a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  * 店铺端,发票接口
  *
  * @author Bulbasaur
- * @date 2020/11/28 14:09
+ * @since 2020/11/28 14:09
  **/
 @RestController
 @Api(tags = "店铺端,发票接口")
diff --git a/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java b/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java
index 30439eaa..7b20ea1f 100755
--- a/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.java
+++ b/seller-api/src/main/java/cn/lili/security/StoreAuthenticationFilter.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;
diff --git a/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java b/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java
index d06df79d..50202694 100644
--- a/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java
+++ b/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.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;
@@ -18,7 +18,7 @@ import org.springframework.web.cors.CorsConfigurationSource;
  * spring Security 核心配置类 Store安全配置中心
  *
  * @author Chopper
- * @date 2020/11/14 16:20
+ * @since 2020/11/14 16:20
  */
 @Slf4j
 @Configuration
diff --git a/seller-api/src/main/resources/application.yml b/seller-api/src/main/resources/application.yml
index fe58f5f8..24c34483 100644
--- a/seller-api/src/main/resources/application.yml
+++ b/seller-api/src/main/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:
diff --git a/update-sql/li_notice_message.sql b/update-sql/li_notice_message.sql
index 85df5c7c..876eeb4e 100644
--- a/update-sql/li_notice_message.sql
+++ b/update-sql/li_notice_message.sql
@@ -11,7 +11,7 @@
  Target Server Version : 80023
  File Encoding         : 65001
 
- Date: 18/07/2021 17:11:47
+ Date: 21/07/2021 19:26:53
 */
 
 SET NAMES utf8mb4;
@@ -56,8 +56,10 @@ INSERT INTO `li_notice_message` VALUES (13, NULL, '2021-07-15 19:39:31.000000',
 INSERT INTO `li_notice_message` VALUES (14, NULL, '2021-07-15 19:39:39.000000', NULL, NULL, '2021-07-15 19:39:43.000000', '订单 #{商品名称} 商家已签收哦，请关注后续退款状态，将在1-3个工作日内自动退款~', '退货物品签收通知', 'OPEN', '退货物品签收通知', 'goods');
 INSERT INTO `li_notice_message` VALUES (15, NULL, '2021-07-15 19:44:38.000000', NULL, NULL, '2021-07-15 19:44:40.000000', '售后单 #{商品名称} 已经完成，请关注及时关注售后单状态~', '售后完成通知', 'OPEN', '售后完成通知', 'goods');
 INSERT INTO `li_notice_message` VALUES (16, NULL, '2021-07-15 19:47:27.000000', NULL, NULL, '2021-07-15 19:47:31.000000', '您当前到账{获得积分}积分，消费#{消费积分} 积分，积分可以抵现金哦，真的很棒棒呢~', '积分变更通知', 'OPEN', '积分变更通知', 'income_points,expenditure_points');
-INSERT INTO `li_notice_message` VALUES (17, NULL, '2021-07-15 19:53:10.000000', NULL, NULL, '2021-07-15 19:53:13.000000', '您的余额账户今日收入#{收入金额}，支出#{支出金额}，如遇异常变动，请及时联系我们哦~', '余额账户变更通知', 'OPEN', '余额账户变更通知', 'income,expenditure');
-INSERT INTO `li_notice_message` VALUES (18, NULL, '2021-07-15 19:57:01.000000', NULL, NULL, '2021-07-15 19:57:04.000000', '恭喜您，您的提处理成功，提现金额为#{收入金额}，将在1-3工作日内到账', '提现成功通知', 'OPEN', '提现成功通知', 'income');
+INSERT INTO `li_notice_message` VALUES (17, NULL, '2021-07-15 19:53:10.000000', NULL, NULL, '2021-07-15 19:53:13.000000', '您的余额账户今日收入¥#{收入金额}，支出¥#{支出金额}，如遇异常变动，请及时联系我们哦~', '余额账户变更通知', 'OPEN', '余额账户变更通知', 'income,expenditure');
+INSERT INTO `li_notice_message` VALUES (18, NULL, '2021-07-15 19:57:01.000000', NULL, NULL, '2021-07-15 19:57:04.000000', '恭喜您，您的提处理成功，提现金额为¥#{收入金额}，将在1-3工作日内到账', '提现成功通知', 'OPEN', '提现成功通知', 'income');
+INSERT INTO `li_notice_message` VALUES (19, NULL, '2021-07-21 18:58:10.000000', NULL, NULL, '2021-07-21 18:58:13.000000', '恭喜您，您的提现金额为¥#{金额}的申请已经提交审核，请及时关注审核动态哦~', '提现申请提交成功通知', 'OPEN', '提现申请提交成功通知', 'price');
+INSERT INTO `li_notice_message` VALUES (20, NULL, '2021-07-21 19:16:58.000000', NULL, NULL, '2021-07-21 19:17:02.000000', '很抱歉，您的提现金额为¥#{金额}的申请已被拒绝，如有问题请及时联系管理员哦~', '提现申请驳回通知', 'OPEN', '提现申请驳回通知', 'price');
 COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/update-sql/version4.1to4.2.sql b/update-sql/version4.1to4.2.sql
index ee0c7839..a0eaa351 100644
--- a/update-sql/version4.1to4.2.sql
+++ b/update-sql/version4.1to4.2.sql
@@ -13,4 +13,16 @@ ALTER TABLE li_promotion_goods ADD goods_type varchar (200);
 /** 修改历史积分积分类型的字段类型 **/
 alter table li_member_points_history modify column point_type varchar(50);
 update li_member_points_history set point_type = 'INCREASE' where point_type=1;
-update li_member_points_history set point_type = 'REDUCE' where point_type=0;
\ No newline at end of file
+update li_member_points_history set point_type = 'REDUCE' where point_type=0;
+
+/** 添加分词管理菜单*/
+INSERT INTO `lilishop`.`li_menu` (`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1349247640584085511, 'admin', '2021-01-13 14:51:20', b'0', 'admin', '2021-02-25 09:02:59', 'null', 'customWords/index', 'ios-american-football', 2, 'customWords', '1349237129847005184', 'customWords', 8.00, '分词管理', 'null');
+
+/** 修改会员评价店铺图片字段类型 **/
+alter table li_member_evaluation modify column reply_image text;
+
+/** 修改售后图片字段类型 **/
+alter table li_after_sale modify column after_sale_image text;
+
+/** 提现申请审核sql **/
+INSERT INTO `lilishop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1367042804944994305, 'admin', '2021-03-03 09:22:58', b'0', NULL, NULL, NULL, 'member/advance/withdrawApply', 'ios-alert', 2, 'withdrawApply', '1367042490443497472', 'withdrawApply', 1.00, '提现申请', NULL);
\ No newline at end of file
diff --git a/update-sql/version4.2to4.3.sql b/update-sql/version4.2to4.3.sql
index 52e00042..f7a5c8aa 100644
--- a/update-sql/version4.2to4.3.sql
+++ b/update-sql/version4.2to4.3.sql
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 /** 添加结算单积分、砍价结算价信息**/
 ALTER TABLE li_bill ADD point_settlement_price double DEFAULT 0.00 COMMENT '积分商品结算金额 ';
 ALTER TABLE li_bill ADD kanjia_settlement_price double DEFAULT 0.00 COMMENT '砍价商品结算金额';
 ALTER TABLE li_store_flow ADD point_settlement_price double DEFAULT 0.00 COMMENT '积分商品结算金额';
-ALTER TABLE li_store_flow ADD kanjia_settlement_price double DEFAULT 0.00 COMMENT '砍价商品结算金额';
\ No newline at end of file
+ALTER TABLE li_store_flow ADD kanjia_settlement_price double DEFAULT 0.00 COMMENT '砍价商品结算金额';
+=======
+/** 热词管理*/
+UPDATE `lilishop`.`li_menu` SET `create_by` = 'admin', `create_time` = '2021-03-03 09:54:51', `delete_flag` = b'0', `update_by` = 'admin', `update_time` = '2021-07-23 19:07:45', `description` = 'null', `front_route` = 'page/article-manage/hotWords', `icon` = 'md-aperture', `level` = 2, `name` = 'hotKeyWord', `parent_id` = '1367050250249830400', `path` = 'hotKeyWord', `sort_order` = 0.00, `title` = '搜索热词', `front_component` = 'null' WHERE `id` = 1367050829697122304;
+>>>>>>> master