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 a78f8b8d..059485f5 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
@@ -38,8 +38,8 @@ public class MemberWithdrawApplyBuyerController {
     public ResultMessage<IPage<MemberWithdrawApply>> getByPage(PageVO page, MemberWithdrawApplyQueryVO memberWithdrawApplyQueryVO) {
         memberWithdrawApplyQueryVO.setMemberId(UserContext.getCurrentUser().getId());
         //构建查询 返回数据
-        IPage<MemberWithdrawApply> memberWithdrawApplyIPage = memberWithdrawApplyService.getMemberWithdrawPage(page, memberWithdrawApplyQueryVO);
-        return ResultUtil.data(memberWithdrawApplyIPage);
+        IPage<MemberWithdrawApply> memberWithdrawApplyPage = memberWithdrawApplyService.getMemberWithdrawPage(page, memberWithdrawApplyQueryVO);
+        return ResultUtil.data(memberWithdrawApplyPage);
     }
 
 }
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 b8c97954..edc3d3f0 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
@@ -40,7 +40,6 @@ public class DistributionBuyerController {
     @Autowired
     private DistributionOrderService distributionOrderService;
 
-    //申请分销员
     @ApiOperation(value = "申请分销员")
     @PostMapping
     public ResultMessage<Object> applyDistribution(DistributionApplyDTO distributionApplyDTO) {
@@ -63,7 +62,6 @@ public class DistributionBuyerController {
         return ResultUtil.data(distributionService.getDistribution());
     }
 
-    //申请分销员
     @ApiOperation(value = "绑定分销员")
     @ApiImplicitParam(name = "distributionId", value = "分销员ID", required = true, paramType = "path")
     @GetMapping("/bindingDistribution/{distributionId}")
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 cc056c0d..20e33256 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
@@ -81,6 +81,7 @@ public class FileController {
                 if (file.getUserEnums().equals(authUser.getRole().name())) {
                     break;
                 }
+            default:
                 throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
         }
         fileService.updateById(file);
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 ff8dbef5..b41d0ace 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
@@ -28,10 +28,9 @@ public class SliderImageController {
     @Autowired
     private VerificationService verificationService;
 
-    //一分钟同一个ip请求10次
     @LimitPoint(name = "slider_image", key = "verification")
     @GetMapping("/{verificationEnums}")
-    @ApiOperation(value = "获取校验接口")
+    @ApiOperation(value = "获取校验接口,一分钟同一个ip请求10次")
     public ResultMessage getSliderImage(@RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) {
         try {
             return ResultUtil.data(verificationService.createVerification(verificationEnums, uuid));
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 e69664a4..cfec27ab 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
@@ -31,14 +31,13 @@ public class SmsController {
     @Autowired
     private VerificationService verificationService;
 
-    //一分钟同一个ip请求1次
     @LimitPoint(name = "sms_send", key = "sms")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataType = "String", name = "mobile", value = "手机号"),
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "uuid", value = "uuid"),
     })
     @GetMapping("/{verificationEnums}/{mobile}")
-    @ApiOperation(value = "发送短信验证码")
+    @ApiOperation(value = "发送短信验证码,一分钟同一个ip请求1次")
     public ResultMessage getSmsCode(
             @RequestHeader String uuid,
             @PathVariable String mobile,
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 fefac047..21fe71f1 100644
--- a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java
@@ -12,6 +12,7 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage;
 import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum;
 import cn.lili.timetask.handler.EveryDayExecute;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,13 +24,18 @@ import javax.annotation.Resource;
  * @author Chopper
  * @date 2020-07-03 11:20
  */
+@Slf4j
 @Service
 public class DistributionOrderExecute implements OrderStatusChangeEvent, EveryDayExecute, AfterSaleStatusChangeEvent {
 
-    //分销订单
+    /**
+     * 分销订单
+     */
     @Autowired
     private DistributionOrderService distributionOrderService;
-    //分销订单持久层
+    /**
+     * 分销订单持久层
+     */
     @Resource
     private DistributionOrderMapper distributionOrderMapper;
 
@@ -48,6 +54,9 @@ public class DistributionOrderExecute implements OrderStatusChangeEvent, EveryDa
                 distributionOrderService.cancelOrder(orderMessage.getOrderSn());
                 break;
             }
+            default:
+                log.error("分销订单执行异常：", orderMessage.getOrderSn());
+                break;
         }
     }
 
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 e3346136..29bbec5a 100644
--- a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
@@ -44,7 +44,7 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent,
         NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
         noticeMessageDTO.setMemberId(tradeDTO.getMemberId());
         noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.ORDER_CREATE_SUCCESS);
-        Map<String, String> params = new HashMap<>();
+        Map<String, String> params = new HashMap<>(2);
         params.put("goods", tradeDTO.getSkuList().get(0).getGoodsSku().getGoodsName());
         noticeMessageDTO.setParameter(params);
         //保存站内信
@@ -58,7 +58,7 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent,
         NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
         //如果订单状态不为空
         if (orderDetailVO != null) {
-            Map<String, String> params = new HashMap<>();
+            Map<String, String> params = new HashMap<>(2);
             switch (orderMessage.getNewStatus()) {
                 //如果订单新的状态为已取消 则发送取消订单站内信
                 case CANCELLED:
@@ -103,7 +103,7 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent,
     public void afterSaleStatusChange(AfterSale afterSale) {
         NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
         noticeMessageDTO.setMemberId(afterSale.getMemberId());
-        Map<String, String> params = new HashMap<>();
+        Map<String, String> params = new HashMap<>(2);
         params.put("goods", afterSale.getGoodsName());
         params.put("refuse", afterSale.getAuditRemark());
         noticeMessageDTO.setParameter(params);
@@ -154,7 +154,7 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent,
         //组织站内信参数
         NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
         noticeMessageDTO.setMemberId(memberPointMessage.getMemberId());
-        Map<String, String> params = new HashMap<>();
+        Map<String, String> params = new HashMap<>(2);
         if (memberPointMessage.getType()) {
             params.put("expenditure_points", "0");
             params.put("income_points", memberPointMessage.getPoint().toString());
@@ -178,7 +178,7 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent,
             //组织参数
             NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
             noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
-            Map<String, String> params = new HashMap<>();
+            Map<String, String> params = new HashMap<>(2);
             params.put("income", memberWithdrawalMessage.getPrice().toString());
             noticeMessageDTO.setParameter(params);
             noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_SUCCESS);
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 c51b180d..3c112ec3 100644
--- a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java
@@ -10,6 +10,7 @@ import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.payment.entity.RefundLog;
 import cn.lili.modules.payment.kit.Payment;
 import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@ import org.springframework.stereotype.Service;
  * @author Chopper
  * @date 2021-03-13 16:58
  */
+@Slf4j
 @Service
 public class PaymentExecute implements OrderStatusChangeEvent {
 
@@ -64,6 +66,9 @@ public class PaymentExecute implements OrderStatusChangeEvent {
                         break;
                     case BANK_TRANSFER:
                         break;
+                    default:
+                        log.error("订单支付执行异常,订单编号：", orderMessage.getOrderSn());
+                        break;
                 }
                 break;
             default:
diff --git a/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java b/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java
index 2db77d04..da5a5fa9 100644
--- a/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java
+++ b/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java
@@ -24,7 +24,9 @@ import java.util.List;
 @RocketMQMessageListener(topic = "${lili.data.rocketmq.after-sale-topic}", consumerGroup = "${lili.data.rocketmq.after-sale-group}")
 public class AfterSaleMessageListener implements RocketMQListener<MessageExt> {
 
-    //售后订单状态
+    /**
+     * 售后订单状态
+     */
     @Autowired
     private List<AfterSaleStatusChangeEvent> afterSaleStatusChangeEvents;
 
@@ -43,6 +45,8 @@ public class AfterSaleMessageListener implements RocketMQListener<MessageExt> {
                                 e);
                     }
                 }
+            default:
+                log.error("售后状态修改事件执行异常：", new String(messageExt.getBody()));
                 break;
         }
 
diff --git a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
index 16dd44dc..34302cbf 100644
--- a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
+++ b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
@@ -20,7 +20,6 @@ import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 import cn.lili.modules.search.service.EsGoodsIndexService;
 import cn.lili.modules.store.service.StoreService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.common.message.MessageExt;
@@ -123,6 +122,9 @@ public class GoodsMessageListener implements RocketMQListener<MessageExt> {
             case BUY_GOODS_COMPLETE:
                 this.goodsBuyComplete(messageExt);
                 break;
+            default:
+                log.error("商品执行异常：", new String(messageExt.getBody()));
+                break;
         }
     }
 
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 89b8bf35..c32087ba 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
@@ -21,10 +21,14 @@ import java.util.List;
 @Component
 public class BillExecute implements EveryDayExecute {
 
-    //结算单
+    /**
+     * 结算单
+     */
     @Autowired
     private BillService billService;
-    //店铺详情
+    /**
+     * 店铺详情
+     */
     @Resource
     private StoreDetailMapper storeDetailMapper;
 
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 f9d92ea6..04a3bbca 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
@@ -8,9 +8,9 @@ import cn.lili.modules.member.entity.dos.MemberEvaluation;
 import cn.lili.modules.member.mapper.MemberEvaluationMapper;
 import cn.lili.timetask.handler.EveryDayExecute;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -22,11 +22,15 @@ import java.util.Map;
  */
 @Component
 public class GoodsExecute implements EveryDayExecute {
-    //会员评价
-    @Autowired
+    /**
+     * 会员评价
+     */
+    @Resource
     private MemberEvaluationMapper memberEvaluationMapper;
-    //商品
-    @Autowired
+    /**
+     * 商品
+     */
+    @Resource
     private GoodsMapper goodsMapper;
 
     /**
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 1202c425..31c5e587 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
@@ -12,7 +12,6 @@ import cn.lili.modules.system.entity.enums.SettingEnum;
 import cn.lili.modules.system.service.SettingService;
 import cn.lili.timetask.handler.EveryMinuteExecute;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -28,12 +27,15 @@ import java.util.stream.Collectors;
  **/
 @Slf4j
 @Component
-
 public class CancelOrderTaskExecute implements EveryMinuteExecute {
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
-    //设置
+    /**
+     * 设置
+     */
     @Autowired
     private SettingService settingService;
 
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 d6bfc93b..3e8d03c3 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
@@ -11,10 +11,10 @@ import cn.lili.timetask.handler.EveryDayExecute;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -29,7 +29,7 @@ public class StoreRatingExecute implements EveryDayExecute {
     @Autowired
     private StoreService storeService;
     //会员评价
-    @Autowired
+    @Resource
     private MemberEvaluationMapper memberEvaluationMapper;
 
 
@@ -39,10 +39,10 @@ public class StoreRatingExecute implements EveryDayExecute {
         List<Store> storeList = storeService.list(new LambdaQueryWrapper<Store>().eq(Store::getStoreDisable, StoreStatusEnum.OPEN.name()));
         for (Store store : storeList) {
             //店铺所有开启的评价
-            LambdaQueryWrapper<MemberEvaluation> QueryWrapper = Wrappers.lambdaQuery();
-            QueryWrapper.eq(MemberEvaluation::getStoreId, store.getId());
-            QueryWrapper.eq(MemberEvaluation::getStatus, SwitchEnum.OPEN.name());
-            StoreRatingVO storeRatingVO = memberEvaluationMapper.getStoreRatingVO(QueryWrapper);
+            LambdaQueryWrapper<MemberEvaluation> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            lambdaQueryWrapper.eq(MemberEvaluation::getStoreId, store.getId());
+            lambdaQueryWrapper.eq(MemberEvaluation::getStatus, SwitchEnum.OPEN.name());
+            StoreRatingVO storeRatingVO = memberEvaluationMapper.getStoreRatingVO(lambdaQueryWrapper);
 
             if (storeRatingVO != null) {
                 //保存评分
diff --git a/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java b/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java
index d76fcdaa..9ddf2435 100644
--- a/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java
+++ b/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java
@@ -79,6 +79,7 @@ public abstract class AbstractDelayQueueListen {
 
     /**
      * 要实现延时队列的名字
+     * @return 促销延时队列名称
      */
     public abstract String setDelayQueueName();
 
@@ -88,7 +89,7 @@ public abstract class AbstractDelayQueueListen {
      */
     @PostConstruct
     public void init() {
-        new Thread(this::startDelayQueueMachine).start();
+        ThreadPoolUtil.getPool().execute(this::startDelayQueueMachine);
     }
 
 }
diff --git a/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java b/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java
index 2e625ef9..f6e5397d 100644
--- a/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java
+++ b/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java
@@ -75,10 +75,15 @@ public class LimitInterceptor {
     }
 
 
-    //默认unknown常量值
+    /**
+     * 默认unknown常量值
+     */
     private static final String UNKNOWN = "unknown";
 
-    //获取ip
+    /**
+     * 获取ip
+     * @return ip
+     */
     public String getIpAddress() {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String ip = request.getHeader("x-forwarded-for");
diff --git a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java b/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java
index ea814963..cf0b6d3e 100644
--- a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java
+++ b/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java
@@ -39,7 +39,7 @@ public class SystemLogAspect {
     /**
      * 启动线程异步记录日志
      */
-    private static final ThreadLocal<Date> beginTimeThreadLocal = new NamedThreadLocal<>("SYSTEM-LOG");
+    private static final ThreadLocal<Date> BEGIN_TIME_THREAD_LOCAL = new NamedThreadLocal<>("SYSTEM-LOG");
 
     @Autowired
     private SystemLogService systemLogService;
@@ -61,7 +61,7 @@ public class SystemLogAspect {
      */
     @Before("controllerAspect()")
     public void doBefore() {
-        beginTimeThreadLocal.set(new Date());
+        BEGIN_TIME_THREAD_LOCAL.set(new Date());
     }
 
 
@@ -110,7 +110,7 @@ public class SystemLogAspect {
             //写入自定义日志内容
             systemLogVO.setCustomerLog(customerLog);
             //请求开始时间
-            long beginTime = beginTimeThreadLocal.get().getTime();
+            long beginTime = BEGIN_TIME_THREAD_LOCAL.get().getTime();
             long endTime = System.currentTimeMillis();
             //请求耗时
             Long usedTime = endTime - beginTime;
@@ -157,7 +157,7 @@ public class SystemLogAspect {
      */
     private static Map<String, String> spelFormat(JoinPoint joinPoint, Object rvt) {
 
-        Map<String, String> result = new HashMap<>();
+        Map<String, String> result = new HashMap<>(2);
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         SystemLogPoint systemLogPoint = signature.getMethod().getAnnotation(SystemLogPoint.class);
         String description = systemLogPoint.description();
diff --git a/framework/src/main/java/cn/lili/common/cache/Cache.java b/framework/src/main/java/cn/lili/common/cache/Cache.java
index e2c86a7c..25d919ce 100644
--- a/framework/src/main/java/cn/lili/common/cache/Cache.java
+++ b/framework/src/main/java/cn/lili/common/cache/Cache.java
@@ -164,6 +164,7 @@ public interface Cache<T> {
      * 如需清零，按照普通key 移除即可
      *
      * @param key
+     * @param value
      * @return
      */
     Long cumulative(Object key, Object value);
diff --git a/framework/src/main/java/cn/lili/common/cache/CachePrefix.java b/framework/src/main/java/cn/lili/common/cache/CachePrefix.java
index e2734e35..925766b1 100644
--- a/framework/src/main/java/cn/lili/common/cache/CachePrefix.java
+++ b/framework/src/main/java/cn/lili/common/cache/CachePrefix.java
@@ -454,25 +454,39 @@ public enum CachePrefix {
     /**
      * 店铺分类
      */
-    STORE_CATEGORY
-    ;
+    STORE_CATEGORY;
 
 
     public static String removePrefix(String str) {
         return str.substring(str.lastIndexOf("}_") + 2);
     }
 
-    //通用获取缓存key值
+    /**
+     * 通用获取缓存key值
+     *
+     * @return 缓存key值
+     */
     public String getPrefix() {
         return "{" + this.name() + "}_";
     }
 
-    //通用获取缓存key值
+    /**
+     * 通用获取缓存key值
+     *
+     * @param typeEnum 促销枚举
+     * @return 缓存key值
+     */
     public String getPrefix(PromotionTypeEnum typeEnum) {
         return "{" + this.name() + "_" + typeEnum.name() + "}_";
     }
 
-    //获取缓存key值 + 用户端，例如：三端都有用户体系，需要分别登录，如果用户名一致，则redis中的权限可能会冲突出错
+    /**
+     * 获取缓存key值 + 用户端
+     * 例如：三端都有用户体系，需要分别登录，如果用户名一致，则redis中的权限可能会冲突出错
+     *
+     * @param user 角色
+     * @return 缓存key值 + 用户端
+     */
     public String getPrefix(UserEnums user) {
         return "{" + this.name() + "_" + user.name() + "}_";
     }
diff --git a/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java b/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java
index 85ca4838..ef331665 100644
--- a/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java
+++ b/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java
@@ -160,7 +160,7 @@ public class RedisCache implements Cache {
                 return null;
 
             } catch (IOException e) {
-                log.error("scan错误",e);
+                log.error("scan错误", e);
                 throw new RuntimeException(e);
             }
         });
@@ -206,8 +206,8 @@ public class RedisCache implements Cache {
     public Long incr(String key, long liveTime) {
         RedisAtomicLong entityIdCounter = new RedisAtomicLong(key, redisTemplate.getConnectionFactory());
         Long increment = entityIdCounter.getAndIncrement();
-
-        if ((null == increment || increment.longValue() == 0) && liveTime > 0) {//初始设置过期时间
+        //初始设置过期时间
+        if ((null == increment || increment.longValue() == 0) && liveTime > 0) {
             entityIdCounter.expire(liveTime, TimeUnit.SECONDS);
         }
 
@@ -254,8 +254,7 @@ public class RedisCache implements Cache {
      */
     @Override
     public boolean zAdd(String key, long score, String value) {
-        Boolean result = redisTemplate.opsForZSet().add(key, value, score);
-        return result;
+        return redisTemplate.opsForZSet().add(key, value, score);
 
     }
 
diff --git a/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java b/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java
index b5cbfe4e..a133da67 100644
--- a/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java
+++ b/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java
@@ -308,13 +308,6 @@ public abstract class BaseElasticsearchService {
 
         PutMappingRequest request = new PutMappingRequest(index)
                         .source(source, XContentType.JSON);
-//       AcknowledgedResponse putMappingResponse = client.indices().putMapping(request,
-//               RequestOptions.DEFAULT);
-//
-//       boolean acknowledged = putMappingResponse.isAcknowledged();
-//       if (acknowledged) {
-//           log.error("Succeed to put mapping");
-//       }
         CountDownLatch latch = new CountDownLatch(1);
         AtomicReference response = new AtomicReference<AcknowledgedResponse>();
         client.indices().putMappingAsync(
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 0cab3e56..166d7064 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
@@ -36,6 +36,7 @@ public enum ResultCode {
     VERIFICATION_EXIST(1002, "验证码服务异常"),
     LIMIT_ERROR(1003,"访问过于频繁，请稍后再试"),
     ILLEGAL_REQUEST_ERROR(1004, "非法请求，请重新刷新页面操作"),
+    IMAGE_FILE_EXT_ERROR(1005, "不支持图片格式"),
     /**
      * 分类
      */
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 10f70a77..b4883e5a 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultUtil.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultUtil.java
@@ -56,7 +56,12 @@ public class ResultUtil<T> {
 
     }
 
-    //抽象静态方法，返回结果集
+    /**
+     * 抽象静态方法，返回结果集
+     * @param t
+     * @param <T>
+     * @return
+     */
     public static <T> ResultMessage<T> data(T t) {
         return new ResultUtil<T>().setData(t);
     }
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 4f652afd..20e856f0 100644
--- a/framework/src/main/java/cn/lili/common/exception/ServiceException.java
+++ b/framework/src/main/java/cn/lili/common/exception/ServiceException.java
@@ -13,10 +13,14 @@ public class ServiceException extends RuntimeException {
 
     public static String DEFAULT_MESSAGE = "网络错误，请稍后重试！";
 
-    //异常消息
+    /**
+     * 异常消息
+     */
     private String msg = DEFAULT_MESSAGE;
 
-    //错误码
+    /**
+     * 错误码
+     */
     private ResultCode resultCode;
 
     public ServiceException(String msg) {
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/AfterSaleTagsEnum.java b/framework/src/main/java/cn/lili/common/rocketmq/tags/AfterSaleTagsEnum.java
index 98322812..b668ee79 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/tags/AfterSaleTagsEnum.java
+++ b/framework/src/main/java/cn/lili/common/rocketmq/tags/AfterSaleTagsEnum.java
@@ -1,12 +1,20 @@
 package cn.lili.common.rocketmq.tags;
 
 /**
+ * 售后标签枚举
+ *
  * @author paulG
  * @since 2020/12/9
  **/
 public enum AfterSaleTagsEnum {
 
+    /**
+     * "售后退款"
+     */
     REFUND("售后退款"),
+    /**
+     * "售后单状态改变"
+     */
     AFTER_SALE_STATUS_CHANGE("售后单状态改变");
 
     private final String description;
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/GoodsTagsEnum.java b/framework/src/main/java/cn/lili/common/rocketmq/tags/GoodsTagsEnum.java
index 0a7f3a39..f4dbd25b 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/tags/GoodsTagsEnum.java
+++ b/framework/src/main/java/cn/lili/common/rocketmq/tags/GoodsTagsEnum.java
@@ -6,13 +6,37 @@ package cn.lili.common.rocketmq.tags;
  **/
 public enum GoodsTagsEnum {
 
+    /**
+     * "生成商品索引"
+     */
     GENERATOR_GOODS_INDEX("生成商品索引"),
+    /**
+     * "删除商品"
+     */
     GOODS_DELETE("删除商品"),
+    /**
+     * "审核商品"
+     */
     GOODS_AUDIT("审核商品"),
+    /**
+     * "收藏商品"
+     */
     GOODS_COLLECTION("收藏商品"),
+    /**
+     * "购买商品完成"
+     */
     BUY_GOODS_COMPLETE("购买商品完成"),
+    /**
+     * "删除商品SKU"
+     */
     SKU_DELETE("删除商品SKU"),
+    /**
+     * "查看商品"
+     */
     VIEW_GOODS("查看商品"),
+    /**
+     * "商品评价"
+     */
     GOODS_COMMENT_COMPLETE("商品评价");
 
     private final String description;
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/MemberTagsEnum.java b/framework/src/main/java/cn/lili/common/rocketmq/tags/MemberTagsEnum.java
index 1b26b23b..88fb01fe 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/tags/MemberTagsEnum.java
+++ b/framework/src/main/java/cn/lili/common/rocketmq/tags/MemberTagsEnum.java
@@ -1,14 +1,27 @@
 package cn.lili.common.rocketmq.tags;
 
 /**
+ * 会员操作枚举
+ *
  * @author paulG
  * @since 2020/12/9
  **/
 public enum MemberTagsEnum {
-
+    /**
+     * 会员注册
+     */
     MEMBER_REGISTER("会员注册"),
+    /**
+     * 会员签到
+     */
     MEMBER_SING("会员签到"),
+    /**
+     * 会员提现
+     */
     MEMBER_WITHDRAWAL("会员提现"),
+    /**
+     * 会员积分变动
+     */
     MEMBER_POINT_CHANGE("会员积分变动");
 
     private final String description;
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/MqOrderTagsEnum.java b/framework/src/main/java/cn/lili/common/rocketmq/tags/MqOrderTagsEnum.java
index baf6bdf6..fde73145 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/tags/MqOrderTagsEnum.java
+++ b/framework/src/main/java/cn/lili/common/rocketmq/tags/MqOrderTagsEnum.java
@@ -1,18 +1,23 @@
 package cn.lili.common.rocketmq.tags;
 
 /**
+ * 订单操作枚举
+ *
  * @author paulG
  * @since 2020/12/9
  **/
 public enum MqOrderTagsEnum {
 
-
+    /**
+     * 订单创建
+     */
     ORDER_CREATE("订单创建"),
+    /**
+     * 订单状态改变
+     */
     STATUS_CHANGE("订单状态改变");
 
 
-
-
     private final String description;
 
     MqOrderTagsEnum(String description) {
diff --git a/framework/src/main/java/cn/lili/common/rocketmq/tags/OtherTagsEnum.java b/framework/src/main/java/cn/lili/common/rocketmq/tags/OtherTagsEnum.java
index 91e9dcf3..6117c636 100644
--- a/framework/src/main/java/cn/lili/common/rocketmq/tags/OtherTagsEnum.java
+++ b/framework/src/main/java/cn/lili/common/rocketmq/tags/OtherTagsEnum.java
@@ -1,12 +1,19 @@
 package cn.lili.common.rocketmq.tags;
 
 /**
+ * 其他操作枚举
+ *
  * @author paulG
  * @since 2020/12/9
  **/
 public enum OtherTagsEnum {
-
+    /**
+     * 站内消息提醒
+     */
     MESSAGE("站内消息提醒"),
+    /**
+     * 短信消息提醒
+     */
     SMS("短信消息提醒");
 
     private final String description;
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 f3c072ee..d88e5c2c 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
@@ -9,6 +9,10 @@ import cn.lili.common.token.SecretKeyUtil;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 用户上下文
@@ -20,15 +24,16 @@ import io.jsonwebtoken.Jwts;
  */
 public class UserContext {
 
-    private static AuthenticationHandler authenticationHandler;
+    private static RequestContextHolder requestContextHolder;
 
-    public static void setHolder(AuthenticationHandler authenticationHandler) {
-        UserContext.authenticationHandler = authenticationHandler;
+    public static void setRequestContextHolder(RequestContextHolder requestContextHolder) {
+        UserContext.requestContextHolder = requestContextHolder;
     }
 
-
     public static AuthUser getCurrentUser() {
-        return authenticationHandler.getAuthUser();
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String accessToken = request.getHeader("accessToken");
+        return getAuthUser(accessToken);
     }
 
 
@@ -44,6 +49,18 @@ public class UserContext {
             if (cache.keys("*" + accessToken).size() == 0) {
                 throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
             }
+            return getAuthUser(accessToken);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+    /**
+     * 根据jwt获取token重的用户信息
+     * @param accessToken token
+     * @return
+     */
+    public static AuthUser getAuthUser(String accessToken) {
+        try {
             //获取token的信息
             Claims claims
                     = Jwts.parser()
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
index a214eb60..f6dbaa1d 100644
--- a/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java
+++ b/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java
@@ -31,6 +31,6 @@ public class UserContextInit implements ApplicationRunner {
      */
     @Override
     public void run(ApplicationArguments args) {
-        UserContext.setHolder(authenticationHandler);
+        //UserContext.setHolder(authenticationHandler);
     }
 }
diff --git a/framework/src/main/java/cn/lili/common/security/filter/XssHttpServletRequestWrapper.java b/framework/src/main/java/cn/lili/common/security/filter/XssHttpServletRequestWrapper.java
index cdc533e4..ce6fbca2 100644
--- a/framework/src/main/java/cn/lili/common/security/filter/XssHttpServletRequestWrapper.java
+++ b/framework/src/main/java/cn/lili/common/security/filter/XssHttpServletRequestWrapper.java
@@ -15,6 +15,10 @@ import java.util.regex.Pattern;
 public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
     private HttpServletRequest request;
 
+
+
+
+
     public XssHttpServletRequestWrapper(HttpServletRequest request) {
         super(request);
         this.request = request;
@@ -90,46 +94,38 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
         return value;
     }
 
+
+    private static final Pattern SCRIPT_PATTERN1 = Pattern.compile("<script>(.*?)</script>", Pattern.CASE_INSENSITIVE);
+    private static final Pattern SCRIPT_PATTERN2 = Pattern.compile("</script>", Pattern.CASE_INSENSITIVE);
+    private static final Pattern SCRIPT_PATTERN3 = Pattern.compile("<script(.*?)>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+    private static final Pattern SCRIPT_PATTERN4 = Pattern.compile("javascript:", Pattern.CASE_INSENSITIVE);
+    private static final Pattern SRC_PATTERN = Pattern.compile("src[\r\n]*=[\r\n]*\\\'(.*?)\\\'", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+    private static final Pattern EVAL_PATTERN = Pattern.compile("eval\\((.*?)\\)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+    private static final Pattern E_­_XPRESSION_PATTERN = Pattern.compile("e­xpression\\((.*?)\\)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+    private static final Pattern VB_SCRIPT_PATTERN = Pattern.compile("vbscript:", Pattern.CASE_INSENSITIVE);
+    private static final Pattern ONLOAD_PATTERN = Pattern.compile("onload(.*?)=", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+
     private String cleanXSS(String value) {
         if (value != null) {
             //推荐使用ESAPI库来避免脚本攻击,value = ESAPI.encoder().canonicalize(value);
-//           //避免空字符串
-//           value = value.replaceAll(" ", "");
             //避免script 标签
-            Pattern scriptPattern = Pattern.compile("<script>(.*?)</script>", Pattern.CASE_INSENSITIVE);
-            value = scriptPattern.matcher(value).replaceAll("");
-            //避免src形式的表达式
-            scriptPattern = Pattern.compile("src[\r\n]*=[\r\n]*\\\'(.*?)\\\'",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            value = scriptPattern.matcher(value).replaceAll("");
-            scriptPattern = Pattern.compile("src[\r\n]*=[\r\n]*\\\"(.*?)\\\"",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            value = scriptPattern.matcher(value).replaceAll("");
+            value = SCRIPT_PATTERN1.matcher(value).replaceAll("");
             //删除单个的 </script> 标签
-            scriptPattern = Pattern.compile("</script>", Pattern.CASE_INSENSITIVE);
-            value = scriptPattern.matcher(value).replaceAll("");
+            value = SCRIPT_PATTERN2.matcher(value).replaceAll("");
             //删除单个的<script ...> 标签
-            scriptPattern = Pattern.compile("<script(.*?)>",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            value = scriptPattern.matcher(value).replaceAll("");
-            //避免 eval(...) 形式表达式
-            scriptPattern = Pattern.compile("eval\\((.*?)\\)",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            value = scriptPattern.matcher(value).replaceAll("");
-            //避免 e­xpression(...) 表达式
-            scriptPattern = Pattern.compile("e­xpression\\((.*?)\\)",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            value = scriptPattern.matcher(value).replaceAll("");
+            value = SCRIPT_PATTERN3.matcher(value).replaceAll("");
             //避免 javascript: 表达式
-            scriptPattern = Pattern.compile("javascript:", Pattern.CASE_INSENSITIVE);
-            value = scriptPattern.matcher(value).replaceAll("");
+            value = SCRIPT_PATTERN4.matcher(value).replaceAll("");
+            //避免src形式的表达式
+            value = SRC_PATTERN.matcher(value).replaceAll("");
+            //避免 eval(...) 形式表达式
+            value = EVAL_PATTERN.matcher(value).replaceAll("");
+            //避免 e­xpression(...) 表达式
+            value = E_­_XPRESSION_PATTERN.matcher(value).replaceAll("");
             //避免 vbscript:表达式
-            scriptPattern = Pattern.compile("vbscript:", Pattern.CASE_INSENSITIVE);
-            value = scriptPattern.matcher(value).replaceAll("");
+            value = VB_SCRIPT_PATTERN.matcher(value).replaceAll("");
             //避免 onload= 表达式
-            scriptPattern = Pattern.compile("onload(.*?)=",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            value = scriptPattern.matcher(value).replaceAll("");
+            value = ONLOAD_PATTERN.matcher(value).replaceAll("");
         }
         return value;
     }
diff --git a/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java b/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java
index d2a290f7..ebc0e2f9 100644
--- a/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java
+++ b/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java
@@ -16,6 +16,7 @@ public interface AliSmsUtil {
      * 申请短信签名
      *
      * @param smsSign 短信签名
+     * @throws Exception 阿里短信签名错误
      */
     void addSmsSign(SmsSign smsSign) throws Exception;
 
@@ -24,6 +25,7 @@ public interface AliSmsUtil {
      * 删除短信签名
      *
      * @param signName 签名名称
+     * @throws Exception 阿里短信签名错误
      */
     void deleteSmsSign(String signName) throws Exception;
 
@@ -31,6 +33,8 @@ public interface AliSmsUtil {
      * 查询短信签名申请状态
      *
      * @param signName 签名名称
+     * @return 短信签名申请状态
+     * @throws Exception 阿里短信签名错误
      */
     Map<String, Object> querySmsSign(String signName) throws Exception;
 
@@ -38,6 +42,7 @@ public interface AliSmsUtil {
      * 修改未审核通过的短信签名，并重新提交审核。
      *
      * @param smsSign 短信签名
+     * @throws Exception 阿里短信签名错误
      */
     void modifySmsSign(SmsSign smsSign) throws Exception;
 
@@ -45,7 +50,7 @@ public interface AliSmsUtil {
      * 修改未审核通过的短信模板，并重新提交审核。
      *
      * @param smsTemplate 短信模板
-     * @throws Exception
+     * @throws Exception 阿里短信签名错误
      */
     void modifySmsTemplate(SmsTemplate smsTemplate) throws Exception;
 
@@ -53,7 +58,8 @@ public interface AliSmsUtil {
      * 查看短信模板
      *
      * @param templateCode 短信模板CODE
-     * @throws Exception
+     * @return 短信模板
+     * @throws Exception 阿里短信签名错误
      */
     Map<String, Object> querySmsTemplate(String templateCode) throws Exception;
 
@@ -61,8 +67,8 @@ public interface AliSmsUtil {
      * 申请短信模板
      *
      * @param smsTemplate 短信模板
-     * @return
-     * @throws Exception
+     * @return 短信模板
+     * @throws Exception 阿里短信签名错误
      */
     String addSmsTemplate(SmsTemplate smsTemplate) throws Exception;
 
@@ -70,7 +76,7 @@ public interface AliSmsUtil {
      * 删除短信模板
      *
      * @param templateCode 短信模板CODE
-     * @throws Exception
+     * @throws Exception 阿里短信签名错误
      */
     void deleteSmsTemplate(String templateCode) throws Exception;
 }
diff --git a/framework/src/main/java/cn/lili/common/sms/SmsUtil.java b/framework/src/main/java/cn/lili/common/sms/SmsUtil.java
index 0732b9b3..2f2cf4a2 100644
--- a/framework/src/main/java/cn/lili/common/sms/SmsUtil.java
+++ b/framework/src/main/java/cn/lili/common/sms/SmsUtil.java
@@ -32,6 +32,7 @@ public interface SmsUtil {
      * @param verificationEnums 验证码场景
      * @param uuid              用户标识uuid
      * @param code              待验证code
+     * @return 操作状态
      */
     boolean verifyCode(String mobile, VerificationEnums verificationEnums, String uuid, String code);
 
@@ -41,6 +42,7 @@ public interface SmsUtil {
      * @param mobile       接收手机号
      * @param param        参数
      * @param templateCode 模版code
+     * @param signName     签名名称
      */
     void sendSmsCode(String signName, String mobile, Map<String, String> param, String templateCode);
 
diff --git a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java
index 2b9bf7d1..adf9c124 100644
--- a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java
+++ b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java
@@ -73,7 +73,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
         String code = CommonUtil.getRandomNum();
 
         //准备发送短信参数
-        Map<String, String> params = new HashMap<>();
+        Map<String, String> params = new HashMap<>(2);
         //验证码内容
         params.put("code", code);
 
@@ -221,7 +221,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
                         signFileList1
                 ));
         AddSmsSignResponse response = client.addSmsSign(addSmsSignRequest);
-        if (!response.getBody().getCode().equals("OK")) {
+        if (!("OK").equals(response.getBody().getCode())) {
             throw new ServiceException(response.getBody().getMessage());
         }
     }
@@ -233,7 +233,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
                 .setSignName(signName);
 
         DeleteSmsSignResponse response = client.deleteSmsSign(deleteSmsSignRequest);
-        if (!response.getBody().getCode().equals("OK")) {
+        if (!("OK").equals(response.getBody().getCode())) {
             throw new ServiceException(response.getBody().getMessage());
         }
 
@@ -246,10 +246,10 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
         QuerySmsSignRequest querySmsSignRequest = new QuerySmsSignRequest().setSignName(signName);
 
         QuerySmsSignResponse response = client.querySmsSign(querySmsSignRequest);
-        if (!response.getBody().getCode().equals("OK")) {
+        if (!("OK").equals(response.getBody().getCode())) {
             throw new ServiceException(response.getBody().getMessage());
         }
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(2);
         map.put("SignStatus", response.getBody().getSignStatus());
         map.put("Reason", response.getBody().getReason());
         return map;
@@ -275,7 +275,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
                         signFileList1
                 ));
         ModifySmsSignResponse response = client.modifySmsSign(modifySmsSign);
-        if (!response.getBody().getCode().equals("OK")) {
+        if (!("OK").equals(response.getBody().getCode())) {
             throw new ServiceException(response.getBody().getMessage());
         }
     }
@@ -291,7 +291,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
                 .setTemplateCode(smsTemplate.getTemplateCode());
 
         ModifySmsTemplateResponse response = client.modifySmsTemplate(modifySmsTemplateRequest);
-        if (!response.getBody().getCode().equals("OK")) {
+        if (!("OK").equals(response.getBody().getCode())) {
             throw new ServiceException(response.getBody().getMessage());
         }
     }
@@ -303,10 +303,10 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
                 .setTemplateCode(templateCode);
         QuerySmsTemplateResponse response = client.querySmsTemplate(querySmsTemplateRequest);
 
-        if (!response.getBody().getCode().equals("OK")) {
+        if (!("OK").equals(response.getBody().getCode())) {
             throw new ServiceException(response.getBody().getMessage());
         }
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(4);
         map.put("TemplateStatus", response.getBody().getTemplateStatus());
         map.put("Reason", response.getBody().getReason());
         map.put("TemplateCode", response.getBody().getTemplateCode());
@@ -323,7 +323,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
                 .setRemark(smsTemplate.getRemark());
 
         AddSmsTemplateResponse response = client.addSmsTemplate(addSmsTemplateRequest);
-        if (!response.getBody().getCode().equals("OK")) {
+        if (!("OK").equals(response.getBody().getCode())) {
             throw new ServiceException(response.getBody().getMessage());
         }
         return response.getBody().getTemplateCode();
@@ -336,7 +336,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
                 .setTemplateCode(templateCode);
 
         DeleteSmsTemplateResponse response = client.deleteSmsTemplate(deleteSmsTemplateRequest);
-        if (!response.getBody().getCode().equals("OK")) {
+        if (!("OK").equals(response.getBody().getCode())) {
             throw new ServiceException(response.getBody().getMessage());
         }
     }
diff --git a/framework/src/main/java/cn/lili/common/token/SecretKeyUtil.java b/framework/src/main/java/cn/lili/common/token/SecretKeyUtil.java
index d5e4d9a8..a87f4a8c 100644
--- a/framework/src/main/java/cn/lili/common/token/SecretKeyUtil.java
+++ b/framework/src/main/java/cn/lili/common/token/SecretKeyUtil.java
@@ -15,7 +15,8 @@ import javax.crypto.SecretKey;
  */
 public class SecretKeyUtil {
     public static SecretKey generalKey() {
-        byte[] encodedKey = Base64.decodeBase64("cuAihCz53DZRjZwbsGcZJ2Ai6At+T142uphtJMsk7iQ=");//自定义
+        //自定义
+        byte[] encodedKey = Base64.decodeBase64("cuAihCz53DZRjZwbsGcZJ2Ai6At+T142uphtJMsk7iQ=");
         javax.crypto.SecretKey key = Keys.hmacShaKeyFor(encodedKey);
         return key;
     }
diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java
index 5b4d6e70..e4c629b6 100644
--- a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java
+++ b/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java
@@ -67,7 +67,7 @@ public class ManagerTokenGenerate extends AbstractTokenGenerate {
      * @return
      */
     private Map<String, List<String>> permissionList(List<UserMenuVO> userMenuVOList) {
-        Map<String, List<String>> permission = new HashMap<>();
+        Map<String, List<String>> permission = new HashMap<>(2);
         if (userMenuVOList == null || userMenuVOList.size() == 0) {
             return permission;
         }
diff --git a/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java b/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
index a2018a92..4470b395 100644
--- a/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
+++ b/framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
@@ -38,6 +38,7 @@ public abstract class AbstractDelayQueueMachineFactory {
 
     /**
      * 要实现延时队列的名字
+     * @return 延时队列的名字
      */
     public abstract String setDelayQueueName();
 
diff --git a/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java b/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java
index 6b67d7fe..54998fda 100644
--- a/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java
+++ b/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java
@@ -2,6 +2,9 @@ package cn.lili.common.trigger.enums;
 
 /**
  * 队列枚举
+ *
+ * @author Bulbasaur
+ * @date: 2021/7/9 1:40 上午
  */
 public enum DelayQueueEnums {
 
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 3ce1c762..2452a80a 100644
--- a/framework/src/main/java/cn/lili/common/utils/BeanUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/BeanUtil.java
@@ -9,16 +9,18 @@ import java.lang.reflect.Method;
 
 /**
  * 对象属性复制
+ *
  * @author Chopper
  */
 public class BeanUtil {
 
     /**
      * 复制属性
+     *
      * @param objectFrom
      * @param objectTo
      */
-    public static void copyProperties(Object objectFrom,Object objectTo){
+    public static void copyProperties(Object objectFrom, Object objectTo) {
         BeanUtils.copyProperties(objectFrom, objectTo);
     }
 
@@ -36,7 +38,7 @@ public class BeanUtil {
             index++;
         }
         for (int i = 0; i < superFields.length; i++) {
-            if (superFields[i].getName().equals("id")) {
+            if ("id".equals(superFields[i].getName())) {
                 continue;
             }
             fieldNames[index] = superFields[i].getName();
@@ -45,8 +47,12 @@ public class BeanUtil {
         return fieldNames;
     }
 
-    /* 根据属性名获取属性值
-     * */
+    /**
+     * 根据属性名获取属性值
+     * @param fieldName 属性名
+     * @param o 对象
+     * @return 属性值
+     */
     public static Object getFieldValueByName(String fieldName, Object o) {
         try {
             String firstLetter = fieldName.substring(0, 1).toUpperCase();
diff --git a/framework/src/main/java/cn/lili/common/utils/CheckMobileUtil.java b/framework/src/main/java/cn/lili/common/utils/CheckMobileUtil.java
deleted file mode 100644
index a2796571..00000000
--- a/framework/src/main/java/cn/lili/common/utils/CheckMobileUtil.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.lili.common.utils;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * CheckMobileUtil
- *
- * @author Chopper
- * @version v1.0
- * 2021-02-04 14:56
- */
-public class CheckMobileUtil {
-
-
-    //\b 是单词边界(连着的两个(字母字符 与 非字母字符) 之间的逻辑上的间隔),
-    //字符串在编译时会被转码一次,所以是 "\\b"
-    //\B 是单词内部逻辑间隔(连着的两个字母字符之间的逻辑上的间隔)
-    static String phoneReg = "\\b(ip(hone|od)|android|opera m(ob|in)i"
-            + "|windows (phone|ce)|blackberry"
-            + "|s(ymbian|eries60|amsung)|p(laybook|alm|rofile/midp"
-            + "|laystation portable)|nokia|fennec|htc[-_]"
-            + "|mobile|up.browser|[1-4][0-9]{2}x[1-4][0-9]{2})\\b";
-    static String tableReg = "\\b(ipad|tablet|(Nexus 7)|up.browser"
-            + "|[1-4][0-9]{2}x[1-4][0-9]{2})\\b";
-
-    //移动设备正则匹配：手机端、平板
-    static Pattern phonePat = Pattern.compile(phoneReg, Pattern.CASE_INSENSITIVE);
-    static Pattern tablePat = Pattern.compile(tableReg, Pattern.CASE_INSENSITIVE);
-
-    /**
-     * 检测是否是移动设备访问
-     *
-     * @param request 浏览器标识  获取方式：
-     * @return true:移动设备接入，false:pc端接入
-     * @Title: check
-     */
-    public static boolean check(HttpServletRequest request) {
-        String userAgent = request.getHeader("USER-AGENT").toLowerCase();
-        if (null == userAgent) {
-            userAgent = "";
-        }
-        //匹配
-        Matcher matcherPhone = phonePat.matcher(userAgent);
-        Matcher matcherTable = tablePat.matcher(userAgent);
-        if (matcherPhone.find() || matcherTable.find()) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
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 290ba1b4..b860d68e 100644
--- a/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java
@@ -4,6 +4,9 @@ import java.math.BigDecimal;
 
 /**
  * 金额计算工具
+ *
+ * @author Bulbasaur
+ * @date: 2021/7/9 1:40 上午
  */
 public final class CurrencyUtil {
     /**
@@ -25,8 +28,8 @@ public final class CurrencyUtil {
      * @return 两个参数的和
      */
     public static Double add(double v1, double v2) {
-        BigDecimal b1 = new BigDecimal(Double.toString(v1));
-        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        BigDecimal b1 = new BigDecimal(v1);
+        BigDecimal b2 = new BigDecimal(v2);
         return b1.add(b2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
 
@@ -38,8 +41,8 @@ public final class CurrencyUtil {
      * @return 两个参数的差
      */
     public static double sub(double v1, double v2) {
-        BigDecimal b1 = new BigDecimal(Double.toString(v1));
-        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        BigDecimal b1 = new BigDecimal(v1);
+        BigDecimal b2 = new BigDecimal(v2);
         return b1.subtract(b2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
 
@@ -51,16 +54,16 @@ public final class CurrencyUtil {
      * @return 两个参数的积
      */
     public static Double mul(double v1, double v2) {
-        BigDecimal b1 = new BigDecimal(Double.toString(v1));
-        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        BigDecimal b1 = new BigDecimal(v1);
+        BigDecimal b2 = new BigDecimal(v2);
         return b1.multiply(b2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
 
     /**
      * 提供精确的乘法运算。
      *
-     * @param v1 被乘数
-     * @param v2 乘数
+     * @param v1    被乘数
+     * @param v2    乘数
      * @param scale 表示表示需要精确到小数点以后几位。
      * @return 两个参数的积
      */
@@ -69,8 +72,8 @@ public final class CurrencyUtil {
             throw new IllegalArgumentException(
                     "The scale must be a positive integer or zero");
         }
-        BigDecimal b1 = new BigDecimal(Double.toString(v1));
-        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        BigDecimal b1 = new BigDecimal(v1);
+        BigDecimal b2 = new BigDecimal(v2);
         return b1.multiply(b2).setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
 
@@ -102,8 +105,8 @@ public final class CurrencyUtil {
         if (v2 == 0) {
             return 0;
         }
-        BigDecimal b1 = new BigDecimal(Double.toString(v1));
-        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        BigDecimal b1 = new BigDecimal(v1);
+        BigDecimal b2 = new BigDecimal(v2);
         return b1.divide(b2, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
 
@@ -119,7 +122,7 @@ public final class CurrencyUtil {
             throw new IllegalArgumentException(
                     "The scale must be a positive integer or zero");
         }
-        BigDecimal b = new BigDecimal(Double.toString(v));
+        BigDecimal b = new BigDecimal(v);
         BigDecimal one = new BigDecimal("1");
         return b.divide(one, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
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 a5078149..7a3db41c 100644
--- a/framework/src/main/java/cn/lili/common/utils/DateUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/DateUtil.java
@@ -174,12 +174,12 @@ public class DateUtil {
             year--;
             month = 12;
         }
-        if (!(String.valueOf(month).length() > 1)) {
+        if (String.valueOf(month).length() <= 1) {
             months = "0" + month;
         } else {
             months = String.valueOf(month);
         }
-        if (!(String.valueOf(day).length() > 1)) {
+        if (String.valueOf(day).length() <= 1) {
             days = "0" + day;
         } else {
             days = String.valueOf(day);
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 c5dca7c9..dccbb6cf 100644
--- a/framework/src/main/java/cn/lili/common/utils/HttpClientUtils.java
+++ b/framework/src/main/java/cn/lili/common/utils/HttpClientUtils.java
@@ -9,7 +9,6 @@ import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.config.Registry;
@@ -19,8 +18,6 @@ import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
@@ -34,29 +31,60 @@ import java.net.URI;
 import java.net.UnknownHostException;
 import java.util.Map;
 
+/**
+ * HttpClientUtils
+ *
+ * @author Bulbasaur
+ * @date: 2021/7/9 1:40 上午
+ */
 @Slf4j
 public class HttpClientUtils {
 
-    //org.apache.http.impl.client.CloseableHttpClient
+    /**
+     * org.apache.http.impl.client.CloseableHttpClient
+     */
     private static CloseableHttpClient httpClient = null;
 
     //这里就直接默认固定了,因为以下三个参数在新建的method中仍然可以重新配置并被覆盖.
-    static final int connectionRequestTimeout = 30000;//ms毫秒,从池中获取链接超时时间
-    static final int connectTimeout = 60000;//ms毫秒,建立链接超时时间
-    static final int socketTimeout = 60000;//ms毫秒,读取超时时间
+    /**
+     * ms毫秒,从池中获取链接超时时间
+     */
+    static final int CONNECTION_REQUEST_TIMEOUT = 30000;
+    /**
+     * ms毫秒,建立链接超时时间
+     */
+    static final int CONNECT_TIMEOUT = 60000;
+    /**
+     * ms毫秒,读取超时时间
+     */
+    static final int SOCKET_TIMEOUT = 60000;
 
-    //总配置,主要涉及是以下两个参数,如果要作调整没有用到properties会比较后麻烦,但鉴于一经粘贴,随处可用的特点,就不再做依赖性配置化处理了.
-    //而且这个参数同一家公司基本不会变动.
-    static final int maxTotal = 500;//最大总并发,很重要的参数
-    static final int maxPerRoute = 100;//每路并发,很重要的参数
+    /**
+     * 总配置,主要涉及是以下两个参数,如果要作调整没有用到properties会比较后麻烦,但鉴于一经粘贴,随处可用的特点,就不再做依赖性配置化处理了.
+     * 而且这个参数同一家公司基本不会变动.
+     * 最大总并发,很重要的参数
+     */
+    static final int MAX_TOTAL = 500;
+    /**
+     * 每路并发,很重要的参数
+     */
+    static final int MAX_PER_ROUTE = 100;
 
-    //正常情况这里应该配成MAP或LIST
-    //细化配置参数,用来对每路参数做精细化处理,可以管控各ip的流量,比如默认配置请求baidu:80端口最大100个并发链接,
-    static final String detailHostName = "http://www.baidu.com";//每个细化配置之ip(不重要,在特殊场景很有用)
-    //每个细化配置之port(不重要,在特殊场景很有用)
-    static final int detailPort = 80;
-    //每个细化配置之最大并发数(不重要,在特殊场景很有用)
-    static final int detailMaxPerRoute = 100;
+    /**
+     * 正常情况这里应该配成MAP或LIST
+     * 细化配置参数,用来对每路参数做精细化处理,可以管控各ip的流量,比如默认配置请求baidu:80端口最大100个并发链接,
+     * 每个细化配置之ip(不重要,在特殊场景很有用)
+     */
+    static final String DETAIL_HOST_NAME = "http://www.baidu.com";
+
+    /**
+     * 每个细化配置之port(不重要,在特殊场景很有用)
+     */
+    static final int DETAIL_PORT = 80;
+    /**
+     * 每个细化配置之最大并发数(不重要,在特殊场景很有用)
+     */
+    static final int DETAIL_MAX_PER_ROUTE = 100;
 
     private synchronized static CloseableHttpClient getHttpClient() {
         if (null == httpClient) {
@@ -78,15 +106,15 @@ public class HttpClientUtils {
         Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create().register("http", plainsf).register("https", sslsf).build();
         PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(registry);
         //将最大连接数增加
-        cm.setMaxTotal(maxTotal);
+        cm.setMaxTotal(MAX_TOTAL);
         //将每个路由基础的连接增加
-        cm.setDefaultMaxPerRoute(maxPerRoute);
+        cm.setDefaultMaxPerRoute(MAX_PER_ROUTE);
 
         //细化配置开始,其实这里用Map或List的for循环来配置每个链接,在特殊场景很有用.
         //将每个路由基础的连接做特殊化配置,一般用不着
-        HttpHost httpHost = new HttpHost(detailHostName, detailPort);
+        HttpHost httpHost = new HttpHost(DETAIL_HOST_NAME, DETAIL_PORT);
         //将目标主机的最大连接数增加
-        cm.setMaxPerRoute(new HttpRoute(httpHost), detailMaxPerRoute);
+        cm.setMaxPerRoute(new HttpRoute(httpHost), DETAIL_MAX_PER_ROUTE);
         //细化配置结束
 
         //请求重试处理
@@ -117,7 +145,7 @@ public class HttpClientUtils {
         };
 
         //配置请求的超时设置
-        RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(connectionRequestTimeout).setConnectTimeout(connectTimeout).setSocketTimeout(socketTimeout).build();
+        RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(CONNECTION_REQUEST_TIMEOUT).setConnectTimeout(CONNECT_TIMEOUT).setSocketTimeout(SOCKET_TIMEOUT).build();
         newHotpoint = HttpClients.custom().setConnectionManager(cm).setDefaultRequestConfig(requestConfig).setRetryHandler(httpRequestRetryHandler).build();
         return newHotpoint;
     }
@@ -149,7 +177,7 @@ public class HttpClientUtils {
                 resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
             }
         } catch (Exception e) {
-            log.error("get请求错误",e);
+            log.error("get请求错误", e);
         } finally {
             try {
                 if (response != null) {
@@ -157,7 +185,7 @@ public class HttpClientUtils {
                 }
                 httpClient.close();
             } catch (IOException e) {
-                log.error("Get错误",e);
+                log.error("Get错误", e);
             }
         }
         return resultString;
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 793fc28a..7c5a136e 100644
--- a/framework/src/main/java/cn/lili/common/utils/IpHelper.java
+++ b/framework/src/main/java/cn/lili/common/utils/IpHelper.java
@@ -23,14 +23,18 @@ import javax.servlet.http.HttpServletRequest;
 @Component
 public class IpHelper {
 
-    //qq lbs 地区查询key
+    /**
+     * qq lbs 地区查询key
+     */
     @Value("${lili.lbs.key}")
     private String key;
-    //qq lbs 地区查询key
+    /**
+     * qq lbs 地区查询key
+     */
     @Value("${lili.lbs.sk}")
     private String sk;
 
-    private static final String api = "https://apis.map.qq.com";
+    private static final String API = "https://apis.map.qq.com";
 
 
     /**
@@ -43,7 +47,7 @@ public class IpHelper {
 
         String url = "/ws/location/v1/ip?key=" + key + "&ip=" + IpUtils.getIpAddress(request);
         String sign = SecureUtil.md5(url + sk);
-        url = api + url + "&sign=" + sign;
+        url = API + url + "&sign=" + sign;
         String result = "未知";
         try {
             String json = HttpUtil.get(url, 3000);
diff --git a/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java b/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java
index 7f6e9594..4eb47a6d 100644
--- a/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java
+++ b/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java
@@ -51,7 +51,8 @@ public class OperationalJudgment<t> {
                 } else {
                     throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
                 }
+            default:
+                throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
         }
-        return object;
     }
 }
diff --git a/framework/src/main/java/cn/lili/common/utils/PasswordUtil.java b/framework/src/main/java/cn/lili/common/utils/PasswordUtil.java
deleted file mode 100644
index 72ec944b..00000000
--- a/framework/src/main/java/cn/lili/common/utils/PasswordUtil.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package cn.lili.common.utils;
-
-import java.security.Key;
-import java.security.SecureRandom;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-public class PasswordUtil {
-
-    /**
-     * JAVA6支持以下任意一种算法 
-     * PBEWITHMD5ANDDES 
-     * PBEWITHMD5ANDTRIPLEDES 
-     * PBEWITHSHAANDDESEDE 
-     * PBEWITHSHA1ANDRC2_40 
-     * PBKDF2WITHHMACSHA1 
-     * */
-
-    /**
-     * 定义使用的算法为:PBEWITHMD5andDES算法
-     */
-    public static final String ALGORITHM = "PBEWithMD5AndDES";
-
-    /**
-     * 定义迭代次数为1000次
-     */
-    private static final int ITERATIONCOUNT = 1000;
-
-    /**
-     * 获取加密算法中使用的盐值,解密中使用的盐值必须与加密中使用的相同才能完成操作.
-     * 盐长度必须为8字节
-     *
-     * @return byte[] 盐值
-     */
-    public static byte[] getSalt() throws Exception {
-        //实例化安全随机数
-        SecureRandom random = new SecureRandom();
-        //产出盐
-        return random.generateSeed(8);
-    }
-
-    /**
-     * 根据PBE密码生成一把密钥
-     *
-     * @param password 生成密钥时所使用的密码
-     * @return Key PBE算法密钥
-     */
-    private static Key getPBEKey(String password) throws Exception {
-        //实例化使用的算法
-        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(ALGORITHM);
-        //设置PBE密钥参数
-        PBEKeySpec keySpec = new PBEKeySpec(password.toCharArray());
-        //生成密钥
-        SecretKey secretKey = keyFactory.generateSecret(keySpec);
-
-        return secretKey;
-    }
-
-    /**
-     * 加密明文字符串
-     *
-     * @param plaintext 待加密的明文字符串
-     * @param password  生成密钥时所使用的密码
-     * @param salt      盐值
-     * @return 加密后的密文字符串
-     * @throws Exception
-     */
-    public static String encrypt(String plaintext, String password, byte[] salt) throws Exception {
-
-        Key key = getPBEKey(password);
-
-        PBEParameterSpec parameterSpec = new PBEParameterSpec(salt, ITERATIONCOUNT);
-
-        Cipher cipher = Cipher.getInstance(ALGORITHM);
-
-        cipher.init(Cipher.ENCRYPT_MODE, key, parameterSpec);
-
-        byte encipheredData[] = cipher.doFinal(plaintext.getBytes());
-
-        return bytesToHexString(encipheredData);
-    }
-
-    /**
-     * 解密密文字符串
-     *
-     * @param ciphertext 待解密的密文字符串
-     * @param password   生成密钥时所使用的密码(如需解密,该参数需要与加密时使用的一致)
-     * @param salt       盐值(如需解密,该参数需要与加密时使用的一致)
-     * @return 解密后的明文字符串
-     * @throws Exception
-     */
-    public static String decrypt(String ciphertext, String password, byte[] salt) throws Exception {
-
-        Key key = getPBEKey(password);
-
-        PBEParameterSpec parameterSpec = new PBEParameterSpec(salt, ITERATIONCOUNT);
-
-        Cipher cipher = Cipher.getInstance(ALGORITHM);
-
-        cipher.init(Cipher.DECRYPT_MODE, key, parameterSpec);
-
-        byte[] passDec = cipher.doFinal(hexStringToBytes(ciphertext));
-
-        return new String(passDec);
-    }
-
-    /**
-     * 将字节数组转换为十六进制字符串
-     *
-     * @param src 字节数组
-     * @return
-     */
-    public static String bytesToHexString(byte[] src) {
-        StringBuilder stringBuilder = new StringBuilder("");
-        if (src == null || src.length <= 0) {
-            return null;
-        }
-        for (int i = 0; i < src.length; i++) {
-            int v = src[i] & 0xFF;
-            String hv = Integer.toHexString(v);
-            if (hv.length() < 2) {
-                stringBuilder.append(0);
-            }
-            stringBuilder.append(hv);
-        }
-        return stringBuilder.toString();
-    }
-
-    /**
-     * 将十六进制字符串转换为字节数组
-     *
-     * @param hexString 十六进制字符串
-     * @return
-     */
-    public static byte[] hexStringToBytes(String hexString) {
-        if (hexString == null || hexString.equals("")) {
-            return null;
-        }
-        hexString = hexString.toUpperCase();
-        int length = hexString.length() / 2;
-        char[] hexChars = hexString.toCharArray();
-        byte[] d = new byte[length];
-        for (int i = 0; i < length; i++) {
-            int pos = i * 2;
-            d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));
-        }
-        return d;
-    }
-
-    private static byte charToByte(char c) {
-        return (byte) "0123456789ABCDEF".indexOf(c);
-    }
-}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/common/utils/RedisUtil.java b/framework/src/main/java/cn/lili/common/utils/RedisUtil.java
index 2f01f7c8..ece32671 100644
--- a/framework/src/main/java/cn/lili/common/utils/RedisUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/RedisUtil.java
@@ -217,8 +217,7 @@ public class RedisUtil {
      * @return
      */
     public boolean zadd(String key, long score, String value) {
-        Boolean result = redisTemplate.opsForZSet().add(key, value, score);
-        return result;
+        return redisTemplate.opsForZSet().add(key, value, score);
 
     }
 
diff --git a/framework/src/main/java/cn/lili/common/utils/RegularUtil.java b/framework/src/main/java/cn/lili/common/utils/RegularUtil.java
index 1915c4db..3837cf24 100644
--- a/framework/src/main/java/cn/lili/common/utils/RegularUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/RegularUtil.java
@@ -1,7 +1,5 @@
 package cn.lili.common.utils;
 
-import lombok.extern.slf4j.Slf4j;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -15,25 +13,25 @@ public class RegularUtil {
     /**
      * 手机号
      */
-    private static final Pattern mobile = Pattern.compile("^1[3|4|5|8][0-9]\\d{8}$");
+    private static final Pattern MOBILE = Pattern.compile("^1[3|4|5|8][0-9]\\d{8}$");
 
     /**
      * 邮箱
      */
-    private static final Pattern email = Pattern.compile("^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]+)*\\.[a-zA-Z0-9]{2,6}$");
+    private static final Pattern EMAIL = Pattern.compile("^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]+)*\\.[a-zA-Z0-9]{2,6}$");
 
-    public static boolean Mobile(String v){
+    public static boolean mobile(String v){
 
-        Matcher m = mobile.matcher(v);
+        Matcher m = MOBILE.matcher(v);
         if(m.matches()){
             return true;
         }
         return false;
     }
 
-    public static boolean Email(String v){
+    public static boolean email(String v){
 
-        Matcher m = email.matcher(v);
+        Matcher m = EMAIL.matcher(v);
         if(m.matches()){
             return true;
         }
diff --git a/framework/src/main/java/cn/lili/common/utils/SpelUtil.java b/framework/src/main/java/cn/lili/common/utils/SpelUtil.java
index 77e31001..02cff602 100644
--- a/framework/src/main/java/cn/lili/common/utils/SpelUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/SpelUtil.java
@@ -17,10 +17,13 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 public class SpelUtil {
 
 
-    //spel表达式解析器
+    /**
+     * spel表达式解析器
+     */
     private static SpelExpressionParser spelExpressionParser = new SpelExpressionParser();
-
-    //参数名发现器
+    /**
+     * 参数名发现器
+     */
     private static DefaultParameterNameDiscoverer parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
 
     /**
@@ -41,7 +44,8 @@ public class SpelUtil {
             //获取方法参数值
             Object[] args = joinPoint.getArgs();
             for (int i = 0; i < args.length; i++) {
-                context.setVariable(parameterNames[i], args[i]); //替换spel里的变量值为实际值， 比如 #user -->  user对象
+                //替换spel里的变量值为实际值， 比如 #user -->  user对象
+                context.setVariable(parameterNames[i], args[i]);
             }
             return spelExpressionParser.parseExpression(spel).getValue(context).toString();
         }
@@ -66,7 +70,8 @@ public class SpelUtil {
             //获取方法参数值
             Object[] args = joinPoint.getArgs();
             for (int i = 0; i < args.length; i++) {
-                context.setVariable(parameterNames[i], args[i]); //替换spel里的变量值为实际值， 比如 #user -->  user对象
+                //替换spel里的变量值为实际值， 比如 #user -->  user对象
+                context.setVariable(parameterNames[i], args[i]);
             }
             context.setVariable("rvt", rvt);
             return spelExpressionParser.parseExpression(spel).getValue(context).toString();
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 b8e29aa7..d7307f78 100644
--- a/framework/src/main/java/cn/lili/common/utils/StringUtils.java
+++ b/framework/src/main/java/cn/lili/common/utils/StringUtils.java
@@ -195,7 +195,7 @@ public class StringUtils extends StrUtil {
         if (obj == null) {
             return null;
         }
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<String, Object>(16);
 
         BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
         PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
diff --git a/framework/src/main/java/cn/lili/common/utils/ThreadPoolUtil.java b/framework/src/main/java/cn/lili/common/utils/ThreadPoolUtil.java
index 6867dea8..17f87182 100644
--- a/framework/src/main/java/cn/lili/common/utils/ThreadPoolUtil.java
+++ b/framework/src/main/java/cn/lili/common/utils/ThreadPoolUtil.java
@@ -22,12 +22,12 @@ public class ThreadPoolUtil {
     /**
      * 线程缓冲队列
      */
-    private static final BlockingQueue<Runnable> bqueue = new ArrayBlockingQueue<Runnable>(100);
-    private static final ThreadPoolExecutor pool = new ThreadPoolExecutor(SIZE_CORE_POOL, SIZE_MAX_POOL, ALIVE_TIME, TimeUnit.MILLISECONDS, bqueue, new ThreadPoolExecutor.CallerRunsPolicy());
+    private static final BlockingQueue<Runnable> BQUEUE = new ArrayBlockingQueue<Runnable>(100);
+    private static final ThreadPoolExecutor POOL = new ThreadPoolExecutor(SIZE_CORE_POOL, SIZE_MAX_POOL, ALIVE_TIME, TimeUnit.MILLISECONDS, BQUEUE, new ThreadPoolExecutor.CallerRunsPolicy());
     public static ThreadPoolExecutor threadPool;
 
     static {
-        pool.prestartAllCoreThreads();
+        POOL.prestartAllCoreThreads();
     }
 
     /**
@@ -68,10 +68,10 @@ public class ThreadPoolUtil {
     }
 
     public static ThreadPoolExecutor getPool() {
-        return pool;
+        return POOL;
     }
 
     public static void main(String[] args) {
-        System.out.println(pool.getPoolSize());
+        System.out.println(POOL.getPoolSize());
     }
 }
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 bdcc2d70..63d673ba 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
@@ -1,7 +1,6 @@
 package cn.lili.common.validation.impl;
 
 import cn.lili.common.validation.Mobile;
-import cn.lili.common.validation.Phone;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
@@ -11,22 +10,29 @@ import java.util.regex.Pattern;
 /**
  * 电话校验
  * 支持手机号+电话同时校验
+ *
+ * @author Bulbasaur
+ * @date: 2021/7/9 1:41 上午
  */
 public class MobileValidator implements ConstraintValidator<Mobile, String> {
 
+    private static final Pattern PHONE = Pattern.compile("^0?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$");
+    private static final Pattern AREA_MOBILE = Pattern.compile("0\\d{2,3}[-]?\\d{7,8}|0\\d{2,3}\\s?\\d{7,8}|13[0-9]\\d{8}|15[1089]\\d{8}");
+    private static final Pattern MOBILE = Pattern.compile("^[1-9]{1}[0-9]{5,8}$");
+
     @Override
     public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
-        Pattern p1 = null, p2 = null, p3 = null;
         Matcher m = null;
-        p1 = Pattern.compile("0\\d{2,3}[-]?\\d{7,8}|0\\d{2,3}\\s?\\d{7,8}|13[0-9]\\d{8}|15[1089]\\d{8}");  // 验证带区号的
-        p2 = Pattern.compile("^[1-9]{1}[0-9]{5,8}$");         // 验证没有区号的
-        p3 = Pattern.compile("^0?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$");// 验证手机号
+        Pattern pattern = null;
+        // 验证手机号
         if (value.length() == 11) {
-            m = p3.matcher(value);
+            m = PHONE.matcher(value);
+            // 验证带区号的电话
         } else if (value.length() > 9) {
-            m = p1.matcher(value);
+            m = AREA_MOBILE.matcher(value);
+            //验证没有区号的电话
         } else {
-            m = p2.matcher(value);
+            m = MOBILE.matcher(value);
         }
         return m.matches();
     }
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 731e9fe2..ad0d9885 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
@@ -7,7 +7,12 @@ import javax.validation.ConstraintValidatorContext;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
+/**
+ * 手机号校验
+ *
+ * @author Bulbasaur
+ * @date: 2021/7/9 1:42 上午
+ */
 public class PhoneValidator implements ConstraintValidator<Phone, String> {
 
     private static Pattern pattern = Pattern.compile("^0?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$");
diff --git a/framework/src/main/java/cn/lili/common/verification/ImageUtil.java b/framework/src/main/java/cn/lili/common/verification/ImageUtil.java
index ef9e74ab..98891ec5 100644
--- a/framework/src/main/java/cn/lili/common/verification/ImageUtil.java
+++ b/framework/src/main/java/cn/lili/common/verification/ImageUtil.java
@@ -72,12 +72,13 @@ public class ImageUtil {
                 int rightRgb = templateImage.getRGB(i + 1, j);
                 int downRgb = templateImage.getRGB(i, j + 1);
                 //描边处理，,取带像素和无像素的界点，判断该点是不是临界轮廓点,如果是设置该坐标像素是白色
-                if ((rgb >= 0 && rightRgb < 0) || (rgb < 0 && rightRgb >= 0) || (rgb >= 0 && downRgb < 0)
-                        || (rgb < 0 && downRgb >= 0)) {
+                boolean rgbImage = ((rgb >= 0 && rightRgb < 0)
+                        || (rgb < 0 && rightRgb >= 0)
+                        || (rgb >= 0 && downRgb < 0)
+                        || (rgb < 0 && downRgb >= 0));
 
+                if (rgbImage) {
                     newImage.setRGB(i, j, Color.GRAY.getRGB());
-
-//                   oriImage.setRGB(x + i, y + j, Color.white.getRGB());
                 }
             }
         }
@@ -87,7 +88,7 @@ public class ImageUtil {
         int xStart = x - 1;
         int yStart = y - 1;
         int current = 0;
-        for (int i = xStart; i < 3 + xStart; i++)
+        for (int i = xStart; i < 3 + xStart; i++) {
             for (int j = yStart; j < 3 + yStart; j++) {
                 int tx = i;
                 if (tx < 0) {
@@ -105,6 +106,7 @@ public class ImageUtil {
                 pixels[current++] = img.getRGB(tx, ty);
 
             }
+        }
     }
 
     public static void fillMatrix(int[][] matrix, int[] values) {
diff --git a/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java b/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java
index 39b00968..69339d02 100644
--- a/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java
+++ b/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java
@@ -43,7 +43,7 @@ public class SliderImageUtil {
     public static Map<String, Object> pictureTemplatesCut(SerializableStream sliderFile, SerializableStream originalFile) throws Exception {
 
         Random random = new Random();
-        Map<String, Object> pictureMap = new HashMap<>();
+        Map<String, Object> pictureMap = new HashMap<>(16);
         //拼图
         BufferedImage sliderImage = ImageIO.read(Base64DecodeMultipartFile.base64ToInputStream(sliderFile.getBase64()));
         int sliderWidth = sliderImage.getWidth();
@@ -79,12 +79,15 @@ public class SliderImageUtil {
 
         //添加水印
         ImageUtil.addWatermark(originalImage, "LILI-SHOP");
-        ByteArrayOutputStream newImageOs = new ByteArrayOutputStream();//新建流。
-        ImageIO.write(newImage, TEMP_IMG_FILE_TYPE, newImageOs);//利用ImageIO类提供的write方法，将bi以png图片的数据模式写入流。
+        //新建流
+        ByteArrayOutputStream newImageOs = new ByteArrayOutputStream();
+        //利用ImageIO类提供的write方法，将bi以png图片的数据模式写入流。
+        ImageIO.write(newImage, TEMP_IMG_FILE_TYPE, newImageOs);
         byte[] newImagery = newImageOs.toByteArray();
-
-        ByteArrayOutputStream oriImagesOs = new ByteArrayOutputStream();//新建流。
-        ImageIO.write(originalImage, IMG_FILE_TYPE, oriImagesOs);//利用ImageIO类提供的write方法，将bi以jpg图片的数据模式写入流。
+        //新建流
+        ByteArrayOutputStream oriImagesOs = new ByteArrayOutputStream();
+        //利用ImageIO类提供的write方法，将bi以jpg图片的数据模式写入流
+        ImageIO.write(originalImage, IMG_FILE_TYPE, oriImagesOs);
         byte[] oriImageByte = oriImagesOs.toByteArray();
 
         pictureMap.put("slidingImage", "data:image/png;base64," + Base64Utils.encodeToString(newImagery));
diff --git a/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java b/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java
index 6c54ced0..382a6868 100644
--- a/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java
+++ b/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java
@@ -7,6 +7,9 @@ import java.util.Map;
 
 /**
  * 验证码模块
+ *
+ * @author Bulbasaur
+ * @date: 2021/7/9 1:42 上午
  */
 public interface VerificationService {
     /**
@@ -15,6 +18,7 @@ public interface VerificationService {
      * @param verificationEnums 校验枚举
      * @param uuid              uuid
      * @return 校验对象
+     * @throws IOException 校验错误
      */
     Map<String, Object> createVerification(VerificationEnums verificationEnums, String uuid) throws IOException;
 
@@ -29,9 +33,11 @@ public interface VerificationService {
     boolean preCheck(Integer xPos, String uuid, VerificationEnums verificationEnums);
 
     /**
+     * 验证码校验
+     *
      * @param uuid              用户唯一表示
      * @param verificationEnums 校验枚举
-     * @return
+     * @return 操作结果
      */
     boolean check(String uuid, VerificationEnums verificationEnums);
 }
diff --git a/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java b/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java
index a7f741d3..ff54b924 100644
--- a/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java
+++ b/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java
@@ -7,8 +7,11 @@ import org.springframework.data.redis.serializer.SerializationException;
 
 import java.nio.charset.Charset;
 
-/*
- *要实现对象的缓存，定义自己的序列化和反序列化器。使用阿里的fastjson来实现的比较多。
+/**
+ * 要实现对象的缓存，定义自己的序列化和反序列化器。使用阿里的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/config/cache/RedisConfig.java
index 00d79919..63271fb8 100644
--- a/framework/src/main/java/cn/lili/config/cache/RedisConfig.java
+++ b/framework/src/main/java/cn/lili/config/cache/RedisConfig.java
@@ -51,8 +51,14 @@ public class RedisConfig extends CachingConfigurerSupport {
     private Integer timeout;
 
 
+    /**
+     * 当有多个管理器的时候，必须使用该注解在一个管理器上注释：表示该管理器为默认的管理器
+     *
+     * @param connectionFactory
+     * @return
+     */
     @Bean
-    @Primary//当有多个管理器的时候，必须使用该注解在一个管理器上注释：表示该管理器为默认的管理器
+    @Primary
     public CacheManager cacheManager(RedisConnectionFactory connectionFactory) {
         //初始化一个RedisCacheWriter
         RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(connectionFactory);
diff --git a/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java b/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java
index e25bb9d7..f5b08948 100644
--- a/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java
+++ b/framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java
@@ -85,11 +85,9 @@ public class ElasticsearchConfig extends AbstractElasticsearchConfiguration {
         return (response, context) -> 2 * 60 * 1000;
     }
 
-    /*
+    /**
      * it gets called when bean instance is getting removed from the context if
      * scope is not a prototype
-     */
-    /*
      * If there is a method named shutdown or close then spring container will try
      * to automatically configure them as callback methods when bean is being
      * destroyed
@@ -99,7 +97,7 @@ public class ElasticsearchConfig extends AbstractElasticsearchConfiguration {
         try {
             this.client.close();
         } catch (IOException e) {
-            log.error("es clientClose错误",e);
+            log.error("es clientClose错误", e);
         }
     }
 
diff --git a/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java b/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java
index 11e8c0be..f943c75e 100644
--- a/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java
+++ b/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java
@@ -1,7 +1,6 @@
 package cn.lili.config.interceptor;
 
 import cn.lili.config.properties.IgnoredUrlsProperties;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
@@ -31,7 +30,10 @@ public class UrlConfiguration implements WebMvcConfigurer {
         ir.excludePathPatterns(ignoredUrlsProperties.getUrls());
     }
 
-    //开放资源 这里配置swagger可以在前端访问
+    /**
+     * 开放资源 这里配置swagger可以在前端访问
+     * @param registry
+     */
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("/statics/**").addResourceLocations("classpath:/statics/");
diff --git a/framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java b/framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java
index c30b3471..5c05732d 100644
--- a/framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java
+++ b/framework/src/main/java/cn/lili/config/properties/SmsTemplateSetting.java
@@ -13,14 +13,24 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @ConfigurationProperties(prefix = "lili.sms")
 public class SmsTemplateSetting {
-    //登录
-    private String LOGIN = "SMS_205755300";
-    //注册
+    /**
+     * 登录
+     */
+    private String lOGIN = "SMS_205755300";
+    /**
+     * 注册
+     */
     private String REGISTER = "SMS_205755298";
-    //找回密码
+    /**
+     * 找回密码
+     */
     private String FIND_USER = "SMS_205755301";
-    //设置密码
+    /**
+     * 设置密码
+     */
     private String UPDATE_PASSWORD = "SMS_205755297";
-    //设置支付密码
+    /**
+     * 设置支付密码
+     */
     private String WALLET_PASSWORD = "SMS_205755297";
 }
diff --git a/framework/src/main/java/cn/lili/config/properties/ThreadProperties.java b/framework/src/main/java/cn/lili/config/properties/ThreadProperties.java
index 90dced01..b58c7826 100644
--- a/framework/src/main/java/cn/lili/config/properties/ThreadProperties.java
+++ b/framework/src/main/java/cn/lili/config/properties/ThreadProperties.java
@@ -37,7 +37,7 @@ public class ThreadProperties {
     /**
      * 保持存活时间
      */
-    private Integer KeepAliveSeconds = 60;
+    private Integer keepAliveSeconds = 60;
 
 
 }
diff --git a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingDatabaseAlgorithm.java b/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingDatabaseAlgorithm.java
index d25be592..dc1f6b66 100644
--- a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingDatabaseAlgorithm.java
+++ b/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingDatabaseAlgorithm.java
@@ -20,8 +20,8 @@ public class CreateTimeShardingDatabaseAlgorithm implements PreciseShardingAlgor
 
     @Override
     public String doSharding(Collection<String> collection, PreciseShardingValue<Long> preciseShardingValue) {
-        Long create_time = preciseShardingValue.getValue();
-        String value = DateUtil.toString(create_time, "yyyy");
+        Long createTime = preciseShardingValue.getValue();
+        String value = DateUtil.toString(createTime, "yyyy");
         //data2019,data2020
         return "data" + value;
     }
diff --git a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithm.java b/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithm.java
index ab83fc26..619da8cd 100644
--- a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithm.java
+++ b/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithm.java
@@ -21,9 +21,9 @@ public class CreateTimeShardingTableAlgorithm implements PreciseShardingAlgorith
 
     @Override
     public String doSharding(Collection<String> collection, PreciseShardingValue<Long> preciseShardingValue) {
-        Long create_time = preciseShardingValue.getValue();
-        String monthValue = DateUtil.toString(create_time, "MM");
-        String yearValue = DateUtil.toString(create_time, "yyyy");
+        Long createTime = preciseShardingValue.getValue();
+        String monthValue = DateUtil.toString(createTime, "MM");
+        String yearValue = DateUtil.toString(createTime, "yyyy");
         Integer month = Integer.valueOf(monthValue);
         Integer year = Integer.valueOf(yearValue);
         //li_order_1,li_order_2~
diff --git a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithmBak.java b/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithmBak.java
index 64d12dd9..98a27c1a 100644
--- a/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithmBak.java
+++ b/framework/src/main/java/cn/lili/config/sharding/CreateTimeShardingTableAlgorithmBak.java
@@ -19,8 +19,8 @@ public class CreateTimeShardingTableAlgorithmBak implements PreciseShardingAlgor
 
     @Override
     public String doSharding(Collection<String> collection, PreciseShardingValue<Long> preciseShardingValue) {
-        Long create_time = preciseShardingValue.getValue();
-        String value = DateUtil.toString(create_time, "MM");
+        Long createTime = preciseShardingValue.getValue();
+        String value = DateUtil.toString(createTime, "MM");
         Integer month = Integer.valueOf(value);
         //li_order_1,li_order_2~
         return "li_order_" + month;
@@ -30,17 +30,9 @@ public class CreateTimeShardingTableAlgorithmBak implements PreciseShardingAlgor
     @Override
     public Collection<String> doSharding(Collection collection, RangeShardingValue rangeShardingValue) {
         Collection<String> collect = new ArrayList<>();
-        //Range<Integer> valueRange = rangeShardingValue.getValueRange();
-        //开始年份结束年份
-        //String start = DateUtil.toString(valueRange.lowerEndpoint().longValue(), "MM");
-        //String end = DateUtil.toString(valueRange.upperEndpoint().longValue(), "MM");
-        //循环增加区间的查询条件
-
-
         //因为考虑到 假设2019-05～2020-05
         //这快是没办法处理的，因为分库分表之后，每个库都要进行查询，如果操作为，1-4月，那么2020年数据查询正确了，可是2019年到5-12月数据就查询不到了
         //这里需要做一些性能的浪费，现在看来是没办法处理到
-
         for (Integer i = 1; i <= 12; i++) {
             collect.add("li_order_" + i);
         }
diff --git a/framework/src/main/java/cn/lili/generator/CodeGenerator.java b/framework/src/main/java/cn/lili/generator/CodeGenerator.java
index 5a98d27a..3c51dab2 100644
--- a/framework/src/main/java/cn/lili/generator/CodeGenerator.java
+++ b/framework/src/main/java/cn/lili/generator/CodeGenerator.java
@@ -25,73 +25,73 @@ public class CodeGenerator {
     /**
      * 代码生成在哪个项目
      */
-    private static final String project = "framework";
+    private static final String PROJECT = "framework";
 
     /**
      * 代码生成在哪个包下边
      */
-    private static final String packages = "cn.lili.modules.";
+    private static final String PACKAGES = "cn.lili.modules.";
 
     /**
      * modules
      */
-    private static final String modules = "message";
+    private static final String MODULES = "message";
 
 
     /**
      * 实体类名
      * 建议仅需修改
      */
-    private static final String className = "ShortLink";
+    private static final String CLASS_NAME = "ShortLink";
 
     /**
      * 类说明描述
      * 建议仅需修改
      */
-    private static final String description = "短链接";
+    private static final String DESCRIPTION = "短链接";
 
     /**
      * 作者名
      * 建议仅需修改
      */
-    private static final String author = "Chopper";
+    private static final String AUTHOR = "Chopper";
 
     /**
      * 数据库表名前缀
      * 下方请根据需要修改
      */
-    private static final String tablePre = "li_";
+    private static final String TABLE_PRE = "li_";
 
     /**
      * 主键类型
      */
-    private static final String primaryKeyType = "String";
+    private static final String PRIMARY_KEY_TYPE = "String";
 
 
     /**
      * endity
      */
-    private static final String entityPackage = packages + modules + ".entity";
+    private static final String ENTITY_PACKAGE = PACKAGES + MODULES + ".entity";
 
     /**
      * dao
      */
-    private static final String daoPackage = packages + modules + ".mapper";
+    private static final String DAO_PACKAGE = PACKAGES + MODULES + ".mapper";
 
     /**
      * service
      */
-    private static final String servicePackage = packages + modules + ".service";
+    private static final String SERVICE_PACKAGE = PACKAGES + MODULES + ".service";
 
     /**
      * serviceImpl
      */
-    private static final String serviceImplPackage = packages + modules + ".serviceimpl";
+    private static final String SERVICE_IMPL_PACKAGE = PACKAGES + MODULES + ".serviceimpl";
 
     /**
      * controller
      */
-    private static final String controllerPackage = packages + modules + ".controller";
+    private static final String CONTROLLER_PACKAGE = PACKAGES + MODULES + ".controller";
 
     /**
      * 运行该主函数即可生成代码
@@ -126,17 +126,17 @@ public class CodeGenerator {
         Template mapperXmlTemplate = gt.getTemplate("mapperXml.btl");
 
         Entity entity = new Entity();
-        entity.setEntityPackage(entityPackage);
-        entity.setDaoPackage(daoPackage);
-        entity.setServicePackage(servicePackage);
-        entity.setServiceImplPackage(serviceImplPackage);
-        entity.setControllerPackage(controllerPackage);
-        entity.setAuthor(author);
-        entity.setClassName(className);
-        entity.setTableName(tablePre + StringUtils.camel2Underline(className));
-        entity.setClassNameLowerCase(name(className, false));
-        entity.setDescription(description);
-        entity.setPrimaryKeyType(primaryKeyType);
+        entity.setEntityPackage(ENTITY_PACKAGE);
+        entity.setDaoPackage(DAO_PACKAGE);
+        entity.setServicePackage(SERVICE_PACKAGE);
+        entity.setServiceImplPackage(SERVICE_IMPL_PACKAGE);
+        entity.setControllerPackage(CONTROLLER_PACKAGE);
+        entity.setAuthor(AUTHOR);
+        entity.setClassName(CLASS_NAME);
+        entity.setTableName(TABLE_PRE + StringUtils.camel2Underline(CLASS_NAME));
+        entity.setClassNameLowerCase(name(CLASS_NAME, false));
+        entity.setDescription(DESCRIPTION);
+        entity.setPrimaryKeyType(PRIMARY_KEY_TYPE);
 
         OutputStream out = null;
 
@@ -145,7 +145,7 @@ public class CodeGenerator {
         String entityResult = entityTemplate.render();
         System.out.println(entityResult);
         //创建文件
-        String entityFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/java/" + dotToLine(entityPackage) + "/" + className + ".java";
+        String entityFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(ENTITY_PACKAGE) + "/" + CLASS_NAME + ".java";
         File entityFile = new File(entityFileUrl);
         File entityDir = entityFile.getParentFile();
         if (!entityDir.exists()) {
@@ -163,7 +163,7 @@ public class CodeGenerator {
         String daoResult = daoTemplate.render();
         System.out.println(daoResult);
         //创建文件
-        String daoFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/java/" + dotToLine(daoPackage) + "/" + className + "Mapper.java";
+        String daoFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(DAO_PACKAGE) + "/" + CLASS_NAME + "Mapper.java";
         File daoFile = new File(daoFileUrl);
         File daoDir = daoFile.getParentFile();
         if (!daoDir.exists()) {
@@ -181,7 +181,7 @@ public class CodeGenerator {
         String serviceResult = serviceTemplate.render();
         System.out.println(serviceResult);
         //创建文件
-        String serviceFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/java/" + dotToLine(servicePackage) + "/" + className + "Service.java";
+        String serviceFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(SERVICE_PACKAGE) + "/" + CLASS_NAME + "Service.java";
         File serviceFile = new File(serviceFileUrl);
         File serviceDir = serviceFile.getParentFile();
         if (!serviceDir.exists()) {
@@ -200,7 +200,7 @@ public class CodeGenerator {
         System.out.println(serviceImplResult);
         //创建文件
         System.out.println(System.getProperty("user.dir"));
-        String serviceImplFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/java/" + dotToLine(serviceImplPackage) + "/" + className + "ServiceImpl.java";
+        String serviceImplFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(SERVICE_IMPL_PACKAGE) + "/" + CLASS_NAME + "ServiceImpl.java";
         File serviceImplFile = new File(serviceImplFileUrl);
         File serviceImplDir = serviceImplFile.getParentFile();
         if (!serviceImplDir.exists()) {
@@ -218,7 +218,7 @@ public class CodeGenerator {
         String controllerResult = controllerTemplate.render();
         System.out.println(controllerResult);
         //创建文件
-        String controllerFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/java/" + dotToLine(controllerPackage) + "/" + className + "Controller.java";
+        String controllerFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(CONTROLLER_PACKAGE) + "/" + CLASS_NAME + "Controller.java";
         File controllerFile = new File(controllerFileUrl);
         File controllerDir = controllerFile.getParentFile();
         if (!controllerDir.exists()) {
@@ -236,7 +236,7 @@ public class CodeGenerator {
         String mapperXmlResult = mapperXmlTemplate.render();
         System.out.println(mapperXmlResult);
         //创建文件
-        String mapperXmlFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/resources/mapper/" + className + "Mapper.xml";
+        String mapperXmlFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/resources/mapper/" + CLASS_NAME + "Mapper.xml";
         File mapperXmlFile = new File(mapperXmlFileUrl);
         File mapperXmlDir = mapperXmlFile.getParentFile();
         if (!mapperXmlDir.exists()) {
@@ -263,36 +263,36 @@ public class CodeGenerator {
      */
     private static void deleteCode(String className) throws IOException {
 
-        String entityFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/java/" + dotToLine(entityPackage) + "/" + className + ".java";
+        String entityFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(ENTITY_PACKAGE) + "/" + className + ".java";
         File entityFile = new File(entityFileUrl);
         if (entityFile.exists()) {
             entityFile.delete();
         }
-        String daoFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/java/" + dotToLine(daoPackage) + "/" + className + "Mapper.java";
+        String daoFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(DAO_PACKAGE) + "/" + className + "Mapper.java";
         File daoFile = new File(daoFileUrl);
         if (daoFile.exists()) {
             daoFile.delete();
         }
 
-        String serviceFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/java/" + dotToLine(servicePackage) + "/" + className + "Service.java";
+        String serviceFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(SERVICE_PACKAGE) + "/" + className + "Service.java";
         File serviceFile = new File(serviceFileUrl);
         if (serviceFile.exists()) {
             serviceFile.delete();
         }
 
-        String serviceImplFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/java/" + dotToLine(serviceImplPackage) + "/" + className + "ServiceImpl.java";
+        String serviceImplFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(SERVICE_IMPL_PACKAGE) + "/" + className + "ServiceImpl.java";
         File serviceImplFile = new File(serviceImplFileUrl);
         if (serviceImplFile.exists()) {
             serviceImplFile.delete();
         }
 
-        String controllerFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/java/" + dotToLine(controllerPackage) + "/" + className + "Controller.java";
+        String controllerFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/java/" + dotToLine(CONTROLLER_PACKAGE) + "/" + className + "Controller.java";
         File controllerFile = new File(controllerFileUrl);
         if (controllerFile.exists()) {
             controllerFile.delete();
         }
 
-        String mapperXmlFileUrl = System.getProperty("user.dir") + "/" + project + "/src/main/resources/mapper/" + className + "Mapper.xml";
+        String mapperXmlFileUrl = System.getProperty("user.dir") + "/" + PROJECT + "/src/main/resources/mapper/" + className + "Mapper.xml";
         File mapperXmlFile = new File(mapperXmlFileUrl);
         if (mapperXmlFile.exists()) {
             mapperXmlFile.delete();
diff --git a/framework/src/main/java/cn/lili/modules/base/aspect/DemoSite.java b/framework/src/main/java/cn/lili/modules/base/aspect/DemoSite.java
index a0e344e0..c97d3eb1 100644
--- a/framework/src/main/java/cn/lili/modules/base/aspect/DemoSite.java
+++ b/framework/src/main/java/cn/lili/modules/base/aspect/DemoSite.java
@@ -4,6 +4,9 @@ import java.lang.annotation.*;
 
 /**
  * 演示站点注解
+ *
+ * @author Bulbasaur
+ * @date: 2021/7/9 1:40 上午
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/framework/src/main/java/cn/lili/modules/base/entity/enums/ClientTypeEnum.java b/framework/src/main/java/cn/lili/modules/base/entity/enums/ClientTypeEnum.java
index e4a7b838..ba8de6ba 100644
--- a/framework/src/main/java/cn/lili/modules/base/entity/enums/ClientTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/base/entity/enums/ClientTypeEnum.java
@@ -10,10 +10,25 @@ package cn.lili.modules.base.entity.enums;
 
 public enum ClientTypeEnum {
 
+    /**
+     * "移动端"
+     */
     H5("移动端"),
+    /**
+     * "PC端"
+     */
     PC("PC端"),
+    /**
+     * "小程序端"
+     */
     WECHAT_MP("小程序端"),
+    /**
+     * "移动应用端"
+     */
     APP("移动应用端"),
+    /**
+     * "未知"
+     */
     UNKNOWN("未知");
 
     private final String clientName;
diff --git a/framework/src/main/java/cn/lili/modules/base/entity/enums/VerificationSourceEnum.java b/framework/src/main/java/cn/lili/modules/base/entity/enums/VerificationSourceEnum.java
index 8ad6023d..e8557ed0 100644
--- a/framework/src/main/java/cn/lili/modules/base/entity/enums/VerificationSourceEnum.java
+++ b/framework/src/main/java/cn/lili/modules/base/entity/enums/VerificationSourceEnum.java
@@ -8,8 +8,13 @@ package cn.lili.modules.base.entity.enums;
  * @date 2021/1/26 15:55
  */
 public enum VerificationSourceEnum {
-
+    /**
+     * 滑块
+     */
     SLIDER("滑块"),
+    /**
+     * 验证码源
+     */
     RESOURCE("验证码源");
 
     private final String description;
diff --git a/framework/src/main/java/cn/lili/modules/base/service/RegionService.java b/framework/src/main/java/cn/lili/modules/base/service/RegionService.java
index c4b38c79..f66f5de9 100644
--- a/framework/src/main/java/cn/lili/modules/base/service/RegionService.java
+++ b/framework/src/main/java/cn/lili/modules/base/service/RegionService.java
@@ -27,7 +27,12 @@ public interface RegionService extends IService<Region> {
     @CacheEvict
     void synchronizationData(String url);
 
-
+    /**
+     * 获取地区列表
+     *
+     * @param id 地区ID
+     * @return 地区列表
+     */
     @Cacheable(key = "#id")
     List<Region> getItem(String id);
 
diff --git a/framework/src/main/java/cn/lili/modules/base/service/VerificationSourceService.java b/framework/src/main/java/cn/lili/modules/base/service/VerificationSourceService.java
index 7db9558a..1527f9b9 100644
--- a/framework/src/main/java/cn/lili/modules/base/service/VerificationSourceService.java
+++ b/framework/src/main/java/cn/lili/modules/base/service/VerificationSourceService.java
@@ -13,7 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface VerificationSourceService extends IService<VerificationSource> {
 
-    //缓存
+    /**
+     * 缓存
+     */
     String VERIFICATION_CACHE = CachePrefix.VERIFICATION.getPrefix();
 
 
@@ -26,6 +28,8 @@ public interface VerificationSourceService extends IService<VerificationSource>
 
     /**
      * 获取验证缓存
+     *
+     * @return 验证码
      */
     VerificationVO getVerificationCache();
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java b/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java
index 04893f1b..4ce4e765 100644
--- a/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java
@@ -1,9 +1,9 @@
 package cn.lili.modules.base.serviceimpl;
 
 import cn.lili.common.cache.Cache;
-import cn.lili.common.utils.StringUtils;
 import cn.lili.common.utils.HttpClientUtils;
 import cn.lili.common.utils.SnowFlake;
+import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.base.mapper.RegionMapper;
 import cn.lili.modules.base.service.RegionService;
 import cn.lili.modules.system.entity.dos.Region;
@@ -27,7 +27,7 @@ import java.util.*;
  * @date 2020/12/2 11:11
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements RegionService {
 
     /**
@@ -37,6 +37,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
     @Autowired
     private Cache cache;
+
     @Override
     public void synchronizationData(String url) {
         try {
@@ -58,7 +59,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             //删除缓存
             cache.vagueDel("{regions}");
         } catch (Exception e) {
-            log.error("同步行政数据错误",e);
+            log.error("同步行政数据错误", e);
         }
     }
 
@@ -89,8 +90,10 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             //因为有无用数据 所以先删除前两个
             result = ArrayUtils.remove(result, 0);
             result = ArrayUtils.remove(result, 0);
-            String regionIds = "";  //地址id
-            String regionNames = "";//地址名称
+            //地址id
+            String regionIds = "";
+            //地址名称
+            String regionNames = "";
             //循环构建新的数据
             for (String regionId : result) {
                 Region reg = this.baseMapper.selectById(regionId);
@@ -102,7 +105,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             regionIds += region.getId();
             regionNames += region.getName();
             //构建返回数据
-            Map<String, Object> obj = new HashMap<>();
+            Map<String, Object> obj = new HashMap<>(2);
             obj.put("id", regionIds);
             obj.put("name", regionNames);
             return obj;
@@ -120,10 +123,10 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
     private List<RegionVO> regionTree(List<Region> regions) {
         List<RegionVO> regionVOS = new ArrayList<>();
-        regions.stream().filter(region -> region.getLevel().equals("province")).forEach(item -> {
+        regions.stream().filter(region -> ("province").equals(region.getLevel())).forEach(item -> {
             regionVOS.add(new RegionVO(item));
         });
-        regions.stream().filter(region -> region.getLevel().equals("city")).forEach(item -> {
+        regions.stream().filter(region -> ("city").equals(region.getLevel())).forEach(item -> {
             for (RegionVO region : regionVOS) {
                 if (region.getId().equals(item.getParentId())) {
                     region.getChildren().add(new RegionVO(item));
@@ -148,18 +151,6 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         JSONArray countryAll = jsonObject.getJSONArray("districts");
         for (int i = 0; i < countryAll.size(); i++) {
             JSONObject contry = countryAll.getJSONObject(i);
-//           String citycode0 = contry.getString("citycode");
-//           String adcode0 = contry.getString("adcode");
-//           String name0 = contry.getString("name");
-//           String center0 = contry.getString("center");
-//           String country = contry.getString("level");
-//           int level = 0;
-//           if (country.equals("country")) {
-//               level = 0;
-//           }
-//           插入国家
-//           Integer id1 = insert(0, adcode0, citycode0, name0, center0, level, name0);
-//           Integer id1 = insert(0, adcode0, citycode0, name0, center0, level);
             String id1 = "0";
             JSONArray provinceAll = contry.getJSONArray("districts");
             for (int j = 0; j < provinceAll.size(); j++) {
@@ -192,7 +183,6 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
                         String level3 = district.getString("level");
                         //插入区县
                         String id4 = insert(regions, id3, citycode3, adcode3, name3, center3, level3, w, id1, id2, id3);
-                        // JSONArray street = street3.getJSONArray("districts");
                         //有需要可以继续向下遍历
                         JSONArray streetAll = district.getJSONArray("districts");
                         for (int r = 0; r < streetAll.size(); r++) {
@@ -238,10 +228,10 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 //               "        \"center\": \"116.3683244,39.915085\",\n" +
 //               "        \"level\": \"country\",\n" +
         Region record = new Region();
-        if (!adCode.equals("[]")) {
+        if (!("[]").equals(adCode)) {
             record.setAdCode(adCode);
         }
-        if (!cityCode.equals("[]")) {
+        if (!("[]").equals(cityCode)) {
             record.setCityCode(cityCode);
         }
         record.setCenter(center);
@@ -250,14 +240,14 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         record.setParentId(parentId);
         record.setOrderNum(order);
         record.setId(String.valueOf(SnowFlake.getId()));
-        String megName = ",";
+        StringBuffer megName = new StringBuffer(",");
         for (int i = 0; i < ids.length; i++) {
-            megName = megName + ids[i];
+            megName = megName.append(ids[i])  ;
             if (i < ids.length - 1) {
-                megName = megName + ",";
+                megName.append(",");
             }
         }
-        record.setPath(megName);
+        record.setPath(megName.toString());
         regions.add(record);
         return record.getId();
     }
diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Commodity.java b/framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Commodity.java
index 3fe8a610..ed0d840f 100644
--- a/framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Commodity.java
+++ b/framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Commodity.java
@@ -28,9 +28,11 @@ public class Commodity extends BaseEntity {
     @ApiModelProperty(value = "商品名称")
     private String name;
 
-    //1：一口价（只需要传入price，price2不传）
-    //2：价格区间（price字段为左边界，price2字段为右边界，price和price2必传）
-    //3：显示折扣价（price字段为原价，price2字段为现价， price和price2必传
+    /**
+     * 1：一口价（只需要传入price，price2不传）
+     * 2：价格区间（price字段为左边界，price2字段为右边界，price和price2必传）
+     * 3：显示折扣价（price字段为原价，price2字段为现价， price和price2必传
+     */
     @ApiModelProperty(value = "价格类型")
     private Integer priceType;
 
diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/CommodityDTO.java b/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/CommodityDTO.java
index e28e41d3..97b33027 100644
--- a/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/CommodityDTO.java
+++ b/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/CommodityDTO.java
@@ -11,12 +11,20 @@ import lombok.Data;
  */
 @Data
 public class CommodityDTO {
-    //商品ID
+    /**
+     * 商品ID
+     */
     private Integer goods_id;
-    //商品名称
+    /**
+     * 商品名称
+     */
     private String name;
-    //地址
+    /**
+     * 地址
+     */
     private String url;
-    //审核状态
+    /**
+     * 审核状态
+     */
     private Integer audit_status;
 }
diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/GoodsInfo.java b/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/GoodsInfo.java
index 78e299b7..0328ae28 100644
--- a/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/GoodsInfo.java
+++ b/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/GoodsInfo.java
@@ -8,9 +8,9 @@ import lombok.NoArgsConstructor;
 
 /**
  * 微信小程序直播商品DTO
+ *
  * @author Bulbasaur
  * @date: 2021/5/17 11:03 上午
- *
  */
 @Data
 @NoArgsConstructor
@@ -22,9 +22,11 @@ public class GoodsInfo {
     @ApiModelProperty(value = "商品名称")
     private String name;
 
-    //1：一口价（只需要传入price，price2不传）
-    //2：价格区间（price字段为左边界，price2字段为右边界，price和price2必传）
-    //3：显示折扣价（price字段为原价，price2字段为现价， price和price2必传
+    /**
+     * 1：一口价（只需要传入price，price2不传）
+     * 2：价格区间（price字段为左边界，price2字段为右边界，price和price2必传）
+     * 3：显示折扣价（price字段为原价，price2字段为现价， price和price2必传
+     */
     @ApiModelProperty(value = "价格类型")
     private Integer priceType;
 
@@ -37,7 +39,7 @@ public class GoodsInfo {
     @ApiModelProperty(value = "商品详情页的小程序路径")
     private String url;
 
-    public GoodsInfo(Commodity commodity){
+    public GoodsInfo(Commodity commodity) {
         BeanUtil.copyProperties(commodity, this);
     }
 }
diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/enums/StudioStatusEnum.java b/framework/src/main/java/cn/lili/modules/broadcast/entity/enums/StudioStatusEnum.java
index 8cdcbde9..3386c9e1 100644
--- a/framework/src/main/java/cn/lili/modules/broadcast/entity/enums/StudioStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/broadcast/entity/enums/StudioStatusEnum.java
@@ -3,13 +3,24 @@ package cn.lili.modules.broadcast.entity.enums;
 
 /**
  * 直播间状态
+ *
  * @author Bulbasaur
  * @date: 2021/5/31 10:32 上午
- *
  */
 public enum StudioStatusEnum {
 
-    NEW("新建"), START("开始"), END("结束");
+    /**
+     * 新建
+     */
+    NEW("新建"),
+    /**
+     * 开始
+     */
+    START("开始"),
+    /**
+     * 结束
+     */
+    END("结束");
 
     private final String clientName;
 
@@ -21,7 +32,4 @@ public enum StudioStatusEnum {
         return this.clientName;
     }
 
-    public String value() {
-        return this.name();
-    }
 }
diff --git a/framework/src/main/java/cn/lili/modules/broadcast/mapper/CommodityMapper.java b/framework/src/main/java/cn/lili/modules/broadcast/mapper/CommodityMapper.java
index 9420d175..285627e4 100644
--- a/framework/src/main/java/cn/lili/modules/broadcast/mapper/CommodityMapper.java
+++ b/framework/src/main/java/cn/lili/modules/broadcast/mapper/CommodityMapper.java
@@ -1,7 +1,6 @@
 package cn.lili.modules.broadcast.mapper;
 
 import cn.lili.modules.broadcast.entity.dos.Commodity;
-import cn.lili.modules.broadcast.entity.dto.SimpleCommodity;
 import cn.lili.modules.broadcast.entity.vos.CommodityVO;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -20,15 +19,39 @@ import java.util.List;
  */
 public interface CommodityMapper extends BaseMapper<Commodity> {
 
+    /**
+     * 获取直播商品ID列表
+     *
+     * @return 直播商品ID列表
+     */
     @Select("SELECT live_goods_id FROM li_commodity WHERE audit_status='0' or audit_status='1'")
     List<String> getAuditCommodity();
 
+    /**
+     * 获取直播间关联直播商品列表
+     *
+     * @param roomId 直播间ID
+     * @return 直播商品列表
+     */
     @Select("SELECT * FROM li_commodity c INNER JOIN li_studio_commodity sc ON sc.goods_id = c.live_goods_id WHERE sc.room_id =#{roomId}")
     List<Commodity> getCommodityByRoomId(Integer roomId);
 
+    /**
+     * 获取直播商品图片列表
+     *
+     * @param roomId 直播间ID
+     * @return 直播商品图片列表
+     */
     @Select("SELECT goods_image FROM li_commodity c INNER JOIN li_studio_commodity sc ON sc.goods_id = c.live_goods_id WHERE sc.room_id =#{roomId}")
     List<String> getSimpleCommodityByRoomId(Integer roomId);
 
+    /**
+     * 获取直播商品VO分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 直播商品VO分页
+     */
     @Select("SELECT c.*,gs.quantity,s.store_name FROM li_commodity c INNER JOIN li_goods_sku gs ON c.sku_id = gs.id INNER JOIN li_store s ON s.id=c.store_id ${ew.customSqlSegment}")
     IPage<CommodityVO> commodityVOList(IPage<CommodityVO> page, @Param(Constants.WRAPPER) Wrapper<CommodityVO> queryWrapper);
 
diff --git a/framework/src/main/java/cn/lili/modules/broadcast/service/CommodityService.java b/framework/src/main/java/cn/lili/modules/broadcast/service/CommodityService.java
index c9161c7b..ae6cb592 100644
--- a/framework/src/main/java/cn/lili/modules/broadcast/service/CommodityService.java
+++ b/framework/src/main/java/cn/lili/modules/broadcast/service/CommodityService.java
@@ -18,6 +18,7 @@ public interface CommodityService extends IService<Commodity> {
 
     /**
      * 添加直播商品
+     * @param commodity 直播商品列表
      * @return 添加结果
      */
     boolean addCommodity(List<Commodity> commodity);
diff --git a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/CommodityServiceImpl.java b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/CommodityServiceImpl.java
index 65608071..9a277950 100644
--- a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/CommodityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/CommodityServiceImpl.java
@@ -50,9 +50,9 @@ public class CommodityServiceImpl extends ServiceImpl<CommodityMapper, Commodity
             checkCommodity(commodity);
             //添加直播商品
             JSONObject json = wechatLivePlayerUtil.addGoods(commodity);
-            if(!json.getStr("errcode").equals("0")){
+            if(!"0".equals(json.getStr("errcode"))){
                 log.error(json.getStr("errmsg"));
-                 throw new ServiceException(ResultCode.COMMODITY_ERROR);
+                throw new ServiceException(ResultCode.COMMODITY_ERROR);
             }
             commodity.setLiveGoodsId(Convert.toInt(json.getStr("goodsId")));
             commodity.setAuditId(json.getStr("auditId"));
@@ -79,7 +79,7 @@ public class CommodityServiceImpl extends ServiceImpl<CommodityMapper, Commodity
     @Override
     public boolean deleteCommodity(String goodsId) {
         JSONObject json = wechatLivePlayerUtil.deleteGoods(goodsId);
-        if (json.getStr("errcode").equals("0")) {
+        if ("0".equals(json.getStr("errcode"))) {
             return this.remove(new LambdaQueryWrapper<Commodity>().eq(Commodity::getLiveGoodsId, goodsId));
         }
         return false;
diff --git a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java
index 2b71cee5..0cbc71e0 100644
--- a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java
@@ -52,10 +52,8 @@ public class StudioServiceImpl extends ServiceImpl<StudioMapper, Studio> impleme
     private StudioCommodityService studioCommodityService;
     @Resource
     private CommodityMapper commodityMapper;
-    //延时任务
     @Autowired
     private TimeTrigger timeTrigger;
-    //Rocketmq
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
 
diff --git a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java b/framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java
index 6acc1ef9..6253615d 100644
--- a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java
+++ b/framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java
@@ -43,7 +43,7 @@ public class WechatLivePlayerUtil {
         //添加直播间
         Map<String, String> map = this.mockRoom(studio);
         JSONObject json = this.doPostWithJson(url, map);
-        Map<String, String> roomMap = new HashMap<>();
+        Map<String, String> roomMap = new HashMap<>(2);
         roomMap.put("roomId", json.getStr("roomId"));
         roomMap.put("qrcodeUrl", json.getStr("qrcode_url"));
         return roomMap;
@@ -76,7 +76,7 @@ public class WechatLivePlayerUtil {
     public String getLiveInfo(Integer roomId) {
         //发送url
         String url = "https://api.weixin.qq.com/wxa/business/getliveinfo?access_token=";
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(16);
         //获取回放
         map.put("action", "get_replay");
         //直播间ID
@@ -100,7 +100,7 @@ public class WechatLivePlayerUtil {
     public Boolean pushGoods(Integer roomId, Integer goodsId) {
         //发送url
         String url = "https://api.weixin.qq.com/wxaapi/broadcast/room/addgoods?access_token=";
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(16);
         //直播间回放
         Integer[] ids = {goodsId};
         map.put("ids", ids);
@@ -120,7 +120,7 @@ public class WechatLivePlayerUtil {
     public Boolean goodsDeleteInRoom(Integer roomId, Integer goodsId) {
         //发送url
         String url = "https://api.weixin.qq.com/wxaapi/broadcast/goods/deleteInRoom?access_token=";
-        Map<String, Integer> map = new HashMap<>();
+        Map<String, Integer> map = new HashMap<>(2);
         //直播间回放
         map.put("goodsId", goodsId);
         //商品ID
@@ -149,7 +149,7 @@ public class WechatLivePlayerUtil {
         GoodsInfo goodsInfo = new GoodsInfo(commodity);
         //上传微信临时图片
         goodsInfo.setCoverImgUrl(wechatMediaUtil.uploadMedia("image", commodity.getGoodsImage()));
-        Map<String, GoodsInfo> map = new HashMap<>();
+        Map<String, GoodsInfo> map = new HashMap<>(2);
         //调用新增直播商品接口
         map.put("goodsInfo", goodsInfo);
         return this.doPostWithJson(url, map);
@@ -164,7 +164,7 @@ public class WechatLivePlayerUtil {
     public JSONObject deleteGoods(String goodsId) {
         //发送url
         String url = "https://api.weixin.qq.com/wxaapi/broadcast/goods/delete?access_token=";
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(2);
         map.put("goodsId", goodsId);
         return this.doPostWithJson(url, map);
     }
@@ -178,7 +178,7 @@ public class WechatLivePlayerUtil {
     public JSONObject getGoodsWareHouse(List<String> goodsIdList) {
         //发送url
         String url = "https://api.weixin.qq.com/wxa/business/getgoodswarehouse?access_token=";
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(2);
         map.put("goods_ids", goodsIdList);
         return this.doPostWithJson(url, map);
     }
@@ -201,9 +201,9 @@ public class WechatLivePlayerUtil {
         log.info("微信小程序请求结果：" + content);
         //获取请求内容，如果token过期则重新获取，如果出错则抛出错误
         JSONObject jsonObject = new JSONObject(content);
-        if (jsonObject.get("errcode").toString().equals("0")) {
+        if (("0").equals(jsonObject.get("errcode").toString())) {
             return jsonObject;
-        } else if (jsonObject.get("errcode").equals("40001")) {
+        } else if (("40001").equals(jsonObject.get("errcode"))) {
             wechatAccessTokenUtil.removeAccessToken(ClientTypeEnum.WECHAT_MP);
             return this.doPostWithJson(url, map);
         } else {
@@ -212,7 +212,7 @@ public class WechatLivePlayerUtil {
     }
 
     private Map<String, String> mockRoom(Studio studio) {
-        Map<String, String> map = new HashMap<>();
+        Map<String, String> map = new HashMap<>(16);
         //背景图
         map.put("coverImg", wechatMediaUtil.uploadMedia("image", studio.getCoverImg()));
         //分享图
diff --git a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java b/framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java
index eb885cb1..bce45f9b 100644
--- a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java
+++ b/framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java
@@ -1,6 +1,7 @@
 package cn.lili.modules.broadcast.util;
 
 import cn.hutool.json.JSONObject;
+import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.base.entity.enums.ClientTypeEnum;
 import cn.lili.modules.message.util.WechatAccessTokenUtil;
@@ -11,7 +12,6 @@ import org.springframework.stereotype.Component;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.Date;
 
 /**
  * 微信媒体工具
@@ -78,7 +78,7 @@ public class WechatMediaUtil {
             //使用outputStream流输出信息到请求体当中去
             out.write(("--" + boundary + "\r\n").getBytes());
             out.write(("Content-Disposition: form-data; name=\"media\";\r\n"
-                    + "filename=\"" + (new Date().getTime()) + fileExt + "\"\r\n"
+                    + "filename=\"" + (System.currentTimeMillis()) + fileExt + "\"\r\n"
                     + "Content-Type: " + contentType + "\r\n\r\n").getBytes());
             while ((size = bufferedIn.read(bytes)) != -1) {
                 out.write(bytes, 0, size);
@@ -108,7 +108,7 @@ public class WechatMediaUtil {
         JSONObject jsonObject = new JSONObject(resultStr.toString());
         log.info("微信媒体上传:" + jsonObject.toString());
         //判断是否传递成功，如果token过期则重新获取
-        if (jsonObject.get("errcode") != null && jsonObject.get("errcode").equals("40001")) {
+        if (jsonObject.get("errcode") != null && ("40001").equals(jsonObject.get("errcode"))) {
             wechatAccessTokenUtil.removeAccessToken(ClientTypeEnum.WECHAT_MP);
             return this.uploadMedia(type, mediaFileUrl);
         } else if (jsonObject.get("errcode") != null) {
@@ -137,6 +137,8 @@ public class WechatMediaUtil {
             case "image/jpg":
                 fileExt = ".jpg";
                 break;
+            default:
+                throw new ServiceException(ResultCode.IMAGE_FILE_EXT_ERROR);
         }
         return fileExt;
     }
diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthCallback.java b/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthCallback.java
index 1fb29699..f00ec12a 100644
--- a/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthCallback.java
+++ b/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthCallback.java
@@ -27,7 +27,7 @@ public class AuthCallback implements Serializable {
     /**
      * 访问AuthorizeUrl后回调时带的参数auth_code，该参数目前只使用于支付宝登录
      */
-    private String auth_code;
+    private String authCode;
 
     /**
      * 访问AuthorizeUrl后回调时带的参数state，用于和请求AuthorizeUrl前的state比较，防止CSRF攻击
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 cd136c92..0581745d 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
@@ -23,20 +23,36 @@ public class AuthToken implements Serializable {
 
     private static final long serialVersionUID = -2701476618576443366L;
 
-    //第三方token
+    /**
+     * 第三方token
+     */
     private String accessToken;
-    //第三方刷新token
+    /**
+     * 第三方刷新token
+     */
     private String refreshToken;
-    //有效时间
+    /**
+     * 有效时间
+     */
     private int expireIn;
-    //会员id
+    /**
+     * 会员id
+     */
     private String uid;
-    //联合登录id
+    /**
+     * 联合登录id
+     */
     private String unionId;
-    //联合登录openid
+    /**
+     * 联合登录openid
+     */
     private String openId;
-    //请求码
+    /**
+     * 请求码
+     */
     private String accessCode;
-
+    /**
+     * 范围
+     */
     private String scope;
 }
diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/enums/AuthUserGender.java b/framework/src/main/java/cn/lili/modules/connect/entity/enums/AuthUserGender.java
index cd9a21bb..bd1dd767 100644
--- a/framework/src/main/java/cn/lili/modules/connect/entity/enums/AuthUserGender.java
+++ b/framework/src/main/java/cn/lili/modules/connect/entity/enums/AuthUserGender.java
@@ -51,7 +51,8 @@ public enum AuthUserGender {
      * @since 1.13.2
      */
     public static AuthUserGender getWechatRealGender(String originalGender) {
-        if (StringUtils.isEmpty(originalGender) || "0".equals(originalGender)) {
+        String noGender="0";
+        if (StringUtils.isEmpty(originalGender) || noGender.equals(originalGender)) {
             return AuthUserGender.UNKNOWN;
         }
         return getRealGender(originalGender);
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 66dad6af..51b12411 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
@@ -14,7 +14,8 @@ public enum ConnectEnum {
      */
     QQ("QQ登录"),
     WEIBO("微博联合登录"),
-    WECHAT("微信联合登录"),//只存放unionid
+    WECHAT("微信联合登录"),
+    //只存放unionid
     WECHAT_OPEN_ID("微信openid登录"),
     WECHAT_MP_OPEN_ID("微信openid登录"),
     ALIPAY("支付宝登录"),
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 89bb41d3..53dd69af 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
@@ -44,7 +44,7 @@ public class AuthAlipayRequest extends AuthDefaultRequest {
     protected AuthToken getAccessToken(AuthCallback authCallback) {
         AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest();
         request.setGrantType("authorization_code");
-        request.setCode(authCallback.getAuth_code());
+        request.setCode(authCallback.getAuthCode());
         AlipaySystemOauthTokenResponse response = null;
         try {
             response = this.alipayClient.execute(request);
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 8d3edb33..22b3fdad 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
@@ -71,10 +71,6 @@ public abstract class AuthDefaultRequest implements AuthRequest {
     public AuthResponse login(AuthCallback authCallback) {
         try {
             AuthChecker.checkCode(source, authCallback);
-//           if (!config.isIgnoreCheckState()) {
-//               AuthChecker.checkState(authCallback.getState(), source, cache);
-//           }
-
             AuthToken authToken = this.getAccessToken(authCallback);
             ConnectAuthUser user = this.getUserInfo(authToken);
             return AuthResponse.builder().code(AuthResponseStatus.SUCCESS.getCode()).data(user).build();
diff --git a/framework/src/main/java/cn/lili/modules/connect/service/ConnectConfigService.java b/framework/src/main/java/cn/lili/modules/connect/service/ConnectConfigService.java
index ade0b4f2..2ba02d37 100644
--- a/framework/src/main/java/cn/lili/modules/connect/service/ConnectConfigService.java
+++ b/framework/src/main/java/cn/lili/modules/connect/service/ConnectConfigService.java
@@ -23,14 +23,16 @@ public interface ConnectConfigService extends IService<ConnectConfig> {
     /**
      * 获取配置详情
      *
-     * @return
+     * @param key 配置关键字
+     * @return 配置参数
      */
     ConnectConfig getConfig(String key);
 
     /**
-     * 获取配置详情
+     * 保存配置
      *
-     * @return
+     * @param connectConfig 联合登录配置
+     * @return 联合登录配置
      */
     ConnectConfig saveConfig(ConnectConfig connectConfig);
 }
\ No newline at end of file
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 a115c150..61e7487d 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
@@ -30,11 +30,14 @@ public interface ConnectService extends IService<Connect> {
     /**
      * 联合登陆
      *
-     * @param type
-     * @param unionid
-     * @return
+     * @param type     类型
+     * @param unionid  unionid
+     * @param longTerm 是否长时间有效
+     * @param uuid     UUID
+     * @return token
+     * @throws NoPermissionException 不允许操作
      */
-    Token unionLoginCallback(String type, String unionid, String uuid,boolean longTerm) throws NoPermissionException;
+    Token unionLoginCallback(String type, String unionid, String uuid, boolean longTerm) throws NoPermissionException;
 
     /**
      * 联合登陆对象直接登录
@@ -42,6 +45,7 @@ public interface ConnectService extends IService<Connect> {
      * @param type     第三方登录类型
      * @param authUser 第三方登录返回封装类
      * @param uuid     用户uuid
+     * @return token
      */
     Token unionLoginCallback(String type, ConnectAuthUser authUser, String uuid);
 
@@ -86,7 +90,7 @@ public interface ConnectService extends IService<Connect> {
      *
      * @param authUser 登录对象
      * @param uuid     uuid
-     * @return
+     * @return token
      */
     Token appLoginCallback(ConnectAuthUser authUser, String uuid);
 
@@ -95,7 +99,8 @@ public interface ConnectService extends IService<Connect> {
      * 微信一键登录
      * 小程序自动登录 没有账户自动注册
      *
-     * @return
+     * @param params 微信小程序登录参数
+     * @return token
      */
     Token miniProgramAutoLogin(WechatMPLoginParams params);
 }
\ No newline at end of file
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 92d18e9d..838cbe90 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
@@ -66,7 +66,7 @@ public class AuthChecker {
     public static void checkCode(ConnectAuth connectAuth, AuthCallback callback) {
         String code = callback.getCode();
         if (connectAuth == ConnectAuthEnum.ALIPAY) {
-            code = callback.getAuth_code();
+            code = callback.getAuthCode();
         }
         if (StringUtils.isEmpty(code)) {
             throw new AuthException(AuthResponseStatus.ILLEGAL_CODE, connectAuth);
diff --git a/framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java b/framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java
index 28f9da6d..e2854775 100644
--- a/framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java
+++ b/framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java
@@ -19,28 +19,28 @@ public class Base64Utils {
     /**
      * 标准编码表
      */
-    private static final byte[] STANDARD_ENCODE_TABLE = { //
-            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', //
-            'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', //
-            'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', //
-            'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', //
-            'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', //
-            'o', 'p', 'q', 'r', 's', 't', 'u', 'v', //
-            'w', 'x', 'y', 'z', '0', '1', '2', '3', //
-            '4', '5', '6', '7', '8', '9', '+', '/' //
+    private static final byte[] STANDARD_ENCODE_TABLE = {
+            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+            'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+            'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+            'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+            'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+            'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+            'w', 'x', 'y', 'z', '0', '1', '2', '3',
+            '4', '5', '6', '7', '8', '9', '+', '/'
     };
     /**
      * URL安全的编码表，将 + 和 / 替换为 - 和 _
      */
-    private static final byte[] URL_SAFE_ENCODE_TABLE = { //
-            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', //
-            'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', //
-            'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', //
-            'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', //
-            'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', //
-            'o', 'p', 'q', 'r', 's', 't', 'u', 'v', //
-            'w', 'x', 'y', 'z', '0', '1', '2', '3', //
-            '4', '5', '6', '7', '8', '9', '-', '_' //
+    private static final byte[] URL_SAFE_ENCODE_TABLE = {
+            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+            'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+            'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+            'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+            'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+            'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+            'w', 'x', 'y', 'z', '0', '1', '2', '3',
+            '4', '5', '6', '7', '8', '9', '-', '_'
     };
 
     //-------------------------------------------------------------------- encode
@@ -174,7 +174,8 @@ public class Base64Utils {
             }
         }
 
-        int left = len - evenlen;//剩余位数
+        //剩余位数
+        int left = len - evenlen;
         if (left > 0) {
             int i = ((arr[evenlen] & 0xff) << 10) | (left == 2 ? ((arr[len - 1] & 0xff) << 2) : 0);
 
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 4dd3c02d..f149e30b 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
@@ -64,7 +64,11 @@ public class ConnectUtil {
 
     static String prefix = "/buyer/connect/callback/";
 
-    //回调地址获取
+    /**
+     * 回调地址获取
+     * @param connectAuthEnum 用户枚举
+     * @return 回调地址
+     */
     String getRedirectUri(ConnectAuthEnum connectAuthEnum) {
         return apiProperties.getBuyer() + prefix + connectAuthEnum.getName();
     }
@@ -191,39 +195,6 @@ public class ConnectUtil {
                 }
 
                 break;
-//           case ALIPAY:
-//               //支付宝在创建回调地址时，不允许使用localhost或者127.0.0.1，所以这儿的回调地址使用的局域网内的ip
-//               authRequest = new AuthAlipayRequest(AuthConfig.builder()
-//                       .clientId("")
-//                       .clientSecret("")
-//                       .alipayPublicKey("")
-//                       .redirectUri(getRedirectUri(authInterface))
-//                       .build(), cache);
-//               break;
-//           case WEIBO:
-//               List<String> scopes = new ArrayList<>();
-//               scopes.add("all");
-//               authRequest = new AuthWeiboRequest(AuthConfig.builder()
-//                       .clientId("")
-//                       .clientSecret("")
-//                       .redirectUri(getRedirectUri(authInterface))
-//                       .scopes(scopes)
-//                       .build(), cache);
-//               break;
-//           case "wechat_open":
-//               authRequest = new AuthWeChatOpenRequest(AuthConfig.builder()
-//                       .clientId("")
-//                       .clientSecret("")
-//                       .redirectUri("https://z171l91606.51mypc.cn/callback/wechat")
-//                       .build());
-//               break;
-//           case "wechat_mp":
-//               authRequest = new AuthWeChatMpRequest(AuthConfig.builder()
-//                       .clientId("")
-//                       .clientSecret("")
-//                       .redirectUri("")
-//                       .build());
-//               break;
             default:
                 break;
         }
@@ -233,9 +204,11 @@ public class ConnectUtil {
         return authRequest;
     }
 
-    //\b 是单词边界(连着的两个(字母字符 与 非字母字符) 之间的逻辑上的间隔),
-    //字符串在编译时会被转码一次,所以是 "\\b"
-    //\B 是单词内部逻辑间隔(连着的两个字母字符之间的逻辑上的间隔)
+    /**
+     * \b 是单词边界(连着的两个(字母字符 与 非字母字符) 之间的逻辑上的间隔),
+     * 字符串在编译时会被转码一次,所以是 "\\b"
+     * \B 是单词内部逻辑间隔(连着的两个字母字符之间的逻辑上的间隔)
+     */
     static String phoneReg = "\\b(ip(hone|od)|android|opera m(ob|in)i"
             + "|windows (phone|ce)|blackberry"
             + "|s(ymbian|eries60|amsung)|p(laybook|alm|rofile/midp"
@@ -244,7 +217,9 @@ public class ConnectUtil {
     static String tableReg = "\\b(ipad|tablet|(Nexus 7)|up.browser"
             + "|[1-4][0-9]{2}x[1-4][0-9]{2})\\b";
 
-    //移动设备正则匹配：手机端、平板
+    /**
+     * 移动设备正则匹配：手机端、平板
+     */
     static Pattern phonePat = Pattern.compile(phoneReg, Pattern.CASE_INSENSITIVE);
     static Pattern tablePat = Pattern.compile(tableReg, Pattern.CASE_INSENSITIVE);
 
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 c967db20..5e823d9e 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
@@ -107,7 +107,7 @@ public class DistributionGoods {
         this.specs = "";
         JSONObject jsonObject = JSONUtil.parseObj(goodsSku.getSpecs());
         for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
-            if (!entry.getKey().equals("images")) {
+            if (!"images".equals(entry.getKey())) {
                 this.specs = this.specs + entry.getKey() + ":" + entry.getValue() + " ";
             }
         }
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 57e6d1a5..2ee3d579 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
@@ -17,12 +17,35 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface DistributionGoodsMapper extends BaseMapper<DistributionGoods> {
 
+    /**
+     * 获取分销员未选择商品VO分页
+     *
+     * @param page           分页
+     * @param queryWrapper   查询条件
+     * @param distributionId 分销员ID
+     * @return 分销员未选择商品VO分页
+     */
     @Select("SELECT dg.* FROM li_distribution_goods dg WHERE dg.id NOT IN(SELECT distribution_goods_id FROM li_distribution_selected_goods WHERE distribution_id=${distributionId}) ${ew.customSqlSegment}")
     IPage<DistributionGoodsVO> notSelectGoods(IPage<DistributionGoodsVO> page, @Param(Constants.WRAPPER) Wrapper<DistributionGoodsVO> queryWrapper, String distributionId);
 
+    /**
+     * 获取分销员已选择分销商品VO分页
+     *
+     * @param page           分页
+     * @param queryWrapper   查询条件
+     * @param distributionId 分销员ID
+     * @return 分销员已选择分销商品VO分页
+     */
     @Select("SELECT dg.* FROM li_distribution_goods dg WHERE dg.id IN(SELECT distribution_goods_id FROM li_distribution_selected_goods WHERE distribution_id=${distributionId}) ${ew.customSqlSegment}")
     IPage<DistributionGoodsVO> selectGoods(IPage<DistributionGoodsVO> page, @Param(Constants.WRAPPER) Wrapper<DistributionGoodsVO> queryWrapper, String distributionId);
 
+    /**
+     * 获取分销商品VO分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 分销商品VO分页
+     */
     @Select("SELECT dg.* FROM li_distribution_goods dg LEFT JOIN li_distribution_selected_goods dsg ON dg.id = dsg.distribution_goods_id ${ew.customSqlSegment}")
     IPage<DistributionGoodsVO> getDistributionGoodsVO(IPage<DistributionGoodsVO> page, @Param(Constants.WRAPPER) Wrapper<DistributionGoodsVO> queryWrapper);
 
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 cd32c80b..56d49e27 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
@@ -13,9 +13,21 @@ import org.apache.ibatis.annotations.Update;
  */
 public interface DistributionMapper extends BaseMapper<Distribution> {
 
+    /**
+     * 修改分销员可提现金额
+     *
+     * @param canRebate      提现金额
+     * @param distributionId 分销员ID
+     */
     @Update("UPDATE li_distribution set can_rebate = can_rebate+#{canRebate} WHERE id = #{distributionId}")
-    void subCanRebate(Double canRebate,String distributionId);
+    void subCanRebate(Double canRebate, String distributionId);
 
+    /**
+     * 添加可提现金额
+     *
+     * @param canRebate      提现金额
+     * @param distributionId 分销员ID
+     */
     @Update("UPDATE li_distribution set can_rebate = (can_rebate+#{canRebate}) , rebate_total=(rebate_total+#{canRebate}) , distribution_order_count=(distribution_order_count+1) WHERE id = #{distributionId}")
-    void addCanRebate(Double canRebate,String distributionId);
+    void addCanRebate(Double canRebate, String distributionId);
 }
\ No newline at end of file
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 b5997871..973c7041 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
@@ -14,7 +14,10 @@ import org.apache.ibatis.annotations.Update;
 public interface DistributionOrderMapper extends BaseMapper<DistributionOrder> {
 
     /**
-     * 分销提佣
+     * 修改分销员提现金额
+     *
+     * @param distributionOrderStatus 分销订单状态
+     * @param settleCycle             时间
      */
     @Update("UPDATE li_distribution AS d " +
             "SET d.can_rebate =(d.can_rebate +(SELECT SUM( dorder.rebate ) FROM li_distribution_order AS dorder WHERE dorder.distribution_id = d.id AND dorder.distribution_order_status=#{distributionOrderStatus} AND dorder.settle_cycle< #{settleCycle} ))")
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 f7011a7d..fad9793f 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
@@ -19,14 +19,16 @@ public interface DistributionCashService extends IService<DistributionCash> {
     /**
      * 提交分销提现申请
      *
-     * @param applyMoney
+     * @param applyMoney 申请金额
+     * @return 操作状态
      */
     Boolean cash(Double applyMoney);
 
     /**
      * 获取当前会员的分销提现分页列表
      *
-     * @return
+     * @param page 分页
+     * @return 申请提现分页
      */
     IPage<DistributionCash> getDistributionCash(PageVO page);
 
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 cbb91aa9..c1d8c4e3 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
@@ -35,7 +35,8 @@ public interface DistributionService extends IService<Distribution> {
     /**
      * 提交分销申请
      *
-     * @return
+     * @param distributionApplyDTO 分销申请DTO
+     * @return 分销员
      */
     Distribution applyDistribution(DistributionApplyDTO distributionApplyDTO);
 
@@ -67,7 +68,7 @@ public interface DistributionService extends IService<Distribution> {
     /**
      * 绑定会员的分销员关系
      *
-     * @return
+     * @param distributionId 分销员ID
      */
     void bindingDistribution(String distributionId);
 
@@ -78,14 +79,17 @@ public interface DistributionService extends IService<Distribution> {
 
     /**
      * 修改可提现金额
-     * @param canRebate 修改金额
+     *
+     * @param canRebate      修改金额
      * @param distributionId 分销员ID
      */
-    void subCanRebate(Double canRebate,String distributionId);
+    void subCanRebate(Double canRebate, String distributionId);
 
     /**
      * 添加分销金额
-     * @param rebate
+     *
+     * @param rebate         金额
+     * @param distributionId 分销员ID
      */
-    void addRebate(Double rebate,String distributionId);
+    void addRebate(Double rebate, String distributionId);
 }
\ No newline at end of file
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 fa94e0ad..7a0bef76 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
@@ -4,7 +4,6 @@ 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.common.rocketmq.tags.OtherTagsEnum;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.utils.SnowFlake;
@@ -26,7 +25,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,12 +40,16 @@ import java.util.Date;
  * @date 2020-03-126 18:04:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMapper, DistributionCash> implements DistributionCashService {
-    //分销员
+    /**
+     * 分销员
+     */
     @Autowired
     private DistributionService distributionService;
-    //会员余额
+    /**
+     * 会员余额
+     */
     @Autowired
     private MemberWalletService memberWalletService;
     @Autowired
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 8ca801d8..73ddee8c 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
@@ -31,13 +31,17 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020-03-24 23:04:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class DistributionGoodsServiceImpl extends ServiceImpl<DistributionGoodsMapper, DistributionGoods> implements DistributionGoodsService {
 
-    //分销员
+    /**
+     * 分销员
+     */
     @Autowired
     private DistributionService distributionService;
-    //规格商品
+    /**
+     * 规格商品
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
 
@@ -71,7 +75,7 @@ public class DistributionGoodsServiceImpl extends ServiceImpl<DistributionGoodsM
 
     @Override
     public DistributionGoods distributionGoodsVOBySkuId(String skuId) {
-        return this.getOne(new LambdaUpdateWrapper<DistributionGoods>().eq(DistributionGoods::getSkuId,skuId));
+        return this.getOne(new LambdaUpdateWrapper<DistributionGoods>().eq(DistributionGoods::getSkuId, skuId));
     }
 
     @Override
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 e30bedb0..7837e10c 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
@@ -39,19 +39,27 @@ import java.util.List;
  * @date 2020-03-14 23:04:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class DistributionOrderServiceImpl extends ServiceImpl<DistributionOrderMapper, DistributionOrder> implements DistributionOrderService {
 
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
-    //店铺流水
+    /**
+     * 店铺流水
+     */
     @Autowired
     private StoreFlowService storeFlowService;
-    //分销员
+    /**
+     * 分销员
+     */
     @Autowired
     private DistributionService distributionService;
-    //系统设置
+    /**
+     * 系统设置
+     */
     @Autowired
     private SettingService settingService;
 
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 12f97949..1c2f0f59 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
@@ -6,7 +6,6 @@ import cn.lili.modules.distribution.service.DistributionSelectedGoodsService;
 import cn.lili.modules.distribution.service.DistributionService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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;
@@ -18,19 +17,22 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020-03-24 23:04:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class DistributionSelectedGoodsServiceImpl extends ServiceImpl<DistributionSelectedGoodsMapper, DistributionSelectedGoods> implements DistributionSelectedGoodsService {
 
-    //分销员
+    /**
+     * 分销员
+     */
     @Autowired
     private DistributionService distributionService;
+
     @Override
     public boolean add(String distributionGoodsId) {
         //检查分销功能开关
         distributionService.checkDistributionSetting();
 
-        String distributionId=distributionService.getDistribution().getId();
-        DistributionSelectedGoods distributionSelectedGoods=new DistributionSelectedGoods(distributionId,distributionGoodsId);
+        String distributionId = distributionService.getDistribution().getId();
+        DistributionSelectedGoods distributionSelectedGoods = new DistributionSelectedGoods(distributionId, distributionGoodsId);
         return this.save(distributionSelectedGoods);
     }
 
@@ -39,9 +41,9 @@ public class DistributionSelectedGoodsServiceImpl extends ServiceImpl<Distributi
         //检查分销功能开关
         distributionService.checkDistributionSetting();
 
-        String distributionId=distributionService.getDistribution().getId();
+        String distributionId = distributionService.getDistribution().getId();
         return this.remove(new LambdaQueryWrapper<DistributionSelectedGoods>()
-                .eq(DistributionSelectedGoods::getDistributionGoodsId,distributionGoodsId)
-        .eq(DistributionSelectedGoods::getDistributionId,distributionId));
+                .eq(DistributionSelectedGoods::getDistributionGoodsId, distributionGoodsId)
+                .eq(DistributionSelectedGoods::getDistributionId, distributionId));
     }
 }
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 f3c329ee..7a255e05 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
@@ -38,18 +38,22 @@ import java.util.concurrent.TimeUnit;
  * @date 2020-03-14 23:04:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class DistributionServiceImpl extends ServiceImpl<DistributionMapper, Distribution> implements DistributionService {
 
-    //会员
+    /**
+     * 会员
+     */
     @Autowired
     private MemberService memberService;
-
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache cache;
-
-    //设置
+    /**
+     * 设置
+     */
     @Autowired
     private SettingService settingService;
 
@@ -72,15 +76,15 @@ public class DistributionServiceImpl extends ServiceImpl<DistributionMapper, Dis
         checkDistributionSetting();
 
         //判断用户是否申请过分销
-        Distribution distribution=getDistribution();
+        Distribution distribution = getDistribution();
 
         //如果分销员非空并未审核则提示用户请等待，如果分销员为拒绝状态则重新提交申请
-        if(Optional.ofNullable(distribution).isPresent()){
-            if(distribution.getDistributionStatus().equals(DistributionStatusEnum.APPLY.name())){
+        if (Optional.ofNullable(distribution).isPresent()) {
+            if (distribution.getDistributionStatus().equals(DistributionStatusEnum.APPLY.name())) {
                 throw new ServiceException(ResultCode.DISTRIBUTION_IS_APPLY);
-            }else if(distribution.getDistributionStatus().equals(DistributionStatusEnum.REFUSE.name())){
+            } else if (distribution.getDistributionStatus().equals(DistributionStatusEnum.REFUSE.name())) {
                 distribution.setDistributionStatus(DistributionStatusEnum.APPLY.name());
-                BeanUtil.copyProperties(distributionApplyDTO,distribution);
+                BeanUtil.copyProperties(distributionApplyDTO, distribution);
                 this.updateById(distribution);
                 return distribution;
             }
@@ -149,16 +153,15 @@ public class DistributionServiceImpl extends ServiceImpl<DistributionMapper, Dis
     public void bindingDistribution(String distributionId) {
 
         //判断用户是否登录，未登录不能进行绑定
-        if(UserContext.getCurrentUser()==null){
+        if (UserContext.getCurrentUser() == null) {
             throw new ServiceException(ResultCode.USER_NOT_LOGIN);
         }
-        //储存分销关系为3天
+        //储存分销关系时间
         Distribution distribution = this.getById(distributionId);
-        if (distribution!=null) {
+        if (distribution != null) {
             Setting setting = settingService.get(SettingEnum.DISTRIBUTION_SETTING.name());
             DistributionSetting distributionSetting = JSONUtil.toBean(setting.getSettingValue(), DistributionSetting.class);
-            //cache.put(CachePrefix.DISTRIBUTION.getPrefix() + "_" + UserContext.getCurrentUser().getId(), distribution.getId(), distributionSetting.getDistributionDay().longValue(), TimeUnit.DAYS);
-            cache.put(CachePrefix.DISTRIBUTION.getPrefix() + "_" + UserContext.getCurrentUser().getId(), distribution.getId(), 3L, TimeUnit.DAYS);
+            cache.put(CachePrefix.DISTRIBUTION.getPrefix() + "_" + UserContext.getCurrentUser().getId(), distribution.getId(), distributionSetting.getDistributionDay().longValue(), TimeUnit.DAYS);
         }
 
     }
@@ -167,23 +170,23 @@ public class DistributionServiceImpl extends ServiceImpl<DistributionMapper, Dis
      * 检查分销设置开关
      */
     @Override
-    public void checkDistributionSetting(){
+    public void checkDistributionSetting() {
         //获取分销是否开启
         Setting setting = settingService.get(SettingEnum.DISTRIBUTION_SETTING.name());
         DistributionSetting distributionSetting = JSONUtil.toBean(setting.getSettingValue(), DistributionSetting.class);
-        if(!distributionSetting.getIsOpen()){
+        if (!distributionSetting.getIsOpen()) {
             throw new ServiceException(ResultCode.DISTRIBUTION_CLOSE);
         }
     }
 
     @Override
     public void subCanRebate(Double canRebate, String distributionId) {
-        this.baseMapper.subCanRebate(canRebate,distributionId);
+        this.baseMapper.subCanRebate(canRebate, distributionId);
     }
 
     @Override
     public void addRebate(Double rebate, String distributionId) {
-        this.baseMapper.addCanRebate(rebate,distributionId);
+        this.baseMapper.addCanRebate(rebate, distributionId);
     }
 
 }
\ No newline at end of file
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 a189b8f2..763780e6 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
@@ -46,7 +46,7 @@ public class AliFileManagerPlugin implements FileManagerPlugin {
     /**
      * 暂时设定3分账请求一次设置
      */
-    private static final Long interval = 60 * 3 * 1000L;
+    private static final Long INTERVAL = 60 * 3 * 1000L;
 
     /**
      * 静态设置，最快三分钟更新一次
@@ -79,7 +79,7 @@ public class AliFileManagerPlugin implements FileManagerPlugin {
             if (setting == null || StrUtil.isBlank(setting.getSettingValue())) {
                 throw new ServiceException(ResultCode.OSS_NOT_EXIST);
             }
-            nextInitSetting = System.currentTimeMillis() + interval;
+            nextInitSetting = System.currentTimeMillis() + INTERVAL;
             ossSetting = new Gson().fromJson(setting.getSettingValue(), OssSetting.class);
             return ossSetting;
         }
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 7668510e..de729174 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
@@ -29,7 +29,8 @@ public interface FileService extends IService<File> {
     /**
      * 所有者批量删除
      *
-     * @param ids
+     * @param ids      ID
+     * @param authUser 操作者
      */
     void batchDelete(List<String> ids, AuthUser authUser);
 
@@ -50,6 +51,7 @@ public interface FileService extends IService<File> {
      * @param file
      * @param searchVO
      * @param pageVo
+     * @param ownerDTO
      * @return
      */
     IPage<File> customerPageOwner(FileOwnerDTO ownerDTO, File file, SearchVO searchVO, PageVO pageVo);
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 0c175697..52931040 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
@@ -29,7 +29,7 @@ import java.util.List;
  * @date 2020/11/26 17:50
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class FileServiceImpl extends ServiceImpl<FileMapper, File> implements FileService {
 
     @Autowired
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 3decd397..3a646a86 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
@@ -76,10 +76,10 @@ public class GoodsOperationDTO implements Serializable {
     private Integer quantity;
 
     @ApiModelProperty(value = "是否立即发布")
-    private boolean release;
+    private Boolean release;
 
     @ApiModelProperty(value = "是否是推荐商品")
-    private boolean recommend;
+    private Boolean recommend;
 
     @ApiModelProperty(value = "商品参数")
     private List<GoodsParamsDTO> goodsParamsDTOList;
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 d4e0ae8b..e957c8bf 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
@@ -8,8 +8,13 @@ package cn.lili.modules.goods.entity.enums;
  **/
 public enum DraftGoodsSaveType {
 
+    /**
+     * "草稿"
+     */
     DRAFT("草稿"),
-
+    /**
+     * "模版"
+     */
     TEMPLATE("模版");
 
     private final String description;
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 db55d23e..a81f870c 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
@@ -8,11 +8,17 @@ package cn.lili.modules.goods.entity.enums;
  */
 public enum GoodsTypeEnum {
 
-
+    /**
+     * "实物商品"
+     */
     PHYSICAL_GOODS("实物商品"),
-
+    /**
+     * "虚拟商品"
+     */
     VIRTUAL_GOODS("虚拟商品"),
-
+    /**
+     * "电子卡券"
+     */
     E_COUPON("电子卡券");
 
 
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 0c8aa218..4175772a 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
@@ -22,6 +22,6 @@ public class StockWarningVO {
     private Integer stockWarningNum;
 
     @ApiModelProperty(value = "商品SKU列表")
-    private IPage<GoodsSku> goodsSkuIPage;
+    private IPage<GoodsSku> goodsSkuPage;
 
 }
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 bb0b1934..2a518778 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
@@ -18,6 +18,12 @@ import java.util.List;
  */
 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/GoodsMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsMapper.java
index cea5e6a8..561bf9c3 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
@@ -24,13 +24,27 @@ public interface GoodsMapper extends BaseMapper<Goods> {
      * 根据店铺ID获取商品ID列表
      *
      * @param storeId 店铺ID
+     * @return 商品ID列表
      */
     @Select("SELECT id FROM li_goods WHERE store_id = #{storeId}")
     List<String> getGoodsIdByStoreId(String storeId);
 
+    /**
+     * 添加商品评价数量
+     *
+     * @param commentNum 评价数量
+     * @param goodsId    商品ID
+     */
     @Update("UPDATE li_goods SET comment_num = comment_num + #{commentNum} WHERE id = #{goodsId}")
     void addGoodsCommentNum(Integer commentNum, String goodsId);
 
+    /**
+     * 查询商品VO分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 商品VO分页
+     */
     @Select("select g.* from li_goods as g ")
     IPage<GoodsVO> queryByParams(IPage<GoodsVO> page, @Param(Constants.WRAPPER) Wrapper<GoodsVO> queryWrapper);
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsParamsMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsParamsMapper.java
deleted file mode 100644
index 471c649c..00000000
--- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsParamsMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.lili.modules.goods.mapper;
-
-import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
-import cn.lili.modules.goods.entity.vos.GoodsParamsDTOVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-
-/**
- * 商品关联参数数据处理层
- *
- * @author pikachu
- * @date 2020-02-18 15:18:56
- */
-public interface GoodsParamsMapper extends BaseMapper<GoodsParamsDTO> {
-
-    @Select("select p.*,gp.param_value,p.group_id  from li_parameters p left join li_goods_params gp on p.id=gp.param_id and gp.goods_id = #{goodsId}  where p.category_id = #{categoryId} order by sort")
-    List<GoodsParamsDTOVO> paramList(String goodsId, String categoryId);
-
-}
\ No newline at end of file
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 94216d9f..29aa26d0 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
@@ -20,6 +20,7 @@ public interface CategoryService extends IService<Category> {
      * 管理端获取所有分类
      * 即获取的对象不管是否删除，都要展示，而且不从缓存获取，保证内容是最新的
      *
+     * @param parentId 分类父ID
      * @return 商品分类列表
      */
     List<Category> dbList(String parentId);
@@ -34,6 +35,7 @@ public interface CategoryService extends IService<Category> {
     /**
      * 查询所有的分类，父子关系
      *
+     * @param parentId 分类父ID
      * @return 所有的分类，父子关系
      */
     List<CategoryVO> listAllChildren(String parentId);
@@ -56,6 +58,7 @@ public interface CategoryService extends IService<Category> {
     /**
      * 获取商品分类list
      *
+     * @param category 分类
      * @return 商品分类list
      */
     List<Category> findByAllBySortOrder(Category category);
@@ -93,12 +96,17 @@ public interface CategoryService extends IService<Category> {
 
     /**
      * 获取商家经营类目
+     *
+     * @param categories 经营范围
+     * @return 分类VO列表
      */
     List<CategoryVO> getStoreCategory(String[] categories);
 
     /**
      * 获取一级分类列表
      * 用于商家入驻选择
+     *
+     * @return 分类列表
      */
     List<Category> firstCategory();
 
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 d95ca80a..c041e523 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
@@ -46,6 +46,7 @@ public interface GoodsService extends IService<Goods> {
      * 修改商品
      *
      * @param goodsOperationDTO 商品查询条件
+     * @param goodsId           商品ID
      */
     void editGoods(GoodsOperationDTO goodsOperationDTO, String goodsId);
 
@@ -61,6 +62,7 @@ public interface GoodsService extends IService<Goods> {
      * 商品查询
      *
      * @param goodsSearchParams 查询参数
+     * @return 商品分页
      */
     IPage<Goods> queryByParams(GoodsSearchParams goodsSearchParams);
 
@@ -76,9 +78,11 @@ public interface GoodsService extends IService<Goods> {
     /**
      * 获取所有的已上架的商品数量
      *
+     * @param goodsAuthEnum   商品审核枚举
+     * @param goodsStatusEnum 商品状态枚举
      * @return 所有的已上架的商品数量
      */
-    Integer goodsNum(GoodsStatusEnum goodsStatusEnum,GoodsAuthEnum goodsAuthEnum);
+    Integer goodsNum(GoodsStatusEnum goodsStatusEnum, GoodsAuthEnum goodsAuthEnum);
 
     /**
      * 获取今天的已上架的商品数量
@@ -87,10 +91,10 @@ public interface GoodsService extends IService<Goods> {
      */
     Integer todayUpperNum();
 
-    /*
+    /**
      * 更新商品上架状态状态
      *
-     * @param goodsIds         商品ID集合
+     * @param goodsIds        商品ID集合
      * @param goodsStatusEnum 更新的商品状态
      * @param underReason     下架原因
      * @return 更新结果
@@ -108,8 +112,8 @@ public interface GoodsService extends IService<Goods> {
     /**
      * 设置商品运费模板
      *
-     * @param goodsIds     商品列表
-     * @param templateId   运费模板ID
+     * @param goodsIds   商品列表
+     * @param templateId 运费模板ID
      * @return 操作结果
      */
     Boolean freight(List<String> goodsIds, String templateId);
@@ -117,7 +121,7 @@ public interface GoodsService extends IService<Goods> {
     /**
      * 修改商品库存数量
      *
-     * @param goodsId 商品ID
+     * @param goodsId  商品ID
      * @param quantity 库存数量
      */
     void updateStock(String goodsId, Integer quantity);
@@ -125,7 +129,7 @@ public interface GoodsService extends IService<Goods> {
     /**
      * 更新SKU评价数量
      *
-     * @param goodsId  商品ID
+     * @param goodsId 商品ID
      */
     void updateGoodsCommentNum(String goodsId);
 }
\ No newline at end of file
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 877f4f5d..c2976aaa 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
@@ -21,10 +21,22 @@ import java.util.Map;
  */
 public interface GoodsSkuService extends IService<GoodsSku> {
 
+    /**
+     * 获取商品SKU缓存ID
+     *
+     * @param id SkuId
+     * @return 商品SKU缓存ID
+     */
     static String getCacheKeys(String id) {
         return CachePrefix.GOODS_SKU.getPrefix() + id;
     }
 
+    /**
+     * 获取商品SKU库存缓存ID
+     *
+     * @param id SkuId
+     * @return 商品SKU缓存ID
+     */
     static String getStockCacheKey(String id) {
         return CachePrefix.SKU_STOCK.getPrefix() + id;
     }
@@ -166,7 +178,7 @@ public interface GoodsSkuService extends IService<GoodsSku> {
     /**
      * 更新SKU评价数量
      *
-     * @param skuId    SKUId
+     * @param skuId SKUId
      */
     void updateGoodsSkuCommentNum(String skuId);
 }
\ No newline at end of file
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 0a6f394a..e90a8757 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
@@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
@@ -31,10 +30,12 @@ import java.util.stream.Collectors;
  * @date 2020-02-18 16:18:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class BrandServiceImpl extends ServiceImpl<BrandMapper, Brand> implements BrandService {
 
-    //分类品牌绑定
+    /**
+     * 分类品牌绑定
+     */
     @Autowired
     private CategoryBrandService categoryBrandService;
 
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 e3e897e6..34b2ef23 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
@@ -21,7 +21,7 @@ import java.util.List;
  * @date 2020-02-18 16:18:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class CategoryBrandServiceImpl extends ServiceImpl<CategoryBrandMapper, CategoryBrand> implements CategoryBrandService {
 
     @Override
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java
index 4a45013f..4932afa4 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryParameterGroupServiceImpl.java
@@ -8,7 +8,6 @@ import cn.lili.modules.goods.service.CategoryParameterGroupService;
 import cn.lili.modules.goods.service.ParametersService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
@@ -27,9 +26,11 @@ import java.util.Map;
  * 2020-03-02 16:45:03
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class CategoryParameterGroupServiceImpl extends ServiceImpl<CategoryParameterGroupMapper, CategoryParameterGroup> implements CategoryParameterGroupService {
-    //商品参数
+    /**
+     * 商品参数
+     */
     @Autowired
     private ParametersService parametersService;
 
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 37907ce9..ef34f1a0 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
@@ -33,11 +33,13 @@ import java.util.stream.Collectors;
  * @date 2020-02-23 15:18:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> implements CategoryService {
 
     private static final String DELETE_FLAG_COLUMN = "delete_flag";
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache cache;
 
@@ -60,7 +62,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
         //构造分类树
         List<CategoryVO> categoryVOList = new ArrayList<>();
         for (Category category : list) {
-            if (category.getParentId().equals("0")) {
+            if ("0".equals(category.getParentId())) {
                 CategoryVO categoryVO = new CategoryVO(category);
                 categoryVO.setChildren(findChildren(list, categoryVO));
                 categoryVOList.add(categoryVO);
@@ -96,7 +98,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
 
     @Override
     public List<CategoryVO> listAllChildren(String parentId) {
-        if (parentId.equals("0")) {
+        if ("0".equals(parentId)) {
             return categoryTree();
         }
         //循环代码，找到对象，把他的子分类返回
@@ -119,7 +121,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
         //构造分类树
         List<CategoryVO> categoryVOList = new ArrayList<>();
         for (Category category : list) {
-            if (category.getParentId().equals("0")) {
+            if (("0").equals(category.getParentId())) {
                 CategoryVO categoryVO = new CategoryVO(category);
                 categoryVO.setChildren(findChildren(list, categoryVO));
                 categoryVOList.add(categoryVO);
@@ -161,7 +163,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
 
     @Override
     public boolean saveCategory(Category category) {
-        if (category.getParentId() != null && !category.getParentId().equals("0")) {
+        if (category.getParentId() != null && !("0").equals(category.getParentId())) {
             Category parentCategory = this.getById(category.getParentId());
             category.setDeleteFlag(parentCategory.getDeleteFlag());
         }
@@ -172,7 +174,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
 
     @Override
     public void updateCategory(Category category) {
-        if (category.getParentId() != null && !category.getParentId().equals("0")) {
+        if (category.getParentId() != null && !"0".equals(category.getParentId())) {
             Category parentCategory = this.getById(category.getParentId());
             if (!parentCategory.getDeleteFlag().equals(category.getDeleteFlag())) {
                 throw new ServiceException(ResultCode.CATEGORY_DELETE_FLAG_ERROR);
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 5925c794..7a76119a 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
@@ -18,7 +18,7 @@ import java.util.List;
  * @date 2020-02-23 15:18:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class CategorySpecificationServiceImpl extends ServiceImpl<CategorySpecificationMapper, CategorySpecification> implements CategorySpecificationService {
 
     @Override
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 25292b88..5d7b054b 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
@@ -30,15 +30,21 @@ import java.util.*;
  * @since 2020/12/19
  **/
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class DraftGoodsServiceImpl extends ServiceImpl<DraftGoodsMapper, DraftGoods> implements DraftGoodsService {
-    //分类
+    /**
+     * 分类
+     */
     @Autowired
     private CategoryService categoryService;
-    //商品相册
+    /**
+     * 商品相册
+     */
     @Autowired
     private GoodsGalleryService goodsGalleryService;
-    //规格商品
+    /**
+     * 规格商品
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
 
@@ -121,7 +127,7 @@ public class DraftGoodsServiceImpl extends ServiceImpl<DraftGoodsMapper, DraftGo
     }
 
     private GoodsSku add(Map<String, Object> map) {
-        Map<String, Object> specMap = new HashMap<>();
+        Map<String, Object> specMap = new HashMap<>(2);
         GoodsSku sku = new GoodsSku();
         for (Map.Entry<String, Object> m : map.entrySet()) {
             switch (m.getKey()) {
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java
index 8c810634..5537adf6 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java
@@ -27,13 +27,16 @@ import java.util.List;
  * 2020-02-23 15:18:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class GoodsGalleryServiceImpl extends ServiceImpl<GoodsGalleryMapper, GoodsGallery> implements GoodsGalleryService {
-    //文件
+    /**
+     * 文件
+     */
     @Autowired
     private FileManagerPlugin fileManagerPlugin;
-
-    //设置
+    /**
+     * 设置
+     */
     @Autowired
     private SettingService settingService;
 
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 9b15e69d..35232459 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
@@ -60,33 +60,53 @@ import java.util.List;
  * @date 2020-02-23 15:18:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
 
 
-    //分类
+    /**
+     * 分类
+     */
     @Autowired
     private CategoryService categoryService;
-    //设置
+    /**
+     * 设置
+     */
     @Autowired
     private SettingService settingService;
-    //商品相册
+    /**
+     * 商品相册
+     */
     @Autowired
     private GoodsGalleryService goodsGalleryService;
-    //商品规格
+    /**
+     * 商品规格
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
-    //店铺详情
+    /**
+     * 店铺详情
+     */
     @Autowired
     private StoreService storeService;
+    /**
+     * 会员评价
+     */
     @Autowired
     private MemberEvaluationService memberEvaluationService;
-    //rocketMq
+    /**
+     * rocketMq
+     */
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
-    //rocketMq配置
+    /**
+     * rocketMq配置
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
+    /**
+     * 分类-参数
+     */
     @Autowired
     private CategoryParameterGroupService categoryParameterGroupService;
 
@@ -94,9 +114,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     public void underStoreGoods(String storeId) {
         //获取商品ID列表
-        List<String> list= this.baseMapper.getGoodsIdByStoreId(storeId);
+        List<String> list = this.baseMapper.getGoodsIdByStoreId(storeId);
         //下架店铺下的商品
-        updateGoodsMarketAble(list,GoodsStatusEnum.DOWN,"店铺关闭");
+        updateGoodsMarketAble(list, GoodsStatusEnum.DOWN, "店铺关闭");
     }
 
     @Override
@@ -362,15 +382,15 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                 }
             }
             //两个参数集合进行对比
-            for (Parameters parameters :parametersList){
-                for (GoodsParamsItemDTO goodsParamsItemDTO :goodsOperationParamList){
-                    if(parameters.getId().equals(goodsParamsItemDTO.getParamId())){
+            for (Parameters parameters : parametersList) {
+                for (GoodsParamsItemDTO goodsParamsItemDTO : goodsOperationParamList) {
+                    if (parameters.getId().equals(goodsParamsItemDTO.getParamId())) {
                         //校验是否可以索引参数是否正确
-                        if(!parameters.getIsIndex().equals(goodsParamsItemDTO.getIsIndex())){
+                        if (!parameters.getIsIndex().equals(goodsParamsItemDTO.getIsIndex())) {
                             throw new ServiceException(ResultCode.GOODS_PARAMS_ERROR);
                         }
                         //校验是否必填参数是否正确
-                        if(!parameters.getRequired().equals(goodsParamsItemDTO.getRequired())){
+                        if (!parameters.getRequired().equals(goodsParamsItemDTO.getRequired())) {
                             throw new ServiceException(ResultCode.GOODS_PARAMS_ERROR);
                         }
                     }
@@ -394,12 +414,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         //判断商品类型
         switch (goods.getGoodsType()) {
             case "PHYSICAL_GOODS":
-                if (goods.getTemplateId().equals("0")) {
+                if ("0".equals(goods.getTemplateId())) {
                     throw new ServiceException(ResultCode.PHYSICAL_GOODS_NEED_TEMP);
                 }
                 break;
             case "VIRTUAL_GOODS":
-                if (!goods.getTemplateId().equals("0")) {
+                if (!"0".equals(goods.getTemplateId())) {
                     throw new ServiceException(ResultCode.VIRTUAL_GOODS_NOT_NEED_TEMP);
                 }
                 break;
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 4f4446d5..0948d00f 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
@@ -14,8 +14,8 @@ import cn.lili.common.utils.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.config.rocketmq.RocketmqCustomProperties;
 import cn.lili.modules.goods.entity.dos.Goods;
-import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
+import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
 import cn.lili.modules.goods.entity.dto.GoodsSearchParams;
 import cn.lili.modules.goods.entity.dto.GoodsSkuStockDTO;
 import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
@@ -25,12 +25,14 @@ import cn.lili.modules.goods.entity.vos.GoodsSkuVO;
 import cn.lili.modules.goods.entity.vos.GoodsVO;
 import cn.lili.modules.goods.entity.vos.SpecValueVO;
 import cn.lili.modules.goods.mapper.GoodsSkuMapper;
-import cn.lili.modules.goods.service.*;
+import cn.lili.modules.goods.service.CategoryService;
+import cn.lili.modules.goods.service.GoodsGalleryService;
+import cn.lili.modules.goods.service.GoodsService;
+import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.member.entity.dos.FootPrint;
 import cn.lili.modules.member.entity.dos.MemberEvaluation;
 import cn.lili.modules.member.entity.enums.EvaluationGradeEnum;
 import cn.lili.modules.member.service.MemberEvaluationService;
-import cn.lili.modules.promotion.service.PromotionService;
 import cn.lili.modules.search.entity.dos.EsGoodsAttribute;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 import cn.lili.modules.search.service.EsGoodsIndexService;
@@ -54,38 +56,52 @@ import java.util.stream.Collectors;
  * @date 2020-02-23 15:18:56
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> implements GoodsSkuService {
 
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache<GoodsSku> cache;
-    //分类
+    /**
+     * 分类
+     */
     @Autowired
     private CategoryService categoryService;
-    //商品相册
+    /**
+     * 商品相册
+     */
     @Autowired
     private GoodsGalleryService goodsGalleryService;
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
-    //rocketMq
+    /**
+     * rocketMq
+     */
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
-    //rocketMq配置
+    /**
+     * rocketMq配置
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
-    //会员评价
+    /**
+     * 会员评价
+     */
     @Autowired
     private MemberEvaluationService memberEvaluationService;
-    //商品
+    /**
+     * 商品
+     */
     private GoodsService goodsService;
-    //商品索引
+    /**
+     * 商品索引
+     */
     private EsGoodsIndexService goodsIndexService;
-    @Autowired
-    private ParametersService parametersService;
-    @Autowired
-    private PromotionService promotionService;
 
     @Override
     public void add(List<Map<String, Object>> skuList, Goods goods) {
@@ -173,7 +189,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         }
         String quantity = stringRedisTemplate.opsForValue().get(GoodsSkuService.getStockCacheKey(id));
         if (quantity != null) {
-            if (goodsSku.getQuantity() != Convert.toInt(quantity)) {
+            if (goodsSku.getQuantity().equals(Convert.toInt(quantity))) {
                 goodsSku.setQuantity(Convert.toInt(quantity));
                 this.updateById(goodsSku);
             }
@@ -186,7 +202,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
 
     @Override
     public Map<String, Object> getGoodsSkuDetail(String goodsId, String skuId) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(16);
         GoodsSku goodsSku = this.getGoodsSkuByIdFromCache(skuId);
 
         GoodsVO goodsVO = goodsService.getGoodsVO(goodsId);
@@ -335,7 +351,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         //循环提交的sku表单
         for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
             SpecValueVO specValueVO = new SpecValueVO();
-            if (entry.getKey().equals("images")) {
+            if ("images".equals(entry.getKey())) {
                 specValueVO.setSpecName(entry.getKey());
                 if (entry.getValue().toString().contains("url")) {
                     List<SpecValueVO.SpecImages> specImages = JSONUtil.toList(JSONUtil.parseArray(entry.getValue()), SpecValueVO.SpecImages.class);
@@ -542,7 +558,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
      * @return 规格商品
      */
     private Map<String, Object> add(Map<String, Object> map, Goods goods) {
-        Map<String, Object> resultMap = new HashMap<>();
+        Map<String, Object> resultMap = new HashMap<>(2);
         GoodsSku sku = new GoodsSku();
 
         //商品索引
@@ -604,20 +620,20 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         String thumbnail = "";
         String small = "";
         //规格值
-        Map<String, Object> specMap = new HashMap<>();
+        Map<String, Object> specMap = new HashMap<>(16);
         //商品属性
         List<EsGoodsAttribute> attributes = new ArrayList<>();
 
         //获取规格信息
         for (Map.Entry<String, Object> spec : map.entrySet()) {
             //保存规格信息
-            if (spec.getKey().equals("id") || spec.getKey().equals("sn") || spec.getKey().equals("cost")
-                    || spec.getKey().equals("price") || spec.getKey().equals("quantity")
-                    || spec.getKey().equals("weight")) {
+            if (("id").equals(spec.getKey()) || ("sn").equals(spec.getKey()) || ("cost").equals(spec.getKey())
+                    || ("price").equals(spec.getKey()) || ("quantity").equals(spec.getKey())
+                    || ("weight").equals(spec.getKey())) {
                 continue;
             } else {
                 specMap.put(spec.getKey(), spec.getValue());
-                if (spec.getKey().equals("images")) {
+                if (("images").equals(spec.getKey())) {
                     //设置规格商品缩略图
                     List<Map<String, String>> images = (List<Map<String, String>>) spec.getValue();
                     if (images == null || images.isEmpty()) {
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 9a0ec650..83655296 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
@@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020/11/26 16:13
  */
 @Service
-@Transactional
 public class GoodsUnitServiceImpl extends ServiceImpl<GoodsUnitMapper, GoodsUnit> implements GoodsUnitService {
 
 }
\ No newline at end of file
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 79798e13..1316a719 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
@@ -16,6 +16,5 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020-03-02 16:18:56
  */
 @Service
-@Transactional
 public class ParametersServiceImpl extends ServiceImpl<ParametersMapper, Parameters> implements ParametersService {
 }
\ No newline at end of file
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 15a132ce..ea1b5575 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
@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.ArrayList;
 import java.util.List;
@@ -25,13 +24,16 @@ import java.util.List;
  * @date 2020-02-18 16:18:56
  */
 @Service
-@Transactional
 public class SpecificationServiceImpl extends ServiceImpl<SpecificationMapper, Specification> implements SpecificationService {
 
-    //分类-规格绑定
+    /**
+     * 分类-规格绑定
+     */
     @Autowired
     private CategorySpecificationService categorySpecificationService;
-
+    /**
+     * 分类
+     */
     @Autowired
     private CategoryServiceImpl categoryService;
 
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 a9688392..ae6408a9 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
@@ -35,7 +35,7 @@ public class MemberEvaluationListVO {
     private String status;
 
     @ApiModelProperty(value = "回复状态")
-    private boolean replyStatus;
+    private Boolean replyStatus;
 
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
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 d34f14e4..1068bb1b 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
@@ -22,5 +22,5 @@ public class StoreCollectionVO {
     private String logo;
 
     @ApiModelProperty(value = "是否自营")
-    private boolean selfOperated;
+    private Boolean selfOperated;
 }
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 741d1c40..d85a0525 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
@@ -19,11 +19,19 @@ import java.util.List;
  */
 public interface FootprintMapper extends BaseMapper<FootPrint> {
 
+    /**
+     * 获取用户足迹的SkuId分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 用户足迹的SkuId分页
+     */
     @Select("select sku_id from li_foot_print  ${ew.customSqlSegment} ")
     List<String> footprintSkuIdList(IPage<String> page, @Param(Constants.WRAPPER) Wrapper<FootPrint> queryWrapper);
 
     /**
      * 删除超过100条后的记录
+     *
      * @param memberId 会员ID
      */
     @Delete("DELETE FROM li_foot_print WHERE (SELECT COUNT(b.id) FROM ( SELECT * FROM li_foot_print WHERE member_id = #{memberId} ) b) >100 " +
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 72007cd7..651d4439 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
@@ -17,6 +17,13 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface GoodsCollectionMapper extends BaseMapper<GoodsCollection> {
 
+    /**
+     * 商品收藏VO分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 商品收藏VO分页
+     */
     @Select("select gc.id AS id,gs.id as sku_id,gs.goods_id as goods_id,gs.goods_name as goods_name,gs.thumbnail as image,gs.price,gs.market_enable AS market_enable from li_goods_collection gc INNER JOIN li_goods_sku gs ON gc.sku_id=gs.id    ${ew.customSqlSegment} ")
     IPage<GoodsCollectionVO> goodsCollectionVOList(IPage<GoodsCollectionVO> page, @Param(Constants.WRAPPER) Wrapper<GoodsCollectionVO> queryWrapper);
 
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 5c021159..2f6c9afa 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
@@ -22,18 +22,43 @@ import java.util.Map;
 public interface MemberEvaluationMapper extends BaseMapper<MemberEvaluation> {
 
 
+    /**
+     * 会员评价分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 会员评价分页
+     */
     @Select("select me.* from li_member_evaluation as me ${ew.customSqlSegment}")
     IPage<MemberEvaluationListVO> getMemberEvaluationList(IPage<MemberEvaluationListVO> page, @Param(Constants.WRAPPER) Wrapper<MemberEvaluationListVO> queryWrapper);
 
+    /**
+     * 评价数量
+     *
+     * @param goodsId 商品ID
+     * @return 会员评价
+     */
     @Select("select grade,count(1) as num from li_member_evaluation Where goods_id=#{goodsId} and status='OPEN' GROUP BY grade")
     List<Map<String, Object>> getEvaluationNumber(String goodsId);
 
+    /**
+     * 获取店铺评分
+     *
+     * @param queryWrapper 查询条件
+     * @return 店铺评分
+     */
     @Select("SELECT round( AVG( delivery_score ), 2 ) AS delivery_score" +
             ",round( AVG( description_score ), 2 ) AS description_score" +
             ",round( AVG( service_score ), 2 ) AS service_score " +
             "FROM li_member_evaluation ${ew.customSqlSegment}")
     StoreRatingVO getStoreRatingVO(@Param(Constants.WRAPPER) Wrapper<MemberEvaluation> queryWrapper);
 
+    /**
+     * 商品会员评价数量
+     *
+     * @param queryWrapper 查询条件
+     * @return 评价数量
+     */
     @Select("SELECT goods_id,COUNT(goods_id) AS num FROM li_member_evaluation GROUP BY goods_id")
     List<Map<String, Object>> memberEvaluationNum(@Param(Constants.WRAPPER) Wrapper<MemberEvaluation> queryWrapper);
 }
\ No newline at end of file
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 78b3217f..4dde7577 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
@@ -16,9 +16,17 @@ import java.util.List;
  */
 public interface MemberMapper extends BaseMapper<Member> {
 
+    /**
+     * 获取所有的会员手机号
+     * @return 会员手机号
+     */
     @Select("select m.mobile from li_member m")
     List<String> getAllMemberMobile();
 
+    /**
+     * 获取会员分布列表
+     * @return 会员分布列表
+     */
     @Select("select client_enum,count(0) as num from li_member group by client_enum")
     List<MemberDistributionVO> distribution();
 }
\ No newline at end of file
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 ed90642b..37d4e8fb 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
@@ -12,9 +12,22 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface MemberPointsHistoryMapper extends BaseMapper<MemberPointsHistory> {
 
+    /**
+     * 获取所有用户的积分历史VO
+     *
+     * @param pointType 积分类型
+     * @return
+     */
     @Select("SELECT SUM( variable_point ) FROM li_member_points_history WHERE point_type = #{pointType}")
     Long getALLMemberPointsHistoryVO(Integer pointType);
 
+    /**
+     * 获取用户的积分数量
+     *
+     * @param pointType 积分类型
+     * @param memberId  会员ID
+     * @return 积分数量
+     */
     @Select("SELECT SUM( variable_point ) FROM li_member_points_history WHERE point_type = #{pointType} AND member_id=#{memberId}")
     Long getMemberPointsHistoryVO(Integer pointType, String memberId);
 
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 e9e24fc3..257e506c 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
@@ -18,13 +18,31 @@ import java.util.List;
  */
 public interface MemberSignMapper extends BaseMapper<MemberSign> {
 
+    /**
+     * 获取会员之前签到信息
+     *
+     * @param memberId 会员ID
+     * @return 会员签到列表
+     */
     @Select("SELECT * FROM li_member_sign WHERE TO_DAYS( NOW( ) ) - TO_DAYS( create_time) = 1 and member_id = #{memberId}")
     List<MemberSign> getBeforeMemberSign(String memberId);
 
-
+    /**
+     * 获取会员签到
+     *
+     * @param queryWrapper 查询条件
+     * @return 会员签到列表
+     */
     @Select("select * from li_member_sign ${ew.customSqlSegment}")
     List<MemberSign> getTodayMemberSign(@Param(Constants.WRAPPER) Wrapper<MemberSign> queryWrapper);
 
+    /**
+     * 获取当月的会员签到记录
+     *
+     * @param memberId 会员ID
+     * @param time     时间
+     * @return 会员签到列表
+     */
     @Select("SELECT * FROM li_member_sign WHERE DATE_FORMAT(create_time,'%Y%m') = #{time} and member_id = #{memberId}")
     List<MemberSign> getMonthMemberSign(String memberId, String time);
 
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 c4a8206c..d0ebd514 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
@@ -17,6 +17,13 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface StoreCollectionMapper extends BaseMapper<StoreCollection> {
 
+    /**
+     * 会员店铺收藏分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return
+     */
     @Select("select s.id,s.store_name,s.store_logo,s.self_operated  from li_store s INNER JOIN li_store_collection sc ON s.id=sc.store_id  ${ew.customSqlSegment} ")
     IPage<StoreCollectionVO> storeCollectionVOList(IPage<StoreCollectionVO> page, @Param(Constants.WRAPPER) Wrapper<StoreCollectionVO> queryWrapper);
 }
\ No newline at end of file
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 1bebd5bc..052ae723 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
@@ -27,6 +27,7 @@ public interface MemberEvaluationService extends IService<MemberEvaluation> {
 
     /**
      * 查询评价分页列表
+     *
      * @param evaluationQueryParams 评价查询条件
      * @return 评价分页列表
      */
@@ -43,6 +44,7 @@ public interface MemberEvaluationService extends IService<MemberEvaluation> {
      * @return 操作状态
      */
     MemberEvaluationDTO addMemberEvaluation(MemberEvaluationDTO memberEvaluationDTO);
+
     /**
      * 根据ID查询会员评价
      *
@@ -54,7 +56,7 @@ public interface MemberEvaluationService extends IService<MemberEvaluation> {
     /**
      * 更改评论状态
      *
-     * @param id 评价ID
+     * @param id     评价ID
      * @param status 状态
      * @return 会员评价
      */
@@ -74,12 +76,13 @@ public interface MemberEvaluationService extends IService<MemberEvaluation> {
      * @param id         评价ID
      * @param reply      回复内容
      * @param replyImage 回复图片
-     *
+     * @return 操作状态
      */
     boolean reply(String id, String reply, String replyImage);
 
     /**
      * 获取商品评价数量
+     *
      * @param goodsId 商品ID
      * @return 评价数量数据
      */
@@ -87,12 +90,14 @@ public interface MemberEvaluationService extends IService<MemberEvaluation> {
 
     /**
      * 获取今天新增的评价数量
+     *
      * @return 今日评价数量
      */
     Integer todayMemberEvaluation();
 
     /**
      * 获取等待回复评价数量
+     *
      * @return 等待回复评价数量
      */
     Integer getWaitReplyNum();
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 f7fb42bc..6f6ed6b5 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
@@ -68,7 +68,8 @@ public interface MemberService extends IService<Member> {
     /**
      * 注册：手机号、验证码登录
      *
-     * @return 是否登录成功
+     * @param mobilePhone 手机号
+     * @return token
      */
     Token mobilePhoneLogin(String mobilePhone);
 
@@ -152,6 +153,7 @@ public interface MemberService extends IService<Member> {
     /**
      * 一键注册会员
      *
+     * @param authUser 联合登录用户
      * @return Token
      */
     Token autoRegister(ConnectAuthUser authUser);
@@ -186,10 +188,10 @@ public interface MemberService extends IService<Member> {
     /**
      * 会员积分变动
      *
-     * @param experience    变动经验值
-     * @param type          是否增加经验值
-     * @param memberId      会员id
-     * @param content       变动详细
+     * @param experience 变动经验值
+     * @param type       是否增加经验值
+     * @param memberId   会员id
+     * @param content    变动详细
      * @return 操作结果
      */
     Boolean updateMemberExperience(Long experience, Boolean type, String memberId, String content);
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 e669e985..cc5bf418 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
@@ -70,9 +70,10 @@ public interface MemberWalletService extends IService<MemberWallet> {
     /**
      * 提现扣减冻结金额
      *
-     * @param money    金额
-     * @param memberId 会员id
-     * @param detail   操作描述
+     * @param money       金额
+     * @param memberId    会员id
+     * @param detail      操作描述
+     * @param serviceType 类型
      * @return 操作状态
      */
     Boolean reduceFrozen(Double money, String memberId, String detail, String serviceType);
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 c66cf5ab..df895f66 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
@@ -26,10 +26,12 @@ import java.util.Objects;
  * @date 2020/11/18 10:46 上午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint> implements FootprintService {
 
-    //es商品业务层
+    /**
+     * es商品业务层
+     */
     @Autowired
     private EsGoodsSearchService esGoodsSearchService;
 
@@ -76,7 +78,7 @@ public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint
 
         LambdaQueryWrapper<FootPrint> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(FootPrint::getMemberId, UserContext.getCurrentUser().getId());
-        lambdaQueryWrapper.eq(FootPrint::getDeleteFlag,false);
+        lambdaQueryWrapper.eq(FootPrint::getDeleteFlag, false);
         lambdaQueryWrapper.orderByDesc(FootPrint::getUpdateTime);
         List<String> skuIdList = this.baseMapper.footprintSkuIdList(PageUtil.initPage(pageVO), lambdaQueryWrapper);
         if (skuIdList.size() > 0) {
@@ -92,7 +94,7 @@ public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint
     public Integer getFootprintNum() {
         LambdaQueryWrapper<FootPrint> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(FootPrint::getMemberId, UserContext.getCurrentUser().getId());
-        lambdaQueryWrapper.eq(FootPrint::getDeleteFlag,false);
+        lambdaQueryWrapper.eq(FootPrint::getDeleteFlag, false);
         return this.count(lambdaQueryWrapper);
     }
 }
\ No newline at end of file
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 b4bd13d0..4aa7f925 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
@@ -36,10 +36,14 @@ import java.util.Optional;
 
 public class GoodsCollectionServiceImpl extends ServiceImpl<GoodsCollectionMapper, GoodsCollection> implements GoodsCollectionService {
 
-    //rocketMq
+    /**
+     * rocketMq
+     */
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
-    //rocketMq配置
+    /**
+     * rocketMq配置
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
 
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 d75a37de..34aab3fb 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
@@ -56,28 +56,42 @@ import java.util.Map;
  * @date 2020-02-25 14:10:16
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class MemberEvaluationServiceImpl extends ServiceImpl<MemberEvaluationMapper, MemberEvaluation> implements MemberEvaluationService {
 
-    //会员评价数据层
+    /**
+     * 会员评价数据层
+     */
     @Resource
     private MemberEvaluationMapper memberEvaluationMapper;
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
-    //子订单
+    /**
+     * 子订单
+     */
     @Autowired
     private OrderItemService orderItemService;
-    //会员
+    /**
+     * 会员
+     */
     @Autowired
     private MemberService memberService;
-    //商品
+    /**
+     * 商品
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
-    //rocketMq
+    /**
+     * rocketMq
+     */
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
-    //rocketMq配置
+    /**
+     * rocketMq配置
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
 
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 3026fba6..b42bc6ea 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
@@ -3,16 +3,15 @@ package cn.lili.modules.member.serviceimpl;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.StringUtils;
-import cn.lili.modules.member.entity.dos.MemberNoticeSenter;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dos.MemberNotice;
+import cn.lili.modules.member.entity.dos.MemberNoticeSenter;
 import cn.lili.modules.member.entity.enums.SendTypeEnum;
 import cn.lili.modules.member.mapper.MemberNoticeSenterMapper;
 import cn.lili.modules.member.service.MemberNoticeSenterService;
 import cn.lili.modules.member.service.MemberNoticeService;
 import cn.lili.modules.member.service.MemberService;
 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.Propagation;
@@ -31,10 +30,14 @@ import java.util.List;
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = java.lang.Exception.class)
 public class MemberNoticeSenterServiceImpl extends ServiceImpl<MemberNoticeSenterMapper, MemberNoticeSenter> implements MemberNoticeSenterService {
 
-    //会员
+    /**
+     * 会员
+     */
     @Autowired
     private MemberService memberService;
-    //会员站内信
+    /**
+     * 会员站内信
+     */
     @Autowired
     private MemberNoticeService 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 4de0800a..638dbd88 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
@@ -21,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020-02-25 14:10:16
  */
 @Service
-@Transactional
 public class MemberPointsHistoryServiceImpl extends ServiceImpl<MemberPointsHistoryMapper, MemberPointsHistory> implements MemberPointsHistoryService {
 
     @Override
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 7175161b..7cec3001 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
@@ -32,7 +32,6 @@ import java.util.List;
  * @date 2021-03-29 14:10:16
  */
 @Service
-@Transactional
 public class MemberReceiptServiceImpl extends ServiceImpl<MemberReceiptMapper, MemberReceipt> implements MemberReceiptService {
     @Autowired
     private MemberService memberService;
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 273549ec..f8fb9bcd 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
@@ -60,27 +60,42 @@ import java.util.List;
  * @date 2021-03-29 14:10:16
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements MemberService {
 
-    //会员token
+    /**
+     * 会员token
+     */
     @Autowired
     private MemberTokenGenerate memberTokenGenerate;
-    //商家token
+    /**
+     * 商家token
+     */
     @Autowired
     private StoreTokenGenerate storeTokenGenerate;
-    //联合登录
+    /**
+     * 联合登录
+     */
     @Autowired
     private ConnectService connectService;
+    /**
+     * 店铺
+     */
     @Autowired
     private StoreService storeService;
-    //RocketMQ 配置
+    /**
+     * RocketMQ 配置
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
-    //RocketMQ
+    /**
+     * RocketMQ
+     */
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache cache;
 
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 74ab3170..5fccdd4c 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
@@ -24,7 +24,6 @@ import com.google.gson.Gson;
 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.Date;
 import java.util.List;
@@ -37,19 +36,26 @@ import java.util.Map;
  * @date 2020-02-25 14:10:16
  */
 @Service
-@Transactional
 public class MemberSignServiceImpl extends ServiceImpl<MemberSignMapper, MemberSign> implements MemberSignService {
 
-    //RocketMQ
+    /**
+     * RocketMQ
+     */
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
-    //RocketMQ 配置
+    /**
+     * RocketMQ 配置
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
-    //配置
+    /**
+     * 配置
+     */
     @Autowired
     private SettingService settingService;
-    //会员
+    /**
+     * 会员
+     */
     @Autowired
     private MemberService memberService;
 
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 bab12568..1cdf7af9 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
@@ -42,19 +42,27 @@ import java.util.Date;
  * @date 2020-02-25 14:10:16
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, MemberWallet> implements MemberWalletService {
 
-    //预存款日志
+    /**
+     * 预存款日志
+     */
     @Autowired
     private WalletLogService walletLogService;
-    //设置
+    /**
+     * 设置
+     */
     @Autowired
     private SettingService settingService;
-    //会员
+    /**
+     * 会员
+     */
     @Autowired
     private MemberService memberService;
-    //会员提现申请
+    /**
+     * 会员提现申请
+     */
     @Autowired
     private MemberWithdrawApplyService memberWithdrawApplyService;
 
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 b6c5f74a..9813925f 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
@@ -31,11 +31,12 @@ import java.util.Date;
  * @date 2020-02-25 14:10:16
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawApplyMapper, MemberWithdrawApply> implements MemberWithdrawApplyService {
 
-    //提现申请数据层
-    //会员余额
+    /**
+     * 会员余额
+     */
     @Autowired
     private MemberWalletService memberWalletService;
 
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 ad156c58..e3114cb6 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
@@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.Optional;
 
@@ -25,7 +24,6 @@ import java.util.Optional;
  * @date 2020/11/18 2:52 下午
  */
 @Service
-@Transactional
 public class StoreCollectionServiceImpl extends ServiceImpl<StoreCollectionMapper, StoreCollection> implements StoreCollectionService {
 
     @Override
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 2b2cc7d1..36580a5d 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
@@ -1,16 +1,20 @@
 package cn.lili.modules.message.entity.enums;
 
 /**
- * 发送消息范围
+ * 发送消息范围枚举
  *
  * @author pikachu
  * @date 2020/12/8 9:46
  */
 public enum MessageRangeEnum {
 
-
+    /**
+     * 所有用户
+     */
     ALL("所有用户"),
-
+    /**
+     * 指定用户
+     */
     USER("指定用户");
 
     private final String description;
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 7bd5612d..9252aca7 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
@@ -1,4 +1,5 @@
 package cn.lili.modules.message.entity.enums;
+
 /**
  * 消息标题
  *
@@ -7,8 +8,13 @@ package cn.lili.modules.message.entity.enums;
  */
 public enum MessageTitle {
 
+    /**
+     * 您有新的订单，请您关注
+     */
     NEW_ORDER("您有新的订单，请您关注"),
-
+    /**
+     * 您有订单被支付，请您及时进行发货处理
+     */
     PAY_ORDER("您有订单被支付，请您及时进行发货处理");
 
     private final String description;
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 15be4c22..da5b6997 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
@@ -8,14 +8,34 @@ package cn.lili.modules.message.entity.enums;
  */
 public enum NoticeMessageParameterEnum {
 
-
+    /**
+     * 商品名称
+     */
     GOODS("goods", "商品名称"),
+    /**
+     * 消费积分
+     */
     EXPENDITURE_POINTS("expenditure_points", "消费积分"),
+    /**
+     * 获得积分
+     */
     INCOME_POINTS("income_points", "获得积分"),
+    /**
+     * 支出金额
+     */
     EXPENDITURE("expenditure", "支出金额"),
+    /**
+     * 收入金额
+     */
     INCOME("income", "收入金额"),
+    /**
+     * 拒绝原因
+     */
     REFUSE("refuse", "拒绝原因"),
-    CANCEL_REASON("cancel_reason","取消原因");
+    /**
+     * 取消原因
+     */
+    CANCEL_REASON("cancel_reason", "取消原因");
 
     private final String type;
     private final String description;
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/WechatMessageItemEnums.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/WechatMessageItemEnums.java
index fd9905cf..beff0714 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/enums/WechatMessageItemEnums.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/WechatMessageItemEnums.java
@@ -8,20 +8,42 @@ package cn.lili.modules.message.entity.enums;
  * 2020-12-10 17:47
  */
 public enum WechatMessageItemEnums {
+    /**
+     * 商户名称
+     */
     SHOP_NAME(new String[]{"商户名称"}),
+    /**
+     * 买家昵称
+     */
     MEMBER_NAME(new String[]{"买家昵称"}),
+    /**
+     * 订单金额
+     */
     PRICE(new String[]{"支付金额","订单金额"}),
-
+    /**
+     * 订单详情
+     */
     GOODS_INFO(new String[]{"订单详情","商品清单","商品名称"}),
-
+    /**
+     * 订单编号
+     */
     ORDER_SN(new String[]{"订单编号"}),
-
-
+    /**
+     * 快递公司
+     */
     LOGISTICS_NAME(new String[]{"快递公司"}),
+    /**
+     * 快递单号
+     */
     LOGISTICS_NO(new String[]{"快递单号"}),
-
+    /**
+     * 发货时间
+     */
     LOGISTICS_TIME(new String[]{"发货时间"}),
-    PAYMENT_TIME(new String[]{"支付时间"}),
+    /**
+     * 支付时间
+     */
+    PAYMENT_TIME(new String[]{"支付时间"})
     ;
 
     /**
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 64fa41d2..29c586dc 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
@@ -16,6 +16,13 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface StoreMessageMapper extends BaseMapper<StoreMessage> {
 
+    /**
+     * 店铺消息分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询参数
+     * @return 店铺消息分页
+     */
     @Select("select me.title,me.content,me.create_time,sp.store_name,sp.store_id,sp.id,sp.status from li_message me inner join li_store_message sp on me.id = sp.message_id ${ew.customSqlSegment} ")
     IPage<StoreMessage> queryByParams(IPage<StoreMessage> page, @Param(Constants.WRAPPER) Wrapper<StoreMessage> queryWrapper);
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/WechatMPMessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/WechatMPMessageMapper.java
index 55e7e92d..954d7638 100644
--- a/framework/src/main/java/cn/lili/modules/message/mapper/WechatMPMessageMapper.java
+++ b/framework/src/main/java/cn/lili/modules/message/mapper/WechatMPMessageMapper.java
@@ -6,10 +6,14 @@ import org.apache.ibatis.annotations.Delete;
 
 /**
  * 微信小程序消息订阅 Dao层
+ *
  * @author Chopper
  */
 public interface WechatMPMessageMapper extends BaseMapper<WechatMPMessage> {
 
+    /**
+     * 删除微信服务消息
+     */
     @Delete("delete from li_wechat_mp_message")
     void deleteAll();
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/WechatMessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/WechatMessageMapper.java
index e71e5e1c..1fbc16ab 100644
--- a/framework/src/main/java/cn/lili/modules/message/mapper/WechatMessageMapper.java
+++ b/framework/src/main/java/cn/lili/modules/message/mapper/WechatMessageMapper.java
@@ -6,10 +6,14 @@ import org.apache.ibatis.annotations.Delete;
 
 /**
  * 微信消息 Dao层
+ *
  * @author Chopper
  */
 public interface WechatMessageMapper extends BaseMapper<WechatMessage> {
 
+    /**
+     * 删除微信消息
+     */
     @Delete("delete from li_wechat_message")
     void deleteAll();
 }
\ No newline at end of file
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 6866dd22..90079065 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
@@ -17,6 +17,7 @@ public interface SmsReachService extends IService<SmsReach> {
      * 添加短信任务
      *
      * @param smsReach 短信签名
+     * @param mobile   手机号
      */
     void addSmsReach(SmsReach smsReach, List<String> mobile);
 
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 7b8aa737..ec102af2 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
@@ -20,16 +20,17 @@ public interface StoreMessageService extends IService<StoreMessage> {
     /**
      * 通过消息id删除
      *
-     * @param messageId
+     * @param messageId 消息ID
+     * @return 操作结果
      */
     boolean deleteByMessageId(String messageId);
 
     /**
      * 多条件分页获取
      *
-     * @param storeMessageQueryVO
-     * @param pageVO
-     * @return
+     * @param storeMessageQueryVO 店铺消息查询VO
+     * @param pageVO              分页
+     * @return 店铺消息分页
      */
     IPage<StoreMessage> getPage(StoreMessageQueryVO storeMessageQueryVO, PageVO pageVO);
 
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 e5dfed67..7f0a0c17 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
@@ -23,7 +23,6 @@ import java.util.List;
  * @date 2020/11/17 3:48 下午
  */
 @Service
-@Transactional
 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 94e52c20..e6a04466 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
@@ -23,7 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020/11/17 3:48 下午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements MessageService {
 
     @Autowired
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 3604fbd6..740fba02 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
@@ -28,7 +28,6 @@ import java.util.Map;
  * @date 2020/12/8 9:48
  */
 @Service
-@Transactional
 public class NoticeMessageServiceImpl extends ServiceImpl<NoticeMessageTemplateMapper, NoticeMessage> implements NoticeMessageService {
 
     @Autowired
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 0079545c..d8fa32b2 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
@@ -24,7 +24,6 @@ import java.util.List;
  * @date 2021/1/30 3:19 下午
  */
 @Service
-@Transactional
 public class SmsReachServiceImpl extends ServiceImpl<SmsReachMapper, SmsReach> implements SmsReachService {
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
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 50c6cd93..e7ec89dd 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
@@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.List;
@@ -28,7 +27,6 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-@Transactional
 public class SmsSignServiceImpl extends ServiceImpl<SmsSignMapper, SmsSign> implements SmsSignService {
     @Autowired
     private AliSmsUtil aliSmsUtil;
@@ -65,7 +63,7 @@ public class SmsSignServiceImpl extends ServiceImpl<SmsSignMapper, SmsSign> impl
     @Override
     public void querySmsSign() {
         try {
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = new HashMap<>(16);
             //获取未审核通过的签名列表
             List<SmsSign> list = list(new LambdaQueryWrapper<SmsSign>().eq(SmsSign::getSignStatus, 0));
             //查询签名状态
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 d3286192..ad1cca95 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
@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.List;
@@ -26,7 +25,6 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-@Transactional
 public class SmsTemplateServiceImpl extends ServiceImpl<SmsTemplateMapper, SmsTemplate> implements SmsTemplateService {
     @Autowired
     private AliSmsUtil aliSmsUtil;
@@ -61,7 +59,7 @@ public class SmsTemplateServiceImpl extends ServiceImpl<SmsTemplateMapper, SmsTe
     @Override
     public void querySmsTemplate() {
         try {
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = new HashMap<>(16);
             //获取未审核通过的签名列表
             List<SmsTemplate> list = list(new LambdaQueryWrapper<SmsTemplate>().eq(SmsTemplate::getTemplateStatus, 0));
             //查询签名状态
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 69d2246b..6d81963c 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
@@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.elasticsearch.ResourceNotFoundException;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -26,7 +25,6 @@ import java.util.List;
  * @date 2020/11/17 3:48 下午
  */
 @Service
-@Transactional
 public class StoreMessageServiceImpl extends ServiceImpl<StoreMessageMapper, StoreMessage> implements StoreMessageService {
 
     @Override
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java
index f8fcd822..48fa1943 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java
@@ -40,13 +40,17 @@ public class WechatMPMessageServiceImpl extends ServiceImpl<WechatMPMessageMappe
     @Autowired
     private WechatAccessTokenUtil wechatAccessTokenUtil;
 
-    //get 获取所有的模版
+    /**
+     * get 获取所有的模版
+     */
     private final String allMsgTpl = "https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate?access_token=";
-
-    //获取keyid
+    /**
+     * 获取keyid
+     */
     private final String keywords = "https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatekeywords?access_token=";
-
-    //post 删除模版 添加模版 获取模版id
+    /**
+     * post 删除模版 添加模版 获取模版id
+     */
     private final String delMsgTpl = "https://api.weixin.qq.com/wxaapi/newtmpl/deltemplate?access_token=";
     private final String addTpl = "https://api.weixin.qq.com/wxaapi/newtmpl/addtemplate?access_token=";
 
@@ -78,7 +82,7 @@ public class WechatMPMessageServiceImpl extends ServiceImpl<WechatMPMessageMappe
             tmpList.forEach(tplData -> {
                 WechatMPMessage wechatMPMessage = new WechatMPMessage();
 
-                Map params = new HashMap<>();
+                Map params = new HashMap<>(16);
                 params.put("tid", tplData.getTid());
                 //获取微信消息订阅keys
                 String keywordsItems = WechatMessageUtil.wechatHandler(HttpUtil.get(keywords + accessToken, params));
@@ -102,7 +106,7 @@ public class WechatMPMessageServiceImpl extends ServiceImpl<WechatMPMessageMappe
                         }
                     }
                 }
-                params = new HashMap<>();
+                params = new HashMap<>(4);
                 params.put("tid", tplData.getTid());
                 params.put("kidList", kids);
                 params.put("sceneDesc", tplData.getSceneDesc());
@@ -203,12 +207,20 @@ class WechatMPMessageData {
 
 @Data
 class WechatMessageKeyword {
-    //id字段
+    /**
+     * id字段
+     */
     private String kid;
-    //名称
+    /**
+     * 名称
+     */
     private String name;
-    //示例值
+    /**
+     * 示例值
+     */
     private String example;
-    //示例值
+    /**
+     * 示例值
+     */
     private String rule;
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
index 7bc17c04..3e4db127 100644
--- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
@@ -39,10 +39,13 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
     @Autowired
     private WechatAccessTokenUtil wechatAccessTokenUtil;
 
-    //get 获取所有的模版
+    /**
+     * get 获取所有的模版
+     */
     private final String allMsgTpl = "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template?access_token=";
-
-    //post 删除模版 添加模版 获取模版id
+    /**
+     * post 删除模版 添加模版 获取模版id
+     */
     private final String delMsgTpl = "https://api.weixin.qq.com/cgi-bin/template/del_private_template?access_token=";
     private final String addTpl = "https://api.weixin.qq.com/cgi-bin/template/api_add_template?access_token=";
 
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 6d5d9a90..b086459e 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
@@ -89,7 +89,7 @@ public class WechatMessageData {
      * @return
      */
     private Map<String, String> createValue(String msg) {
-        Map<String, String> map = new HashMap<>();
+        Map<String, String> map = new HashMap<>(2);
         map.put("value", msg);
         return map;
     }
diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
index a2d9d5e4..f9babe15 100644
--- a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
+++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
@@ -100,7 +100,7 @@ public class WechatMessageUtil {
         //发送url
         String url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + token;
 
-        Map<String, String> map = new HashMap<>();
+        Map<String, String> map = new HashMap<>(4);
         //用户id
         map.put("touser", connect.getUnionId());
         //模版id
@@ -157,7 +157,7 @@ public class WechatMessageUtil {
         //发送url
         String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + token;
 
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(4);
         //用户id
         map.put("touser", connect.getUnionId());
         //模版id
@@ -165,13 +165,13 @@ public class WechatMessageUtil {
         //模版中所需数据
         Map<String, Map<String, String>> postParams = createData(order, wechatMPMessage);
         map.put("data", postParams);
-        map.put("page", "pages/order/orderDetail?sn="+order.getSn());
+        map.put("page", "pages/order/orderDetail?sn=" + order.getSn());
         log.info("参数内容：" + JSONUtil.toJsonStr(map));
         String content = null;
         try {
             content = HttpUtil.post(url, JSONUtil.toJsonStr(map));
         } catch (Exception e) {
-            log.error("微信消息发送错误",e);
+            log.error("微信消息发送错误", e);
         }
         JSONObject json = new JSONObject(content);
         log.info("微信消息发送结果：" + content);
@@ -262,9 +262,9 @@ public class WechatMessageUtil {
                 return order.getLogisticsName();
             case LOGISTICS_TIME:
                 return DateUtil.toString(order.getLogisticsTime(), DateUtil.STANDARD_FORMAT);
-
+            default:
+                return "";
         }
-        return "";
     }
 
     /**
@@ -274,7 +274,7 @@ public class WechatMessageUtil {
      */
     public static void wechatHandler(JSONObject jsonObject) {
         if (jsonObject.containsKey("errmsg")) {
-            if (jsonObject.getStr("errmsg").equals("ok")) {
+            if (("ok").equals(jsonObject.getStr("errmsg"))) {
                 return;
             }
             log.error("微信接口异常，错误码" + jsonObject.get("errcode") + "，" + jsonObject.getStr("errmsg"));
diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java
index 99cbcc74..b965ce2d 100644
--- a/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java
+++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java
@@ -56,7 +56,7 @@ public class WechatMpCodeUtil {
     public String createQrCode(String path) {
         try {
             String accessToken = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
-            Map<String, String> params = new HashMap<>();
+            Map<String, String> params = new HashMap<>(2);
             params.put("path", path);
             params.put("width", "280");
 
@@ -112,7 +112,7 @@ public class WechatMpCodeUtil {
                 shortLink = shortLinkService.getOne(queryWrapper);
             }
             String accessToken = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
-            Map<String, String> params = new HashMap<>();
+            Map<String, String> params = new HashMap<>(4);
             params.put("page", page);
             params.put("scene", shortLink.getId());
             params.put("width", "280");
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 01c58035..7d549d5f 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
@@ -8,8 +8,17 @@ package cn.lili.modules.order.cart.entity.enums;
  **/
 public enum DeliveryMethodEnum {
 
+    /**
+     * "自提"
+     */
     SELF_PICK_UP("自提"),
+    /**
+     * "同城配送"
+     */
     LOCAL_TOWN_DELIVERY("同城配送"),
+    /**
+     * "物流"
+     */
     LOGISTICS("物流");
 
     private final String description;
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 4454c8f9..9d5fc853 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
@@ -25,15 +25,19 @@ import java.util.stream.Collectors;
 @Slf4j
 public class TradeBuilder {
 
-    //购物车渲染步骤
+    /**
+     * 购物车渲染步骤
+     */
     @Autowired
     private List<CartRenderStep> cartRenderSteps;
-
-    //交易
+    /**
+     * 交易
+     */
     @Autowired
     private TradeService tradeService;
-
-    //购物车业务
+    /**
+     * 购物车业务
+     */
     @Autowired
     private CartService cartService;
 
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java
index 5d547b7e..77cd1dc3 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartPriceRender.java
@@ -28,7 +28,9 @@ import java.util.Map;
 public class CartPriceRender implements CartRenderStep {
 
 
-    //商品分类
+    /**
+     * 商品分类
+     */
     @Autowired
     private CategoryService categoryService;
 
@@ -72,7 +74,7 @@ public class CartPriceRender implements CartRenderStep {
 
         //key store id
         //value 商品列表
-        Map<String, List<CartSkuVO>> map = new HashMap<>();
+        Map<String, List<CartSkuVO>> map = new HashMap<>(2);
         for (CartSkuVO cartSkuVO : cartSkuVOList) {
             //如果存在商家id
             if (map.containsKey(cartSkuVO.getGoodsSku().getStoreId())) {
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 9f5954b8..45524d73 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
@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.CurrencyUtil;
-import cn.lili.common.utils.StringUtils;
 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.enums.CartTypeEnum;
@@ -44,13 +43,19 @@ import java.util.stream.Collectors;
 @Service
 @Order(2)
 public class SkuPromotionRender implements CartRenderStep {
-    //促销计算
+    /**
+     * 促销计算
+     */
     @Autowired
     private PromotionPriceService promotionPriceService;
-    //促销商品
+    /**
+     * 促销商品
+     */
     @Autowired
     private PromotionGoodsService promotionGoodsService;
-
+    /**
+     * 拼团
+     */
     @Autowired
     private PintuanService pintuanService;
 
@@ -228,26 +233,6 @@ public class SkuPromotionRender implements CartRenderStep {
 
     }
 
-    /**
-     * 渲染拼团
-     *
-     * @param cartSkuList 购物车sku集合
-     */
-    private void renderPintuan(List<CartSkuVO> cartSkuList) {
-        for (CartSkuVO cartSku : cartSkuList) {
-            PriceDetailDTO priceDetailDTO = cartSku.getPriceDetailDTO();
-//           PromotionGoods promotionGoods = cartSku.getPromotion();
-            //参与平台则以拼团价处理
-            if (StringUtils.isNotEmpty(cartSku.getPintuanId())) {
-//               Double discountPrice = CurrencyUtil.sub(cartSku.getGoodsSku().getPrice(), promotionGoods.getPrice());
-//               priceDetailDTO.setDiscountPrice(discountPrice);
-            } else {
-                //否则代表单独购买，则以原价购买
-                priceDetailDTO.setDiscountPrice(0d);
-            }
-        }
-    }
-
     /**
      * 渲染满减优惠
      *
@@ -258,7 +243,6 @@ public class SkuPromotionRender implements CartRenderStep {
         //获取参与活动的商品总价
         FullDiscountVO fullDiscount = cartVO.getFullDiscount();
 
-
         if (Boolean.TRUE.equals(fullDiscount.getIsCoupon())) {
             cartVO.getGiftCouponList().add(fullDiscount.getCouponId());
         }
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 41fd0be2..a3c1b50a 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
@@ -58,29 +58,44 @@ public class CartServiceImpl implements CartService {
 
     static String errorMessage = "购物车异常，请稍后重试";
 
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache<Object> cache;
-    //会员优惠券
+    /**
+     * 会员优惠券
+     */
     @Autowired
     private MemberCouponService memberCouponService;
-    //规格商品
+    /**
+     * 规格商品
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
-    //促销商品
+    /**
+     * 促销商品
+     */
     @Autowired
     private PromotionGoodsService promotionGoodsService;
-    //会员地址
+    /**
+     * 会员地址
+     */
     @Autowired
     private MemberAddressService memberAddressService;
-    //ES商品
+    /**
+     * ES商品
+     */
     @Autowired
     private EsGoodsSearchService esGoodsSearchService;
-
-    //拼团服务
+    /**
+     * 拼团
+     */
     @Autowired
     private PintuanService pintuanService;
-    //交易
+    /**
+     * 交易
+     */
     @Autowired
     private TradeBuilder tradeBuilder;
 
@@ -573,7 +588,7 @@ public class CartServiceImpl implements CartService {
             if (memberCoupon.getConsumeThreshold() <= cartPrice) {
                 tradeDTO.setPlatformCoupon(new MemberCouponDTO(memberCoupon));
                 //选择平台优惠券，则将品台优惠券清空
-                tradeDTO.setStoreCoupons(new HashMap<>());
+                tradeDTO.setStoreCoupons(new HashMap<>(16));
             }
         }
         //否则为店铺优惠券
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 a6460ad8..8b6eddfb 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
@@ -62,7 +62,7 @@ public class AfterSaleOperationLogAspect {
      */
     public static Map<String, String> spelFormat(JoinPoint joinPoint, Object rvt) {
 
-        Map<String, String> result = new HashMap<>();
+        Map<String, String> result = new HashMap<>(2);
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         AfterSaleLogPoint afterSaleLogPoint = signature.getMethod().getAnnotation(AfterSaleLogPoint.class);
         String description = SpelUtil.compileParams(joinPoint, rvt, afterSaleLogPoint.description());
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 122a200f..05677dd2 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
@@ -62,7 +62,7 @@ public class OrderOperationLogAspect {
      */
     private static Map<String, String> spelFormat(JoinPoint joinPoint) throws Exception {
 
-        Map<String, String> result = new HashMap<>();
+        Map<String, String> result = new HashMap<>(2);
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         OrderLogPoint orderLogPoint = signature.getMethod().getAnnotation(OrderLogPoint.class);
         String description = SpelUtil.compileParams(joinPoint, orderLogPoint.description());
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 4bebaa28..575da880 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
@@ -135,7 +135,9 @@ public class AfterSale extends BaseEntity {
     @ApiModelProperty(value = "退款时间")
     private Date refundTime;
 
-    //买家物流信息
+    /**
+     * 买家物流信息
+     */
     @ApiModelProperty(value = "发货单号")
     private String mLogisticsNo;
 
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 88cc7ab9..bfbd7a4e 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
@@ -10,6 +10,12 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
+/**
+ * 售后原因
+ *
+ * @author Bulbasaur
+ * @date: 2021/7/9 1:39 上午
+ */
 @Data
 @Entity
 @Table(name = "li_after_sale_reason")
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 42068b07..7185f402 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
@@ -124,7 +124,6 @@ public class Order extends BaseEntity {
     @ApiModelProperty(value = "优惠的金额")
     private Double discountPrice;
 
-    //修改金额
     @ApiModelProperty(value = "修改价格")
     private Double updatePrice;
 
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 e7eec6e4..06ab410c 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
@@ -19,8 +19,11 @@ import java.util.List;
 @Data
 public class PriceDetailDTO implements Serializable {
 
-    //用于订单价格修改金额计算使用
-    @ApiModelProperty(value = "订单原始总价格" )
+    /**
+     * 订单原始总价格
+     * 用于订单价格修改金额计算使用
+     */
+    @ApiModelProperty(value = "订单原始总价格")
     private Double originalPrice;
 
     private static final long serialVersionUID = 8808470688518188146L;
@@ -69,10 +72,12 @@ public class PriceDetailDTO implements Serializable {
     //=========end platform coupon==========
 
     //========= update price ==========
+
     @ApiModelProperty(value = "订单修改金额")
     private Double updatePrice;
 
     //=========end update price==========
+
     @ApiModelProperty(value = "流水金额(入账 出帐金额) = goodsPrice + freight - discountPrice - couponPrice + updatePrice")
     private Double flowPrice;
 
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 566a29c3..d165bd67 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
@@ -18,7 +18,7 @@ public class AfterSaleAllowOperation {
     private Boolean confirm = false;
 
     @ApiModelProperty(value = "可以回寄物流")
-    private Boolean return_goods = false;
+    private Boolean returnGoods = false;
 
     @ApiModelProperty(value = "可以收货")
     private Boolean rog = false;
@@ -27,7 +27,7 @@ public class AfterSaleAllowOperation {
     private Boolean refund = false;
 
     @ApiModelProperty(value = "买家确认收货")
-    private Boolean buyer_confirm;
+    private Boolean buyerConfirm;
 
     @ApiModelProperty(value = "可以取消")
     private Boolean cancel;
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 847e2ca0..9f7fa32e 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
@@ -49,10 +49,10 @@ public class AfterSaleApplyVO {
     private String accountType;
 
     @ApiModelProperty(value = "是否支持退货")
-    private boolean returnGoods;
+    private Boolean returnGoods;
 
     @ApiModelProperty(value = "是否支持退款")
-    private boolean returnMoney;
+    private Boolean returnMoney;
 
 
 }
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 060bce3e..50650b50 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
@@ -2,6 +2,7 @@ package cn.lili.modules.order.order.entity.vo;
 
 import cn.lili.modules.order.order.entity.dos.AfterSale;
 import jdk.nashorn.internal.objects.annotations.Getter;
+import lombok.Data;
 
 /**
  * 售后VO
@@ -9,6 +10,7 @@ import jdk.nashorn.internal.objects.annotations.Getter;
  * @author Chopper
  * @date 2021/3/12 10:32 上午
  */
+@Data
 public class AfterSaleVO extends AfterSale {
     /**
      * 初始化自身状态
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 5a039982..a67c0ae7 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
@@ -17,9 +17,22 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface AfterSaleMapper extends BaseMapper<AfterSale> {
 
+    /**
+     * 获取售后VO分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 售后VO分页
+     */
     @Select("SELECT * FROM li_after_sale ${ew.customSqlSegment}")
     IPage<AfterSaleVO> queryByParams(IPage<AfterSaleVO> page, @Param(Constants.WRAPPER) Wrapper<AfterSaleVO> queryWrapper);
 
+    /**
+     * 根据售后编号获取售后VO
+     *
+     * @param sn 售后编号
+     * @return 售后VO
+     */
     @Select("SELECT * FROM li_after_sale WHERE sn=#{sn}")
     AfterSaleVO getAfterSaleVO(String sn);
 }
\ No newline at end of file
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 aa0b35d9..9563a9c5 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
@@ -18,6 +18,12 @@ import java.util.List;
  */
 public interface OrderItemMapper extends BaseMapper<OrderItem> {
 
+    /**
+     * 获取等待评价的订单子项列表
+     *
+     * @param queryWrapper 查询条件
+     * @return 订单子项列表
+     */
     @Select("SELECT * FROM li_order_item AS oi INNER JOIN li_order AS o ON oi.order_sn=o.sn ${ew.customSqlSegment}")
     List<OrderItem> waitEvaluate(@Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
 
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 4c14bf22..6bcbbf42 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
@@ -22,9 +22,22 @@ import java.util.List;
  */
 public interface OrderMapper extends BaseMapper<Order> {
 
+    /**
+     * 修改订单状态
+     *
+     * @param status  状态
+     * @param orderSn 订单编号
+     */
     @Update({"update li_order set order_status = #{status} where sn = #{orderSn}"})
     void updateStatus(String status, String orderSn);
 
+    /**
+     * 查询订单简短信息分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 简短订单分页
+     */
     @Select("select o.sn,o.flow_price,o.create_time,o.order_status,o.pay_status,o.payment_method,o.payment_time,o.member_name,o.store_name as store_name,o.store_id as store_id,o.client_type,o.order_type,o.deliver_status " +
             ",GROUP_CONCAT(oi.goods_id) as group_goods_id," +
             " GROUP_CONCAT(oi.sku_id) as group_sku_id," +
@@ -39,14 +52,25 @@ public interface OrderMapper extends BaseMapper<Order> {
             " FROM li_order o INNER JOIN li_order_item AS oi on o.sn = oi.order_sn ${ew.customSqlSegment} ")
     IPage<OrderSimpleVO> queryByParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
 
+    /**
+     * 查询导出订单DTO列表
+     *
+     * @param queryWrapper 查询条件
+     * @return 导出订单DTO列表
+     */
     @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}")
     List<OrderExportDTO> queryExportOrder(@Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
 
+    /**
+     * 查询订单支付记录
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 订单支付记录分页
+     */
     @Select("select * from li_order ${ew.customSqlSegment} ")
     IPage<PaymentLog> queryPaymentLogs(IPage<PaymentLog> page, @Param(Constants.WRAPPER) Wrapper<PaymentLog> queryWrapper);
 
-    @Select("SELECT sn FROM li_order o ${ew.customSqlSegment} ")
-    List<String> deliverSnList(@Param(Constants.WRAPPER) Wrapper<Order> queryWrapper);
 }
\ 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 dad60aac..49201fc7 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
@@ -12,6 +12,11 @@ import org.apache.ibatis.annotations.Update;
  */
 public interface TradeMapper extends BaseMapper<Trade> {
 
+    /**
+     * 修改交易金额
+     *
+     * @param tradeSn 交易编号
+     */
     @Update("UPDATE li_trade SET flow_price =(SELECT SUM(flow_price) FROM li_order WHERE trade_sn=#{tradeSn}) WHERE sn=#{tradeSn}")
     void updateTradePrice(String tradeSn);
 }
\ No newline at end of file
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 21d23e69..e27fd9bf 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
@@ -70,19 +70,25 @@ public interface AfterSaleService extends IService<AfterSale> {
      * @param afterSaleSn   售后编号
      * @param serviceStatus 状态 PASS：审核通过，REFUSE：审核未通过
      * @param remark        商家备注
+     * @param actualRefundPrice 退款金额
+     * @return 售后
      */
-    AfterSale review(String afterSaleSn, String serviceStatus, String remark,Double actualRefundPrice);
+    AfterSale review(String afterSaleSn, String serviceStatus, String remark, Double actualRefundPrice);
 
     /**
      * 买家退货,物流填写
      *
-     * @param afterSaleSn 售后服务单号
-     * @param logisticsNo 物流单号
-     * @param logisticsId 物流公司ID
+     * @param afterSaleSn  售后服务单号
+     * @param logisticsNo  物流单号
+     * @param logisticsId  物流公司ID
+     * @param mDeliverTime 买家退货发货时间
+     * @return 售后
      */
     AfterSale buyerDelivery(String afterSaleSn, String logisticsNo, String logisticsId, Date mDeliverTime);
 
-    /* 获取买家退货物流踪迹
+    /**
+     * 获取买家退货物流踪迹
+     *
      * @param afterSaleSn 售后服务单号
      * @return 物流踪迹
      */
@@ -143,7 +149,7 @@ public interface AfterSaleService extends IService<AfterSale> {
      * 获取统计的售后
      *
      * @param statisticsQueryParam 统计搜索参数
-     * @param pageVO 分页
+     * @param pageVO               分页
      * @return 售后分页列表
      */
     IPage<AfterSale> getStatistics(StatisticsQueryParam statisticsQueryParam, PageVO pageVO);
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 37eee01b..79bc0461 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
@@ -84,7 +84,9 @@ public interface OrderComplaintService extends IService<OrderComplaint> {
 
     /**
      * 店铺申诉
+     *
      * @param storeAppealVO
+     * @return 操作状态
      */
     boolean appeal(StoreAppealVO storeAppealVO);
 }
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 3d1a00d6..56db9912 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
@@ -16,6 +16,7 @@ public interface OrderPriceService {
      *
      * @param orderSn    订单编号
      * @param orderPrice 订单价格
+     * @return 订单
      */
     Order updatePrice(String orderSn, Double orderPrice);
 
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 fbc45510..63fa0ae0 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
@@ -4,7 +4,6 @@ import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dto.MemberAddressDTO;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.order.entity.dos.Order;
-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.OrderMessage;
 import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
@@ -17,7 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
 import java.util.List;
 
 /**
@@ -49,6 +47,7 @@ public interface OrderService extends IService<Order> {
      * 订单查询
      *
      * @param orderSearchParams 查询参数
+     * @return 简短订单分页
      */
     IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams);
 
@@ -101,6 +100,7 @@ public interface OrderService extends IService<Order> {
      *
      * @param orderSn 订单SN
      * @param reason  取消理由
+     * @return 订单
      */
     Order cancel(String orderSn, String reason);
 
@@ -111,6 +111,7 @@ public interface OrderService extends IService<Order> {
      *
      * @param orderSn          订单编号
      * @param memberAddressDTO 收货地址信息
+     * @return 订单
      */
     Order updateConsignee(String orderSn, MemberAddressDTO memberAddressDTO);
 
@@ -120,6 +121,7 @@ public interface OrderService extends IService<Order> {
      * @param orderSn       订单编号
      * @param invoiceNumber 发货单号
      * @param logisticsId   物流公司
+     * @return 订单
      */
     Order delivery(String orderSn, String invoiceNumber, String logisticsId);
 
@@ -135,6 +137,8 @@ public interface OrderService extends IService<Order> {
      * 订单核验
      *
      * @param verificationCode 验证码
+     * @param orderSn          订单编号
+     * @return 订单
      */
     Order take(String orderSn, String verificationCode);
 
@@ -142,6 +146,7 @@ public interface OrderService extends IService<Order> {
      * 根据核验码获取订单信息
      *
      * @param verificationCode 验证码
+     * @return 订单
      */
     Order getOrderByVerificationCode(String verificationCode);
 
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 f513cbe4..14740c83 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
@@ -33,7 +33,7 @@ public interface StoreFlowService extends IService<StoreFlow> {
     /**
      * 获取商家流水
      *
-     * @param StoreId      商家ID
+     * @param storeId      商家ID
      * @param type         收入、退款
      * @param distribution 是否查看分销相关数据
      * @param pageVO       分页
@@ -41,6 +41,6 @@ public interface StoreFlowService extends IService<StoreFlow> {
      * @param endTime      结束时间
      * @return
      */
-    IPage<StoreFlow> getStoreFlow(String StoreId, String type, boolean distribution, PageVO pageVO, Date startTime, Date endTime);
+    IPage<StoreFlow> getStoreFlow(String storeId, String type, boolean distribution, PageVO pageVO, Date startTime, Date endTime);
 
 }
\ No newline at end of file
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 565bca53..5c69e2fb 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
@@ -18,7 +18,7 @@ import java.util.List;
  * @date 2020/11/17 7:37 下午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class AfterSaleLogServiceImpl extends ServiceImpl<AfterSaleLogMapper, AfterSaleLog> implements AfterSaleLogService {
 
     @Override
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 df63cafe..7599e92a 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
@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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;
 
-import javax.transaction.Transactional;
 import java.util.List;
 
 /**
@@ -19,7 +19,7 @@ import java.util.List;
  * @date 2020/11/17 7:38 下午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class AfterSaleReasonServiceImpl extends ServiceImpl<AfterSaleReasonMapper, AfterSaleReason> implements AfterSaleReasonService {
 
 
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 f9eb6744..58ae9189 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
@@ -51,8 +51,8 @@ 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 javax.transaction.Transactional;
 import java.util.Date;
 import java.util.List;
 
@@ -63,28 +63,42 @@ import java.util.List;
  * @date 2020/11/17 7:38 下午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale> implements AfterSaleService {
 
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
-    //订单货物
+    /**
+     * 订单货物
+     */
     @Autowired
     private OrderItemService orderItemService;
-    //物流公司
+    /**
+     * 物流公司
+     */
     @Autowired
     private LogisticsService logisticsService;
-    //店铺详情
+    /**
+     * 店铺详情
+     */
     @Autowired
     private StoreDetailService storeDetailService;
-    //售后支持，这里用于退款操作
+    /**
+     * 售后支持，这里用于退款操作
+     */
     @Autowired
     private RefundSupport refundSupport;
-    //RocketMQ配置
+    /**
+     * RocketMQ配置
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
-    //RocketMQ
+    /**
+     * RocketMQ
+     */
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
 
@@ -130,10 +144,10 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
             afterSaleApplyVO.setRefundWay(AfterSaleRefundWayEnum.ORIGINAL.name());
         }
         //判断订单类型，虚拟订单只支持退款
-        if(order.getOrderType().equals(OrderTypeEnum.VIRTUAL.name())){
+        if (order.getOrderType().equals(OrderTypeEnum.VIRTUAL.name())) {
             afterSaleApplyVO.setReturnMoney(true);
             afterSaleApplyVO.setReturnGoods(false);
-        }else{
+        } else {
             afterSaleApplyVO.setReturnMoney(true);
             afterSaleApplyVO.setReturnGoods(true);
         }
@@ -262,13 +276,14 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
             throw new ServiceException(ResultCode.AFTER_STATUS_ERROR);
         }
         AfterSaleStatusEnum afterSaleStatusEnum = null;
+        String pass = "PASS";
         //判断审核状态
         //在线支付 则直接进行退款
-        if (serviceStatus.equals("PASS") &&
+        if (pass.equals(serviceStatus) &&
                 afterSale.getRefundWay().equals(AfterSaleRefundWayEnum.ORIGINAL.name())) {
             refundSupport.refund(afterSale);
             afterSaleStatusEnum = AfterSaleStatusEnum.COMPLETE;
-        } else if (serviceStatus.equals("PASS")) {
+        } else if (pass.equals(serviceStatus)) {
             afterSaleStatusEnum = AfterSaleStatusEnum.WAIT_REFUND;
         } else {
             afterSaleStatusEnum = AfterSaleStatusEnum.SELLER_TERMINATION;
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 74a109b3..aef1868a 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
@@ -20,7 +20,6 @@ import javax.transaction.Transactional;
  * @since 2020/12/5
  **/
 @Service
-@Transactional
 public class OrderComplaintCommunicationServiceImpl extends ServiceImpl<OrderComplainCommunicationMapper, OrderComplaintCommunication> implements OrderComplaintCommunicationService {
 
     @Override
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 e9f65ab7..1d66cff7 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
@@ -33,7 +33,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.transaction.Transactional;
 import java.util.Date;
 import java.util.List;
 
@@ -44,20 +43,26 @@ import java.util.List;
  * @since 2020/12/5
  **/
 @Service
-@Transactional
-
 public class OrderComplaintServiceImpl extends ServiceImpl<OrderComplaintMapper, OrderComplaint> implements OrderComplaintService {
 
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
-    //订单货物
+    /**
+     * 订单货物
+     */
     @Autowired
     private OrderItemService orderItemService;
-    //商品规格
+    /**
+     * 商品规格
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
-    //交易投诉沟通
+    /**
+     * 交易投诉沟通
+     */
     @Autowired
     private OrderComplaintCommunicationService orderComplaintCommunicationService;
 
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 9fd07f52..1423b106 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
@@ -14,8 +14,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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;
 
-import javax.transaction.Transactional;
 import java.util.Date;
 import java.util.List;
 
@@ -26,7 +26,7 @@ import java.util.List;
  * @date 2020/11/17 7:38 下午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem> implements OrderItemService {
 
     @Override
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 f77ff06b..3bc505d8 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
@@ -19,12 +19,13 @@ import cn.lili.modules.order.order.service.OrderItemService;
 import cn.lili.modules.order.order.service.OrderPriceService;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
-import cn.lili.modules.payment.kit.plugin.bankTransfer.BankTransferPlugin;
+import cn.lili.modules.payment.kit.plugin.bank.BankTransferPlugin;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -37,19 +38,29 @@ import java.util.List;
 @Transactional(rollbackFor = Exception.class)
 public class OrderPriceServiceImpl implements OrderPriceService {
 
-    //线下收款
+    /**
+     * 线下收款
+     */
     @Autowired
     private BankTransferPlugin bankTransferPlugin;
-    //订单货物
+    /**
+     * 订单货物
+     */
     @Autowired
     private OrderItemService orderItemService;
-    //交易数据层
-    @Autowired
+    /**
+     * 交易数据层
+     */
+    @Resource
     private TradeMapper tradeMapper;
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
-    //商品分类
+    /**
+     * 商品分类
+     */
     @Autowired
     private CategoryService categoryService;
 
@@ -164,7 +175,7 @@ public class OrderPriceServiceImpl implements OrderPriceService {
             priceDetailDTO.setPlatFormCommission(platFormCommission);
 
             //最终结算金额 = 流水金额-平台佣金-分销提佣
-            double billPrice = CurrencyUtil.sub(CurrencyUtil.sub(priceDetailDTO.getFlowPrice(),priceDetailDTO.getPlatFormCommission()),
+            double billPrice = CurrencyUtil.sub(CurrencyUtil.sub(priceDetailDTO.getFlowPrice(), priceDetailDTO.getPlatFormCommission()),
                     priceDetailDTO.getDistributionCommission());
             priceDetailDTO.setBillPrice(billPrice);
 
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 51247b2f..d8fff356 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
@@ -91,37 +91,59 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     private static final String ORDER_SN_COLUMN = "order_sn";
 
-    //延时任务
+    /**
+     * 延时任务
+     */
     @Autowired
     private TimeTrigger timeTrigger;
-    //订单货物数据层
+    /**
+     * 订单货物数据层
+     */
     @Resource
     private OrderItemMapper orderItemMapper;
-    //发票
+    /**
+     * 发票
+     */
     @Autowired
     private ReceiptService receiptService;
-    //订单货物
+    /**
+     * 订单货物
+     */
     @Autowired
     private OrderItemService orderItemService;
-    //物流公司
+    /**
+     * 物流公司
+     */
     @Autowired
     private LogisticsService logisticsService;
-    //订单日志
+    /**
+     * 订单日志
+     */
     @Autowired
     private OrderLogService orderLogService;
-    //RocketMQ
+    /**
+     * RocketMQ
+     */
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
-    //RocketMQ配置
+    /**
+     * RocketMQ配置
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
-    //订单流水
+    /**
+     * 订单流水
+     */
     @Autowired
     private StoreFlowService storeFlowService;
-    //拼团
+    /**
+     * 拼团
+     */
     @Autowired
     private PintuanService pintuanService;
-    //规格商品
+    /**
+     * 规格商品
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
 
@@ -305,8 +327,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
         //要记录之前的收货地址，所以需要以代码方式进行调用 不采用注解
         String message = "订单[" + orderSn + "]收货信息修改，由[" + order.getConsigneeDetail() + "]修改为[" + memberAddressDTO.getConsigneeDetail() + "]";
-
-        BeanUtil.copyProperties(memberAddressDTO, order);//记录订单操作日志
+        //记录订单操作日志
+        BeanUtil.copyProperties(memberAddressDTO, order);
         this.updateById(order);
 
         OrderLog orderLog = new OrderLog(orderSn, UserContext.getCurrentUser().getId(), UserContext.getCurrentUser().getRole().getRole(), UserContext.getCurrentUser().getUsername(), message);
@@ -669,7 +691,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
      * @param orderList 需要更新拼团状态为成功的拼团订单列表
      */
     private void pintuanOrderSuccess(List<Order> orderList) {
-        for (Order order:orderList) {
+        for (Order order : orderList) {
             if (order.getOrderType().equals(OrderTypeEnum.VIRTUAL.name())) {
                 this.virtualOrderConfirm(order.getSn());
             } else if (order.getOrderType().equals(OrderTypeEnum.NORMAL.name())) {
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 087264ec..ce57885b 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
@@ -23,7 +23,6 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020/11/17 7:38 下午
  */
 @Service
-@Transactional
 public class ReceiptServiceImpl extends ServiceImpl<ReceiptMapper, Receipt> implements ReceiptService {
 
     @Override
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 4b9f726b..5eb8d19f 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
@@ -36,16 +36,22 @@ import java.util.List;
  */
 @Slf4j
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class StoreFlowServiceImpl extends ServiceImpl<StoreFlowMapper, StoreFlow> implements StoreFlowService {
 
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
-    //订单货物
+    /**
+     * 订单货物
+     */
     @Autowired
     private OrderItemService orderItemService;
-    //退款日志
+    /**
+     * 退款日志
+     */
     @Autowired
     private RefundLogService refundLogService;
 
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 f1b66b6e..1bb77a78 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
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.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
diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleRefundWayEnum.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleRefundWayEnum.java
index 58a7ab2e..0e2935ab 100644
--- a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleRefundWayEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleRefundWayEnum.java
@@ -8,8 +8,13 @@ package cn.lili.modules.order.trade.entity.enums;
  **/
 public enum AfterSaleRefundWayEnum {
 
-
+    /**
+     * "原路退回"
+     */
     ORIGINAL("原路退回"),
+    /**
+     * "线下支付"
+     */
     OFFLINE("线下支付");
 
     private final String description;
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 67ce26ca..9d3aa91c 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
@@ -20,13 +20,12 @@ import java.util.List;
  * @date 2020-02-25 14:10:16
  */
 @Service
-@Transactional
 public class OrderLogServiceImpl extends ServiceImpl<OrderLogMapper, OrderLog> implements OrderLogService {
 
     @Override
     public List<OrderLog> getOrderLog(String orderSn) {
-        LambdaQueryWrapper<OrderLog> lambdaQueryWrapper= Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(OrderLog::getOrderSn,orderSn);
+        LambdaQueryWrapper<OrderLog> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(OrderLog::getOrderSn, orderSn);
         return this.list(lambdaQueryWrapper);
     }
 }
\ No newline at end of file
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 8504ac30..c866ce0e 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
@@ -33,10 +33,12 @@ import java.util.Date;
  * @date 2020-02-25 14:10:16
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> implements RechargeService {
 
-    //会员预存款
+    /**
+     * 会员预存款
+     */
     @Autowired
     private MemberWalletService memberWalletService;
 
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 9aa465c4..88bb32c9 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
@@ -22,7 +22,7 @@ import java.util.Date;
  * @date 2020-02-25 14:10:16
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class WalletLogServiceImpl extends ServiceImpl<WalletLogMapper, WalletLog> implements WalletLogService {
 
     @Override
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 9261b7f5..b60afe60 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
@@ -57,7 +57,6 @@ public class PageData extends BaseEntity {
     @ApiModelProperty(value = "值")
     private String num;
 
-    //店铺首页
     public PageData(String name, String pageClientType, String pageData) {
         this.pageClientType = pageClientType;
         this.pageData = pageData;
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 b62f1bb4..fe394f53 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
@@ -28,7 +28,6 @@ public class ArticleSearchParams extends PageVO {
         QueryWrapper<T> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(categoryId), "category_id", categoryId);
         queryWrapper.like(StringUtils.isNotBlank(title), "title", title);
-        //queryWrapper.orderByAsc("a.sort");
         return queryWrapper;
     }
 }
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 366c0c80..8313b50c 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
@@ -18,6 +18,13 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface ArticleMapper extends BaseMapper<Article> {
 
+    /**
+     * 获取文章VO分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 文章VO分页
+     */
     @Select("select a.id,a.title,a.sort,ac.article_category_name,a.open_status from " +
             "li_article as a inner join li_article_category ac on a.category_id=ac.id ${ew.customSqlSegment}")
     IPage<ArticleVO> getArticleList(IPage<ArticleVO> page, @Param(Constants.WRAPPER) Wrapper<ArticleVO> queryWrapper);
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 548918a6..1076cd88 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
@@ -18,12 +18,31 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface PageDataMapper extends BaseMapper<PageData> {
 
+    /**
+     * 获取页面数据VO
+     *
+     * @param queryWrapper 查询条件
+     * @return 页面数据VO
+     */
     @Select("SELECT page_data FROM li_page_data ${ew.customSqlSegment}")
     PageDataVO getPageData(@Param(Constants.WRAPPER) Wrapper<PageDataVO> queryWrapper);
 
+    /**
+     * 获取页面数量
+     *
+     * @param queryWrapper 查询条件
+     * @return 页面数量
+     */
     @Select("SELECT COUNT(id) FROM li_page_data ${ew.customSqlSegment}")
     Integer getPageDataNum(@Param(Constants.WRAPPER) Wrapper<Integer> queryWrapper);
 
+    /**
+     * 获取页面数据分页
+     *
+     * @param page         页面
+     * @param queryWrapper 查询条件
+     * @return 页面数据分页
+     */
     @Select("SELECT id,name,page_show FROM li_page_data ${ew.customSqlSegment}")
     IPage<PageDataListVO> getPageDataList(IPage<PageDataListVO> page, @Param(Constants.WRAPPER) Wrapper<PageDataListVO> queryWrapper);
 
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 c31ffb32..0c820c9f 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
@@ -19,6 +19,7 @@ public interface ArticleCategoryService extends IService<ArticleCategory> {
      * 添加文章分类
      *
      * @param articleCategory 文章分类
+     * @return 文章分类
      */
     ArticleCategory saveArticleCategory(ArticleCategory articleCategory);
 
@@ -26,6 +27,7 @@ public interface ArticleCategoryService extends IService<ArticleCategory> {
      * 修改文章分类
      *
      * @param articleCategory 文章分类
+     * @return 文章分类
      */
     ArticleCategory updateArticleCategory(ArticleCategory articleCategory);
 
@@ -40,6 +42,7 @@ public interface ArticleCategoryService extends IService<ArticleCategory> {
      * 删除文章分类
      *
      * @param id 文章分类id
+     * @return 操作状态
      */
     boolean deleteById(String id);
 
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 abe3a5a4..6fac59fe 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
@@ -58,6 +58,7 @@ public interface ArticleService extends IService<Article> {
      * 读取文章
      *
      * @param id
+     * @return 文章
      */
     @Cacheable(key = "#id")
     Article customGet(String id);
@@ -66,15 +67,18 @@ public interface ArticleService extends IService<Article> {
      * 读取文章
      *
      * @param type
+     * @return 文章
      */
     @Cacheable(key = "#type")
     Article customGetByType(String type);
 
     /**
      * 修改文章状态
-     * @param id 文章ID
+     *
+     * @param id     文章ID
      * @param status 显示状态
+     * @return 操作状态
      */
     @CacheEvict(key = "#id")
-    Boolean updateArticleStatus(String id,boolean status);
+    Boolean updateArticleStatus(String id, boolean status);
 }
\ No newline at end of file
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 2a936047..e4f13ce0 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
@@ -30,15 +30,27 @@ import java.util.List;
  * @date 2020-05-5 15:10:16
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class ArticleCategoryServiceImpl extends ServiceImpl<ArticleCategoryMapper, ArticleCategory> implements ArticleCategoryService {
 
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache cache;
-    //文章
+    /**
+     * 文章
+     */
     @Autowired
     private ArticleService articleService;
+    /**
+     * 顶级父分类ID
+     */
+    private String parentId = "0";
+    /**
+     * 最大分类等级
+     */
+    private int maxLevel = 2;
 
     @Override
     public ArticleCategory saveArticleCategory(ArticleCategory articleCategory) {
@@ -46,15 +58,15 @@ public class ArticleCategoryServiceImpl extends ServiceImpl<ArticleCategoryMappe
         List<ArticleCategory> list = this.list(
                 new LambdaQueryWrapper<ArticleCategory>().eq(ArticleCategory::getArticleCategoryName, articleCategory.getArticleCategoryName()));
         if (StringUtils.isNotEmpty(list)) {
-            throw new ServiceException(ResultCode.SUCCESS.ARTICLE_CATEGORY_NAME_EXIST);
+            throw new ServiceException(ResultCode.ARTICLE_CATEGORY_NAME_EXIST);
         }
         //非顶级分类
-        if (articleCategory.getParentId() != null && !articleCategory.getParentId().equals("0")) {
+        if (articleCategory.getParentId() != null && !parentId.equals(articleCategory.getParentId())) {
             ArticleCategory parent = this.getById(articleCategory.getParentId());
             if (parent == null) {
                 throw new ServiceException(ResultCode.ARTICLE_CATEGORY_PARENT_NOT_EXIST);
             }
-            if (articleCategory.getLevel() >= 2) {
+            if (articleCategory.getLevel() >= maxLevel) {
                 throw new ServiceException(ResultCode.ARTICLE_CATEGORY_BEYOND_TWO);
             }
         }
@@ -69,13 +81,13 @@ public class ArticleCategoryServiceImpl extends ServiceImpl<ArticleCategoryMappe
     @Override
     public ArticleCategory updateArticleCategory(ArticleCategory articleCategory) {
         //非顶级分类校验是否存在
-        if (!articleCategory.getParentId().equals("0")) {
+        if (!parentId.equals(articleCategory.getParentId())) {
             ArticleCategory parent = this.getById(articleCategory.getParentId());
             if (parent == null) {
                 throw new ServiceException(ResultCode.ARTICLE_CATEGORY_PARENT_NOT_EXIST);
             }
             //替换catPath 根据path规则来匹配级别
-            if (articleCategory.getLevel() >= 2) {
+            if (articleCategory.getLevel() >= maxLevel) {
                 throw new ServiceException(ResultCode.ARTICLE_CATEGORY_BEYOND_TWO);
             }
         }
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 7cb1d058..3a9a3696 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
@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2020/11/18 11:40 上午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> implements ArticleService {
 
     @Override
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 5e44a2b3..210c24c2 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
@@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020/11/18 11:40 上午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class FeedbackServiceImpl extends ServiceImpl<FeedbackMapper, Feedback> implements FeedbackService {
 
 }
\ No newline at end of file
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 09b6a4f8..60c7fe2b 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
@@ -18,14 +18,16 @@ import org.springframework.stereotype.Service;
 @Service
 public class SpecialServiceImpl extends ServiceImpl<SpecialMapper, Special> implements SpecialService {
 
-    //页面数据
+    /**
+     * 页面数据
+     */
     @Autowired
     private PageDataService pageDataService;
 
     @Override
     public Special addSpecial(Special special) {
         //新建页面
-        PageData pageData=new PageData();
+        PageData pageData = new PageData();
         pageDataService.save(pageData);
 
         //设置专题页面
@@ -38,7 +40,7 @@ public class SpecialServiceImpl extends ServiceImpl<SpecialMapper, Special> impl
     public boolean removeSpecial(String id) {
 
         //删除页面内容
-        Special special=this.getById(id);
+        Special special = this.getById(id);
         pageDataService.removeById(special.getPageDataId());
 
         //删除专题
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 0bb79bb7..3538385a 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
@@ -36,13 +36,19 @@ import java.util.List;
 @Component
 @Slf4j
 public class CashierSupport {
-    //收银台
+    /**
+     * 收银台
+     */
     @Autowired
     private List<CashierExecute> cashierExecuteList;
-    //预存款
+    /**
+     * 预存款
+     */
     @Autowired
     private MemberWalletService memberWalletService;
-    //配置
+    /**
+     * 配置
+     */
     @Autowired
     private SettingService settingService;
 
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 1308cb24..8057c401 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
@@ -1,6 +1,5 @@
 package cn.lili.modules.payment.kit;
 
-import cn.hutool.core.net.URLEncoder;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.vo.ResultMessage;
@@ -10,7 +9,6 @@ import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.nio.charset.StandardCharsets;
 
 /**
  * 支付接口
@@ -156,11 +154,4 @@ public interface Payment {
         return api + "/buyer/cashier/refund/notify/" + paymentMethodEnum.name();
     }
 
-    public static void main(String[] args) {
-        String str = "orderType=TRADE&sn=O202104271386961176205721601";
-        System.out.println(str.length());
-        URLEncoder urlEncoder = new URLEncoder();
-        System.out.println(urlEncoder.encode(str, StandardCharsets.UTF_8));
-    }
-
 }
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 1b9a218c..c00f059c 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
@@ -26,13 +26,19 @@ import java.util.Date;
 @Component
 @Slf4j
 public class RefundSupport {
-    //店铺流水
+    /**
+     * 店铺流水
+     */
     @Autowired
     private StoreFlowService storeFlowService;
-    //售后
+    /**
+     * 售后
+     */
     @Autowired
     private AfterSaleService afterSaleService;
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/HttpKit.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/HttpKit.java
index d6541fe1..56e26508 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/HttpKit.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/HttpKit.java
@@ -59,7 +59,7 @@ public class HttpKit {
      * @return 转化后的 Map
      */
     public static Map<String, String> toMap(HttpServletRequest request) {
-        Map<String, String> params = new HashMap<>();
+        Map<String, String> params = new HashMap<>(16);
         Map<String, String[]> requestParams = request.getParameterMap();
         for (String name : requestParams.keySet()) {
             String[] values = requestParams.get(name);
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 963a1c69..28f32ebf 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
@@ -8,9 +8,21 @@ package cn.lili.modules.payment.kit.enums;
  */
 public enum PaymentMethodEnum {
 
+    /**
+     * 微信
+     */
     WECHAT("wechatPlugin", "微信"),
+    /**
+     * 支付宝
+     */
     ALIPAY("aliPayPlugin", "支付宝"),
+    /**
+     * 余额支付
+     */
     WALLET("walletPlugin", "余额支付"),
+    /**
+     * 线下转账
+     */
     BANK_TRANSFER("bankTransferPlugin", "线下转账");
 
     /**
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 dc0bbc56..5dfc9fe6 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
@@ -32,10 +32,14 @@ import java.util.List;
 @Slf4j
 @Component
 public class OrderCashier implements CashierExecute {
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
-    //设置
+    /**
+     * 设置
+     */
     @Autowired
     private SettingService settingService;
 
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 75fc952e..8478758c 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
@@ -6,15 +6,14 @@ import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
 import cn.lili.modules.order.trade.entity.dos.Recharge;
 import cn.lili.modules.order.trade.service.RechargeService;
-import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
 import cn.lili.modules.payment.kit.dto.PayParam;
+import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
 import cn.lili.modules.payment.kit.enums.CashierEnum;
 import cn.lili.modules.payment.kit.params.CashierExecute;
 import cn.lili.modules.payment.kit.params.dto.CashierParam;
 import cn.lili.modules.system.entity.dto.BaseSetting;
 import cn.lili.modules.system.entity.enums.SettingEnum;
 import cn.lili.modules.system.service.SettingService;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -28,10 +27,14 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class RechargeCashier implements CashierExecute {
-    //余额
+    /**
+     * 余额
+     */
     @Autowired
     private RechargeService rechargeService;
-    //设置
+    /**
+     * 设置
+     */
     @Autowired
     private SettingService settingService;
 
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 6a488b0e..10b7eff9 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
@@ -34,13 +34,19 @@ import java.util.stream.Collectors;
 @Component
 public class TradeCashier implements CashierExecute {
 
-    //交易
+    /**
+     * 交易
+     */
     @Autowired
     private TradeService tradeService;
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
-    //设置
+    /**
+     * 设置
+     */
     @Autowired
     private SettingService settingService;
 
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 b48181c9..71a084cf 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
@@ -941,7 +941,7 @@ public class AliPayApi {
      * @return 转化后的Map
      */
     public static Map<String, String> toMap(HttpServletRequest request) {
-        Map<String, String> params = new HashMap<String, String>();
+        Map<String, String> params = new HashMap<String, String>(16);
         Map<String, String[]> requestParams = request.getParameterMap();
         for (Iterator<String> iter = requestParams.keySet().iterator(); iter.hasNext(); ) {
             String name = iter.next();
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 2af995c9..4d16304b 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
@@ -73,7 +73,7 @@ public class AliPayApiConfigKit {
         certAlipayRequest.setAlipayPublicCertPath(setting.getAlipayPublicCertPath());
         certAlipayRequest.setRootCertPath(setting.getRootCertPath());
         defaultAlipayClient = new DefaultAlipayClient(certAlipayRequest);
-        nextRebuildDate = DateUtil.date(new Date().getTime() + refreshInterval);
+        nextRebuildDate = DateUtil.date(System.currentTimeMillis()+ refreshInterval);
         return defaultAlipayClient;
     }
 }
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 b40406b8..e89f141b 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
@@ -48,19 +48,29 @@ import java.util.Map;
 @Slf4j
 @Component
 public class AliPayPlugin implements Payment {
-    //支付日志
+    /**
+     * 支付日志
+     */
     @Autowired
     private PaymentService paymentService;
-    //退款日志
+    /**
+     * 退款日志
+     */
     @Autowired
     private RefundLogService refundLogService;
-    //收银台
+    /**
+     * 收银台
+     */
     @Autowired
     private CashierSupport cashierSupport;
-    //设置
+    /**
+     * 设置
+     */
     @Autowired
     private SettingService settingService;
-    //API域名
+    /**
+     * API域名
+     */
     @Autowired
     private ApiProperties apiProperties;
 
@@ -149,7 +159,6 @@ public class AliPayPlugin implements Payment {
 
             //回传数据
             payModel.setPassbackParams(URLEncoder.createAll().encode(BeanUtil.formatKeyValuePair(payParam), StandardCharsets.UTF_8));
-//       payModel.setStoreId("store_id");
             payModel.setTimeoutExpress("3m");
             payModel.setOutTradeNo(outTradeNo);
             log.info("支付宝扫码：{}", payModel);
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bankTransfer/BankTransferPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java
similarity index 94%
rename from framework/src/main/java/cn/lili/modules/payment/kit/plugin/bankTransfer/BankTransferPlugin.java
rename to framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java
index a42e97b3..126726a8 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bankTransfer/BankTransferPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java
@@ -1,4 +1,4 @@
-package cn.lili.modules.payment.kit.plugin.bankTransfer;
+package cn.lili.modules.payment.kit.plugin.bank;
 
 import cn.lili.modules.base.entity.enums.ClientTypeEnum;
 import cn.lili.modules.order.order.entity.dos.Order;
@@ -24,10 +24,14 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class BankTransferPlugin implements Payment {
-    //退款日志
+    /**
+     * 退款日志
+     */
     @Autowired
     private RefundLogService refundLogService;
-    //支付日志
+    /**
+     * 支付日志
+     */
     @Autowired
     private PaymentService paymentService;
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java
index 2f3a2749..6d1e0315 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java
@@ -35,16 +35,24 @@ import javax.servlet.http.HttpServletResponse;
 @Component
 public class WalletPlugin implements Payment {
 
-    //支付日志
+    /**
+     * 支付日志
+     */
     @Autowired
     private PaymentService paymentService;
-    //退款日志
+    /**
+     * 退款日志
+     */
     @Autowired
     private RefundLogService refundLogService;
-    //会员余额
+    /**
+     * 会员余额
+     */
     @Autowired
     private MemberWalletService memberWalletService;
-    //收银台
+    /**
+     * 收银台
+     */
     @Autowired
     private CashierSupport cashierSupport;
 
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 efad42a2..6d6ff965 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
@@ -8,10 +8,10 @@ import cn.hutool.json.JSONUtil;
 import cn.lili.common.cache.Cache;
 import cn.lili.common.cache.CachePrefix;
 import cn.lili.common.enums.ResultCode;
+import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.CurrencyUtil;
-import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.ResultMessage;
@@ -52,7 +52,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.cert.X509Certificate;
-import java.util.Date;
 import java.util.Map;
 import java.util.Objects;
 
@@ -66,25 +65,39 @@ import java.util.Objects;
 @Component
 public class WechatPlugin implements Payment {
 
-    //收银台
+    /**
+     * 收银台
+     */
     @Autowired
     private CashierSupport cashierSupport;
-    //支付日志
+    /**
+     * 支付日志
+     */
     @Autowired
     private PaymentService paymentService;
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache<String> cache;
-    //退款日志
+    /**
+     * 退款日志
+     */
     @Autowired
     private RefundLogService refundLogService;
-    //API域名
+    /**
+     * API域名
+     */
     @Autowired
     private ApiProperties apiProperties;
-    //配置
+    /**
+     * 配置
+     */
     @Autowired
     private SettingService settingService;
-    //联合登陆
+    /**
+     * 联合登陆
+     */
     @Autowired
     private ConnectService connectService;
 
@@ -137,7 +150,7 @@ public class WechatPlugin implements Payment {
 
             return ResultUtil.data(JSONUtil.toJsonStr(response.getBody()));
         } catch (Exception e) {
-            log.error("微信H5支付错误",e);
+            log.error("微信H5支付错误", e);
             throw new ServiceException(ResultCode.PAY_ERROR);
         }
     }
@@ -539,7 +552,7 @@ public class WechatPlugin implements Payment {
         String result = HttpKit.readData(request);
         log.info("微信退款通知密文 {}", result);
         JSONObject ciphertext = JSONUtil.parseObj(result);
-        if (!ciphertext.getStr("event_type").equals("REFUND.SUCCESS")) {
+        if (!("REFUND.SUCCESS").equals(ciphertext.getStr("event_type"))) {
             return;
         }
         try {
@@ -558,7 +571,7 @@ public class WechatPlugin implements Payment {
                 refundLogService.saveOrUpdate(refundLog);
             }
         } catch (Exception e) {
-            log.error("微信退款失败",e);
+            log.error("微信退款失败", e);
         }
     }
 
@@ -573,7 +586,7 @@ public class WechatPlugin implements Payment {
             WechatPaymentSetting wechatPaymentSetting = JSONUtil.toBean(systemSetting.getSettingValue(), WechatPaymentSetting.class);
             return wechatPaymentSetting;
         } catch (Exception e) {
-            log.error("微信支付暂不支持",e);
+            log.error("微信支付暂不支持", e);
             throw new ServiceException(ResultCode.PAY_NOT_SUPPORT);
         }
     }
@@ -616,7 +629,7 @@ public class WechatPlugin implements Payment {
                 String cipherText = encryptCertificate.getStr("ciphertext");
                 String nonce = encryptCertificate.getStr("nonce");
                 publicCert = getPlatformCertStr(associatedData, nonce, cipherText);
-                long second = (PayKit.getCertificate(publicCert).getNotAfter().getTime() - new Date().getTime()) / 1000;
+                long second = (PayKit.getCertificate(publicCert).getNotAfter().getTime() - System.currentTimeMillis()) / 1000;
                 cache.put(CachePrefix.WECHAT_PLAT_FORM_CERT.getPrefix(), publicCert, second);
             } else {
                 log.error("证书获取失败：{}" + body);
@@ -624,7 +637,7 @@ public class WechatPlugin implements Payment {
             }
             return PayKit.getCertificate(publicCert);
         } catch (Exception e) {
-            log.error("证书获取失败",e);
+            log.error("证书获取失败", e);
         }
         return null;
     }
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 7986dc9b..d6cf6247 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
@@ -44,5 +44,6 @@ public class AdminUserDTO extends BaseEntity {
     @ApiModelProperty(value = "所属部门id")
     private String departmentId;
 
-    private boolean isSuper;
+    @ApiModelProperty(value = "是否为超级管理员")
+    private Boolean isSuper;
 }
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 047b203b..b3515ce3 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
@@ -15,6 +15,12 @@ import java.util.List;
  */
 public interface MenuMapper extends BaseMapper<Menu> {
 
+    /**
+     * 根据用户获取菜单列表
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
     @Select("SELECT menu.* FROM li_menu AS menu WHERE menu.id IN (" +
             "SELECT rm.menu_id FROM li_role_menu AS rm WHERE rm.role_id IN (" +
             "SELECT ur.role_id FROM li_user_role AS ur WHERE ur.user_id=#{userId}) OR rm.role_id IN (" +
@@ -22,6 +28,12 @@ public interface MenuMapper extends BaseMapper<Menu> {
             "SELECT department_id FROM li_admin_user AS au WHERE au.id = #{userId})))")
     List<Menu> findByUserId(String userId);
 
+    /**
+     * 根据用户获取菜单权限
+     *
+     * @param userId 用户ID
+     * @return 用户菜单VO列表
+     */
     @Select("SELECT rm.is_super,m.*FROM li_menu AS m INNER JOIN li_role_menu AS rm ON rm.menu_id=m.id WHERE rm.role_id IN (" +
             "SELECT ur.role_id FROM li_user_role AS ur WHERE ur.user_id=#{userId}) OR rm.role_id IN (" +
             "SELECT dr.role_id FROM li_department_role AS dr INNER JOIN li_admin_user AS au ON au.department_id=dr.department_id " +
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 7eb150f7..4423c85e 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
@@ -83,10 +83,11 @@ public interface AdminUserService extends IService<AdminUser> {
 
 
     /**
-     * 登录
+     * 用户登录
      *
-     * @param username
-     * @param password
+     * @param username 用户名
+     * @param password 密码
+     * @return token
      */
     Token login(String username, String password);
 
@@ -94,8 +95,8 @@ public interface AdminUserService extends IService<AdminUser> {
      * 刷新token
      *
      * @param refreshToken
-     * @return
+     * @return token
      */
-    Object refreshToken(String refreshToken);
+    Token refreshToken(String refreshToken);
 
 }
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 e0dbd816..b1f21715 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
@@ -38,9 +38,12 @@ public interface SystemLogService {
     /**
      * 分页搜索获取日志
      *
-     * @param key
-     * @param searchVo
-     * @return
+     * @param key          关键字
+     * @param searchVo     查询VO
+     * @param pageVO       分页
+     * @param operatorName 操作人
+     * @param storeId      店铺ID
+     * @return 日志分页
      */
     IPage<SystemLogVO> queryLog(String storeId, String operatorName, String key, SearchVO searchVo, PageVO pageVO);
 }
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 1a6014f9..e63196c9 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
@@ -32,8 +32,8 @@ public interface UserRoleService extends IService<UserRole> {
     /**
      * 更新用户拥有的角色
      *
-     * @param userId
-     * @return
+     * @param userId    角色
+     * @param userRoles 角色权限
      */
     void updateUserRole(String userId, List<UserRole> userRoles);
 
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 831aec4b..5deb5d46 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
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser> implements AdminUserService {
     @Autowired
     private UserRoleService userRoleService;
@@ -53,6 +53,10 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
     private MenuService menuService;
     @Autowired
     private ManagerTokenGenerate managerTokenGenerate;
+    /**
+     * 角色长度
+     */
+    private int rolesMaxSize =10;
 
     @Override
     public IPage<AdminUserVO> adminUserPage(Page initPage, QueryWrapper<AdminUser> initWrapper) {
@@ -124,7 +128,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
 
 
     @Override
-    public Object refreshToken(String refreshToken) {
+    public Token refreshToken(String refreshToken) {
         return managerTokenGenerate.refreshToken(refreshToken);
     }
 
@@ -153,7 +157,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
     @Override
     @SystemLogPoint(description = "修改管理员", customerLog = "'修改管理员:'+#adminUser.username")
     public boolean updateAdminUser(AdminUser adminUser, List<String> roles) {
-        if (roles.size() > 10) {
+        if (roles.size() > rolesMaxSize) {
             throw new ServiceException(ResultCode.PERMISSION_BEYOND_TEN);
         }
         if (roles != null && roles.size() > 0) {
@@ -196,7 +200,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
         AdminUser dbUser = new AdminUser();
         BeanUtil.copyProperties(adminUser, dbUser);
         dbUser.setPassword(new BCryptPasswordEncoder().encode(dbUser.getPassword()));
-        if (roles.size() > 10) {
+        if (roles.size() > rolesMaxSize) {
             throw new ServiceException(ResultCode.PERMISSION_BEYOND_TEN);
         }
         if (roles.size() > 0) {
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 990f5229..cacfa4b0 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
@@ -27,13 +27,17 @@ import java.util.List;
  */
 @Slf4j
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements DepartmentService {
 
-    //管理员
+    /**
+     * 管理员
+     */
     @Autowired
     private AdminUserService adminUserService;
-    //部门角色
+    /**
+     * 部门角色
+     */
     @Autowired
     private DepartmentRoleService departmentRoleService;
 
@@ -58,7 +62,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
             List<DepartmentVO> tree = new ArrayList<>();
             all.forEach(item -> {
-                if (item.getParentId().equals("0")) {
+                if ("0".equals(item.getParentId())) {
                     initChild(item, all);
                     tree.add(item);
                 }
@@ -66,7 +70,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
             return tree;
         } catch (Exception e) {
-            log.error("部门业务错误",e);
+            log.error("部门业务错误", e);
             return null;
         }
     }
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 2bddee5f..5a5d9ba4 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
@@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 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.Comparator;
@@ -33,9 +32,10 @@ import java.util.List;
  */
 @Slf4j
 @Service
-@Transactional
 public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
-    //菜单角色
+    /**
+     * 菜单角色
+     */
     @Autowired
     private RoleMenuService roleMenuService;
 
@@ -98,7 +98,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
             List<Menu> menus = this.list();
             return tree(menus);
         } catch (Exception e) {
-            log.error("菜单树错误",e);
+            log.error("菜单树错误", e);
         }
         return null;
     }
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 cd49e058..9b991eec 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
@@ -25,7 +25,9 @@ import java.util.List;
 @Transactional(rollbackFor = Exception.class)
 public class RoleMenuServiceImpl extends ServiceImpl<RoleMenuMapper, RoleMenu> implements RoleMenuService {
 
-    //菜单
+    /**
+     * 菜单
+     */
     @Resource
     private MenuMapper menuMapper;
 
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 c15296a9..4362f73c 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
@@ -22,13 +22,17 @@ import java.util.List;
  * @date 2020/11/17 3:50 下午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
 
-    //部门角色
+    /**
+     * 部门角色
+     */
     @Autowired
     private DepartmentRoleService departmentRoleService;
-    //用户权限
+    /**
+     * 用户权限
+     */
     @Autowired
     private UserRoleService userRoleService;
 
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 bf5e55b2..dd6724b0 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
@@ -1,6 +1,5 @@
 package cn.lili.modules.permission.serviceimpl;
 
-import cn.lili.common.utils.DateUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.SearchVO;
@@ -27,7 +26,7 @@ import java.util.regex.Pattern;
  * @date 2020/11/17 3:45 下午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class SystemLogServiceImpl implements SystemLogService {
 
     @Autowired
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 8046084b..923835eb 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
@@ -20,7 +20,7 @@ import java.util.List;
  * @date 2020/11/17 3:52 下午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
 
     @Override
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 888edc6e..2fb53534 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
@@ -4,8 +4,6 @@ import cn.lili.modules.promotion.entity.dos.CouponActivity;
 import cn.lili.modules.promotion.entity.dos.CouponActivityItem;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.beans.factory.annotation.Required;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
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 29faba67..cc6148bc 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
@@ -8,7 +8,13 @@ package cn.lili.modules.promotion.entity.enums;
  */
 public enum CouponActivitySendTypeEnum {
 
+    /**
+     * "全部会员"
+     */
     ALL("全部会员"),
+    /**
+     * "指定会员"
+     */
     DESIGNATED("指定会员");
 
     private final String description;
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 323d38f7..c127d9f9 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
@@ -8,7 +8,13 @@ package cn.lili.modules.promotion.entity.enums;
  */
 public enum CouponActivityTypeEnum {
 
+    /**
+     * "新人赠券"
+     */
     REGISTERED("新人赠券"),
+    /**
+     * "精确发券"
+     */
     SPECIFY("精确发券");
 
     private final String description;
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 15affff3..bc9e13ff 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
@@ -8,7 +8,22 @@ package cn.lili.modules.promotion.entity.enums;
  */
 public enum PromotionStatusEnum {
 
-    NEW("新建"), START("开始/上架"), END("结束/下架"), CLOSE("紧急关闭/作废");
+    /**
+     * 新建
+     */
+    NEW("新建"),
+    /**
+     * 开始/上架
+     */
+    START("开始/上架"),
+    /**
+     * 结束/下架
+     */
+    END("结束/下架"),
+    /**
+     * 紧急关闭/作废
+     */
+    CLOSE("紧急关闭/作废");
 
     private final String description;
 
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 ec251625..168d97a4 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
@@ -4,18 +4,23 @@ import cn.lili.modules.promotion.entity.dos.CouponActivityItem;
 import cn.lili.modules.promotion.entity.vos.CouponActivityItemVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
 /**
  * 优惠券活动
+ *
  * @author Bulbasaur
  * @date: 2021/5/20 6:11 下午
- *
  */
 public interface CouponActivityItemMapper extends BaseMapper<CouponActivityItem> {
 
+    /**
+     * 获取优惠券活动关联优惠券列表VO
+     *
+     * @param activityId 优惠券活动ID
+     * @return 优惠券活动关联优惠券列表VO
+     */
     @Select("SELECT cai.*,c.coupon_name,c.price,c.coupon_type,c.coupon_discount FROM li_coupon_activity_item cai INNER JOIN li_coupon c ON cai.coupon_id = c.id WHERE cai.activity_id= #{activityId} ")
     List<CouponActivityItemVO> getCouponActivityItemListVO(String activityId);
 }
\ No newline at end of file
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 d3e32af8..1566a47c 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
@@ -17,7 +17,13 @@ import org.apache.ibatis.annotations.Select;
  **/
 public interface PointsGoodsMapper extends BaseMapper<PointsGoods> {
 
-
+    /**
+     * 积分商品分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 积分商品分页
+     */
     @Select("select * from points_goods pg left join goods_sku gs on pg.sku_id = gs.id ${ew.customSqlSegment}")
     IPage<PointsGoodsVO> getPointsGoodsVO(IPage<PointsGoodsVO> page, @Param(Constants.WRAPPER) Wrapper<PointsGoodsVO> queryWrapper);
 
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 1025ac25..c6ac77eb 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
@@ -41,6 +41,7 @@ public interface PromotionGoodsMapper extends BaseMapper<PromotionGoods> {
      * @param skuId         skuId
      * @param startTime     开始时间
      * @param endTime       结束时间
+     * @param promotionId   促销活动ID
      * @return 共参加了几种活动
      */
     @Select("select count(0) from li_promotion_goods where promotion_type = #{promotionType} and sku_id = #{skuId} and (" +
@@ -48,8 +49,8 @@ public interface PromotionGoodsMapper extends BaseMapper<PromotionGoods> {
             "( start_time < #{startTime}  && end_time > #{endTime} ) || ( start_time > #{startTime}  && end_time < #{endTime} )" +
             " || promotion_status = 'START' ) and promotion_id != #{promotionId}")
     Integer selectInnerOverlapPromotionGoodsWithout(@Param("promotionType") String promotionType,
-                                             @Param("skuId") String skuId,
-                                             @Param("startTime") Date startTime,
-                                             @Param("endTime") Date endTime,
-                                             @Param("promotionId") String promotionId);
+                                                    @Param("skuId") String skuId,
+                                                    @Param("startTime") Date startTime,
+                                                    @Param("endTime") Date endTime,
+                                                    @Param("promotionId") String promotionId);
 }
\ No newline at end of file
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 9491fc6d..5eeb4f2c 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
@@ -12,6 +12,11 @@ import org.apache.ibatis.annotations.Update;
  */
 public interface SeckillMapper extends BaseMapper<Seckill> {
 
+    /**
+     * 修改秒杀活动数量
+     *
+     * @param seckillId 秒杀活动ID
+     */
     @Update("UPDATE li_seckill SET goods_num =( SELECT count( id ) FROM li_seckill_apply WHERE seckill_id = #{seckillId} ) WHERE id = #{seckillId}")
     void updateSeckillGoodsNum(String seckillId);
 }
\ No newline at end of file
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 7b5fd0d4..b51f3ef0 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
@@ -21,6 +21,7 @@ public interface CouponActivityService extends IService<CouponActivity> {
      * 创建优惠券活动--精准发券、新人赠券
      *
      * @param couponActivityDTO 优惠券活动DTO
+     * @return 优惠券活动DTO
      */
     CouponActivityDTO addCouponActivity(CouponActivityDTO couponActivityDTO);
 
@@ -28,6 +29,7 @@ public interface CouponActivityService extends IService<CouponActivity> {
      * 修改优惠券活动--精准发券、新人赠券
      *
      * @param couponActivityDTO 优惠券活动DTO
+     * @return 优惠券活动DTO
      */
     CouponActivityDTO updateCouponActivity(CouponActivityDTO couponActivityDTO);
 
@@ -57,7 +59,11 @@ public interface CouponActivityService extends IService<CouponActivity> {
 
 
     /**
-     * 关闭优惠券活动
+     * 修改优惠券活动状态
+     *
+     * @param id              活动ID
+     * @param promotionStatus 活动状态
+     * @return 操作状态
      */
     boolean updateCouponActivityStatus(String id, PromotionStatusEnum promotionStatus);
 }
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 cef85ea4..d7b471eb 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
@@ -16,7 +16,8 @@ public interface MemberAddressService extends IService<MemberAddress> {
     /**
      * 根据会员获取会员地址分页列表
      *
-     * @param page 分页条件
+     * @param page     分页条件
+     * @param memberId 会员ID
      * @return 会员地址分页列表
      */
     IPage<MemberAddress> getAddressByMember(PageVO page, String memberId);
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 a8aa97c0..35f0556a 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
@@ -18,7 +18,10 @@ import cn.lili.modules.promotion.entity.dos.CouponActivity;
 import cn.lili.modules.promotion.entity.dos.CouponActivityItem;
 import cn.lili.modules.promotion.entity.dos.MemberCoupon;
 import cn.lili.modules.promotion.entity.dto.CouponActivityDTO;
-import cn.lili.modules.promotion.entity.enums.*;
+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.modules.promotion.entity.vos.CouponActivityVO;
 import cn.lili.modules.promotion.mapper.CouponActivityMapper;
 import cn.lili.modules.promotion.service.CouponActivityItemService;
@@ -35,8 +38,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 
-import static cn.lili.common.enums.ResultCode.COUPON_ACTIVITY_ITEM_ERROR;
-
 /**
  * 优惠券活动业务层实现
  *
@@ -55,10 +56,8 @@ public class CouponActivityServiceImpl extends ServiceImpl<CouponActivityMapper,
     private CouponActivityItemService couponActivityItemService;
     @Autowired
     private MemberService memberService;
-    //Rocketmq
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
-    //延时任务
     @Autowired
     private TimeTrigger timeTrigger;
 
@@ -139,7 +138,7 @@ public class CouponActivityServiceImpl extends ServiceImpl<CouponActivityMapper,
         for (CouponActivity couponActivity : couponActivityList) {
             //获取会员信息
             List<Map<String, Object>> memberList = new ArrayList<>();
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = new HashMap<>(2);
             map.put("id", member.getId());
             map.put("nick_name", member.getNickName());
             memberList.add(map);
@@ -178,7 +177,7 @@ public class CouponActivityServiceImpl extends ServiceImpl<CouponActivityMapper,
             if (coupon != null) {
                 List<MemberCoupon> memberCouponList = new LinkedList<>();
                 //循环优惠券的领取数量
-                int j=couponActivityItem.getNum();
+                int j = couponActivityItem.getNum();
                 for (int i = 1; i <= j; i++) {
                     //循环会员列表，添加优惠券
                     for (Map<String, Object> map : memberList) {
@@ -186,7 +185,7 @@ public class CouponActivityServiceImpl extends ServiceImpl<CouponActivityMapper,
                         memberCoupon.setMemberId(map.get("id").toString());
                         memberCoupon.setMemberName(map.get("nick_name").toString());
                         memberCoupon.setMemberCouponStatus(MemberCouponStatusEnum.NEW.name());
-                        memberCoupon.setIsPlatform(coupon.getStoreId().equals("platform"));
+                        memberCoupon.setIsPlatform("platform".equals(coupon.getStoreId()));
                         memberCouponList.add(memberCoupon);
                     }
                 }
@@ -244,7 +243,7 @@ public class CouponActivityServiceImpl extends ServiceImpl<CouponActivityMapper,
      */
     private List<Map<String, Object>> getMemberList(CouponActivity couponActivity) {
         //判断优惠券的发送范围，获取会员列表
-        if (couponActivity.getActivityScope().equals("ALL")) {
+        if ("ALL".equals(couponActivity.getActivityScope())) {
             return memberService.listMaps(new QueryWrapper<Member>()
                     .select("id,nick_name"));
         } else {
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 1fd5bee2..666b7539 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
@@ -2,13 +2,13 @@ package cn.lili.modules.promotion.serviceimpl;
 
 import cn.hutool.core.text.CharSequenceUtil;
 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.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.utils.DateUtil;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.utils.StringUtils;
@@ -50,28 +50,44 @@ import java.util.stream.Collectors;
 @Transactional(rollbackFor = Exception.class)
 public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> implements CouponService {
 
-    //延时任务
+    /**
+     * 延时任务
+     */
     @Autowired
     private TimeTrigger timeTrigger;
-    //Mongo
+    /**
+     * Mongo
+     */
     @Autowired
     private MongoTemplate mongoTemplate;
-    //规格商品
+    /**
+     * 规格商品
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
-    //Rocketmq
+    /**
+     * Rocketmq
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
-    //促销商品
+    /**
+     * 促销商品
+     */
     @Autowired
     private PromotionGoodsService promotionGoodsService;
-    //会员优惠券
+    /**
+     * 会员优惠券
+     */
     @Autowired
     private MemberCouponService memberCouponService;
-    //满额活动
+    /**
+     * 满额活动
+     */
     @Autowired
     private FullDiscountService fullDiscountService;
-    //优惠券活动-优惠券关联
+    /**
+     * 优惠券活动-优惠券关联
+     */
     @Autowired
     private CouponActivityItemService couponActivityItemService;
 
@@ -179,7 +195,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
 
         //删除优惠券活动关联优惠券
         couponActivityItemService.remove(new LambdaQueryWrapper<CouponActivityItem>()
-                .eq(CouponActivityItem::getCouponId,id));
+                .eq(CouponActivityItem::getCouponId, id));
 
         //删除延时任务
         this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR,
@@ -289,8 +305,9 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
         if (coupon.getPublishNum() != 0 && coupon.getCouponLimitNum() > coupon.getPublishNum()) {
             throw new ServiceException(ResultCode.COUPON_LIMIT_GREATER_THAN_PUBLISH);
         }
-
-        if (coupon.getCouponType().equals(CouponTypeEnum.DISCOUNT.name()) && (coupon.getCouponDiscount() < 0 && coupon.getCouponDiscount() > 10)) {
+        boolean discountCoupon = (coupon.getCouponType().equals(CouponTypeEnum.DISCOUNT.name())
+                && (coupon.getCouponDiscount() < 0 && coupon.getCouponDiscount() > 10));
+        if (discountCoupon) {
             throw new ServiceException(ResultCode.COUPON_DISCOUNT_ERROR);
         }
 
@@ -314,7 +331,9 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
      * @param coupon 检查的优惠券对象
      */
     private void checkCouponScope(CouponVO coupon) {
-        if (coupon.getScopeType().equals(CouponScopeTypeEnum.PORTION_GOODS.name()) && (coupon.getPromotionGoodsList() == null || coupon.getPromotionGoodsList().isEmpty())) {
+        boolean portionGoodsScope = (coupon.getScopeType().equals(CouponScopeTypeEnum.PORTION_GOODS.name())
+                && (coupon.getPromotionGoodsList() == null || coupon.getPromotionGoodsList().isEmpty()));
+        if (portionGoodsScope) {
             throw new ServiceException(ResultCode.COUPON_SCOPE_TYPE_GOODS_ERROR);
         } else if (coupon.getScopeType().equals(CouponScopeTypeEnum.PORTION_GOODS.name()) && CharSequenceUtil.isEmpty(coupon.getScopeId())) {
             throw new ServiceException(ResultCode.COUPON_SCOPE_TYPE_GOODS_ERROR);
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 404afe4a..b2b0a962 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
@@ -51,19 +51,29 @@ public class FullDiscountServiceImpl extends ServiceImpl<FullDiscountMapper, Ful
     private static final String SELLER_ID_COLUMN = "storeId";
     private static final String PROMOTION_STATUS_COLUMN = "promotionStatus";
 
-    //延时任务
+    /**
+     * 延时任务
+     */
     @Autowired
     private TimeTrigger timeTrigger;
-    //Mongo
+    /**
+     * Mongo
+     */
     @Autowired
     private MongoTemplate mongoTemplate;
-    //Rocketmq
+    /**
+     * Rocketmq
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
-    //优惠券
+    /**
+     * 优惠券
+     */
     @Autowired
     private CouponService couponService;
-    //促销商品
+    /**
+     * 促销商品
+     */
     @Autowired
     private PromotionGoodsService promotionGoodsService;
 
@@ -111,6 +121,7 @@ public class FullDiscountServiceImpl extends ServiceImpl<FullDiscountMapper, Ful
         return fullDiscountVO;
     }
 
+    @Override
     public IPage<FullDiscount> getFullDiscountByPageFromMysql(FullDiscountSearchParams searchParams, PageVO page) {
         QueryWrapper<FullDiscount> queryWrapper = searchParams.wrapper();
         return this.page(PageUtil.initPage(page), queryWrapper);
@@ -118,17 +129,17 @@ public class FullDiscountServiceImpl extends ServiceImpl<FullDiscountMapper, Ful
 
     @Override
     public IPage<FullDiscountVO> getFullDiscountByPageFromMongo(FullDiscountSearchParams searchParams, PageVO page) {
-        IPage<FullDiscountVO> fullDiscountIPage = new Page<>();
+        IPage<FullDiscountVO> fullDiscountPage = new Page<>();
         Query query = searchParams.mongoQuery();
         if (page != null) {
             PromotionTools.mongoQueryPageParam(query, page);
-            fullDiscountIPage.setCurrent(page.getPageNumber());
-            fullDiscountIPage.setSize(page.getPageSize());
+            fullDiscountPage.setCurrent(page.getPageNumber());
+            fullDiscountPage.setSize(page.getPageSize());
         }
         List<FullDiscountVO> fullDiscountVOS = this.mongoTemplate.find(query, FullDiscountVO.class);
-        fullDiscountIPage.setRecords(fullDiscountVOS);
-        fullDiscountIPage.setTotal(this.mongoTemplate.count(query, FullDiscountVO.class));
-        return fullDiscountIPage;
+        fullDiscountPage.setRecords(fullDiscountVOS);
+        fullDiscountPage.setTotal(this.mongoTemplate.count(query, FullDiscountVO.class));
+        return fullDiscountPage;
     }
 
     @Override
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 410caf25..1dbb454a 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
@@ -72,7 +72,7 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
             memberCoupon.setMemberId(memberId);
             memberCoupon.setMemberName(memberName);
             memberCoupon.setMemberCouponStatus(MemberCouponStatusEnum.NEW.name());
-            memberCoupon.setIsPlatform(coupon.getStoreId().equals("platform"));
+            memberCoupon.setIsPlatform(("platform").equals(coupon.getStoreId()));
             this.save(memberCoupon);
             couponService.receiveCoupon(couponId, 1);
         } else {
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 a5d7b1c4..a094fd7d 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
@@ -1,6 +1,7 @@
 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;
@@ -60,25 +61,39 @@ import java.util.stream.Collectors;
 @Transactional(rollbackFor = Exception.class)
 public class PintuanServiceImpl extends ServiceImpl<PintuanMapper, Pintuan> implements PintuanService {
 
-    //延时任务
+    /**
+     * 延时任务
+     */
     @Autowired
     private TimeTrigger timeTrigger;
-    //Mongo
+    /**
+     * Mongo
+     */
     @Autowired
     private MongoTemplate mongoTemplate;
-    //促销商品
+    /**
+     * 促销商品
+     */
     @Autowired
     private PromotionGoodsService promotionGoodsService;
-    //规格商品
+    /**
+     * 规格商品
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
-    //会员
+    /**
+     * 会员
+     */
     @Autowired
     private MemberService memberService;
-    //Rocketmq
+    /**
+     * RocketMQ
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
 
@@ -271,7 +286,7 @@ public class PintuanServiceImpl extends ServiceImpl<PintuanMapper, Pintuan> impl
             queryWrapper.eq(Order::getPromotionId, pintuanId);
             queryWrapper.nested(i -> i.eq(Order::getPayStatus, PayStatusEnum.PAID.name()).or().eq(Order::getOrderStatus, OrderStatusEnum.PAID.name()));
             //过滤父级拼团订单，根据父级拼团订单分组
-            Map<String, List<Order>> collect = orderService.list(queryWrapper).stream().filter(i -> !i.getParentOrderSn().equals("")).collect(Collectors.groupingBy(Order::getParentOrderSn));
+            Map<String, List<Order>> collect = orderService.list(queryWrapper).stream().filter(i -> StrUtil.isNotEmpty(i.getParentOrderSn())).collect(Collectors.groupingBy(Order::getParentOrderSn));
             this.isOpenFictitiousPintuan(pintuan, collect);
 
         }
@@ -355,7 +370,7 @@ public class PintuanServiceImpl extends ServiceImpl<PintuanMapper, Pintuan> impl
         for (Order order : orders) {
             Member member = memberService.getById(order.getMemberId());
             PintuanMemberVO memberVO = new PintuanMemberVO(member);
-            if (order.getParentOrderSn().equals("")) {
+            if (StrUtil.isEmpty(order.getParentOrderSn())) {
                 memberVO.setOrderSn("");
                 PromotionGoods promotionGoods = promotionGoodsService.getPromotionGoods(PromotionTypeEnum.PINTUAN, order.getPromotionId(), skuId);
                 if (promotionGoods == null) {
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 042213c3..b3a10458 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
@@ -48,19 +48,29 @@ import java.util.List;
 @Transactional(rollbackFor = Exception.class)
 public class PointsGoodsServiceImpl extends ServiceImpl<PointsGoodsMapper, PointsGoods> implements PointsGoodsService {
 
-    //延时任务
+    /**
+     * 延时任务
+     */
     @Autowired
     private TimeTrigger timeTrigger;
-    //Mongo
+    /**
+     * Mongo
+     */
     @Autowired
     private MongoTemplate mongoTemplate;
-    //Rocketmq
+    /**
+     * RocketMQ
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
-    //规格商品
+    /**
+     * 规格商品
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
-    //Es商品
+    /**
+     * Es商品
+     */
     @Autowired
     private EsGoodsIndexService goodsIndexService;
 
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 b9993dda..470dffb8 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
@@ -60,22 +60,34 @@ import java.util.List;
 
 public class PromotionGoodsServiceImpl extends ServiceImpl<PromotionGoodsMapper, PromotionGoods> implements PromotionGoodsService {
 
-    //Mongo
+    /**
+     * Mongo
+     */
     @Autowired
     private MongoTemplate mongoTemplate;
-    //Redis
+    /**
+     * Redis
+     */
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
-    //秒杀活动申请
+    /**
+     * 秒杀活动申请
+     */
     @Autowired
     private SeckillApplyService seckillApplyService;
-    //规格商品
+    /**
+     * 规格商品
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
-    //积分商品
+    /**
+     * 积分商品
+     */
     @Autowired
     private PointsGoodsService pointsGoodsService;
-    //分销商品
+    /**
+     * 分销商品
+     */
     @Autowired
     private DistributionGoodsService distributionGoodsService;
 
@@ -159,8 +171,10 @@ public class PromotionGoodsServiceImpl extends ServiceImpl<PromotionGoodsMapper,
         //单独检查，添加适用于全品类的全平台或属于当前店铺的满优惠活动
         List<CouponVO> couponVOS = mongoTemplate.find(query, CouponVO.class);
         for (CouponVO couponVO : couponVOS) {
-            if (couponVO.getPromotionGoodsList() == null && couponVO.getScopeType().equals(CouponScopeTypeEnum.ALL.name()) &&
-                    (couponVO.getStoreId().equals("0") || cartSkuVO.getStoreId().equals(couponVO.getStoreId()))) {
+            boolean aLLScopeType = (couponVO.getPromotionGoodsList() == null
+                    && couponVO.getScopeType().equals(CouponScopeTypeEnum.ALL.name())
+                    && (("0").equals(couponVO.getStoreId()) || cartSkuVO.getStoreId().equals(couponVO.getStoreId())));
+            if (aLLScopeType) {
                 PromotionGoods p = new PromotionGoods(cartSkuVO.getGoodsSku());
                 p.setPromotionId(couponVO.getId());
                 p.setPromotionStatus(couponVO.getPromotionStatus());
@@ -273,7 +287,7 @@ public class PromotionGoodsServiceImpl extends ServiceImpl<PromotionGoodsMapper,
         if (promotionGoods == null) {
             throw new ServiceException(ResultCode.PROMOTION_GOODS_NOT_EXIT);
         }
-        if (promotionGoodsStock != null && CharSequenceUtil.isNotEmpty(promotionGoodsStock) && promotionGoods.getQuantity() == Convert.toInt(promotionGoodsStock)) {
+        if (promotionGoodsStock != null && CharSequenceUtil.isNotEmpty(promotionGoodsStock) && promotionGoods.getQuantity().equals(Convert.toInt(promotionGoodsStock))) {
             return Convert.toInt(promotionGoodsStock);
         } else {
             stringRedisTemplate.opsForValue().set(promotionStockKey, promotionGoods.getQuantity().toString());
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 cf47827c..d3d06fa8 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
@@ -30,16 +30,24 @@ import java.util.stream.Collectors;
 @Slf4j
 public class PromotionPriceServiceImpl implements PromotionPriceService {
 
-    //ES商品
+    /**
+     * ES商品
+     */
     @Autowired
     private EsGoodsSearchService goodsSearchService;
-    //秒杀活动申请
+    /**
+     * 秒杀活动申请
+     */
     @Autowired
     private SeckillApplyService seckillApplyService;
-    //促销商品
+    /**
+     * 促销商品
+     */
     @Autowired
     private PromotionGoodsService promotionGoodsService;
-    //规格商品
+    /**
+     * 规格商品
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
 
@@ -302,14 +310,6 @@ public class PromotionPriceServiceImpl implements PromotionPriceService {
             double discountRatePrice = CurrencyUtil.sub(totalPrice, CurrencyUtil.mul(totalPrice, fullRate));
 
             couponTotalPrice = CurrencyUtil.add(couponTotalPrice, discountRatePrice);
-            //消费限额判断
-//           if (coupon.getConsumeThreshold() >= discountRatePrice) {
-//               couponTotalPrice = CurrencyUtil.add(couponTotalPrice, discountRatePrice);
-//               discountPrice = discountRatePrice;
-//           } else {
-//               couponTotalPrice = CurrencyUtil.add(couponTotalPrice, coupon.getConsumeThreshold());
-//               discountPrice = coupon.getConsumeThreshold();
-//           }
         }
 
         //分配到每个商品的优惠券金额
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 be72adee..918c7b90 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
@@ -37,37 +37,59 @@ import java.util.*;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class PromotionServiceImpl implements PromotionService {
-    //会员优惠券
+    /**
+     * 会员优惠券
+     */
     @Autowired
     private MemberCouponService memberCouponService;
-    //秒杀
+    /**
+     * 秒杀
+     */
     @Autowired
     private SeckillService seckillService;
-    //秒杀申请
+    /**
+     * 秒杀申请
+     */
     @Autowired
     private SeckillApplyService seckillApplyService;
-    //满额活动
+    /**
+     * 满额活动
+     */
     @Autowired
     private FullDiscountService fullDiscountService;
-    //拼团
+    /**
+     * 拼团
+     */
     @Autowired
     private PintuanService pintuanService;
-    //优惠券
+    /**
+     * 优惠券
+     */
     @Autowired
     private CouponService couponService;
-    //促销商品
+    /**
+     * 促销商品
+     */
     @Autowired
     private PromotionGoodsService promotionGoodsService;
-    //积分商品
+    /**
+     * 积分商品
+     */
     @Autowired
     private PointsGoodsService pointsGoodsService;
-    //优惠券活动
+    /**
+     * 优惠券活动
+     */
     @Autowired
     private CouponActivityService couponActivityService;
-    //ES商品
+    /**
+     * ES商品
+     */
     @Autowired
     private EsGoodsIndexService goodsIndexService;
-    //Mongo
+    /**
+     * Mongo
+     */
     @Autowired
     private MongoTemplate mongoTemplate;
 
@@ -117,7 +139,7 @@ public class PromotionServiceImpl implements PromotionService {
      */
     @Override
     public Map<String, Object> getCurrentPromotion() {
-        Map<String, Object> resultMap = new HashMap<>();
+        Map<String, Object> resultMap = new HashMap<>(16);
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("promotion_status", PromotionStatusEnum.START.name());
         queryWrapper.gt("start_time", new Date());
@@ -154,7 +176,7 @@ public class PromotionServiceImpl implements PromotionService {
      */
     @Override
     public Map<String, Object> getGoodsCurrentPromotionMap(EsGoodsIndex index) {
-        Map<String, Object> promotionMap = new HashMap<>();
+        Map<String, Object> promotionMap = new HashMap<>(16);
         Query query = new Query();
         query.addCriteria(Criteria.where("deleteFlag").is(false));
         query.addCriteria(Criteria.where("promotionStatus").is(PromotionStatusEnum.START.name()));
@@ -171,7 +193,7 @@ public class PromotionServiceImpl implements PromotionService {
         List<CouponVO> couponVOS = mongoTemplate.find(query, CouponVO.class);
         for (CouponVO couponVO : couponVOS) {
             if (couponVO.getPromotionGoodsList() == null && couponVO.getScopeType().equals(CouponScopeTypeEnum.ALL.name())) {
-                if (couponVO.getStoreId().equals("platform") || index.getStoreId().equals(couponVO.getStoreId())) {
+                if (("platform").equals(couponVO.getStoreId()) || index.getStoreId().equals(couponVO.getStoreId())) {
                     String couponKey = PromotionTypeEnum.COUPON.name() + "-" + couponVO.getId();
                     promotionMap.put(couponKey, couponVO);
                 }
@@ -233,8 +255,9 @@ public class PromotionServiceImpl implements PromotionService {
 
     /**
      * 修改满额活动状态
-     * @param promotionMessage 信息队列传输促销信息实体
-     * @param esPromotionKey es Key
+     *
+     * @param promotionMessage  信息队列传输促销信息实体
+     * @param esPromotionKey    es Key
      * @param promotionTypeEnum 促销分类枚举
      * @return 修改结果
      */
@@ -270,8 +293,9 @@ public class PromotionServiceImpl implements PromotionService {
 
     /**
      * 修改优惠券状态
-     * @param promotionMessage 信息队列传输促销信息实体
-     * @param esPromotionKey es Key
+     *
+     * @param promotionMessage  信息队列传输促销信息实体
+     * @param esPromotionKey    es Key
      * @param promotionTypeEnum 促销分类枚举
      * @return 修改结果
      */
@@ -287,7 +311,7 @@ public class PromotionServiceImpl implements PromotionService {
         couponVO.setPromotionStatus(promotionMessage.getPromotionStatus());
         result = this.couponService.update(promotionMessage.updateWrapper());
         //优惠券活动结束，会员已领取未使用的优惠券状态修改为：已过期
-        if(couponVO.getPromotionStatus().equals(PromotionStatusEnum.END)){
+        if (couponVO.getPromotionStatus().equals(PromotionStatusEnum.END)) {
             LambdaUpdateWrapper<MemberCoupon> updateWrapper = new LambdaUpdateWrapper<MemberCoupon>()
                     .eq(MemberCoupon::getCouponId, couponVO.getId())
                     .eq(MemberCoupon::getMemberCouponStatus, MemberCouponStatusEnum.NEW.name())
@@ -311,12 +335,13 @@ public class PromotionServiceImpl implements PromotionService {
 
     /**
      * 修改拼团状态
-     * @param promotionMessage 信息队列传输促销信息实体
-     * @param esPromotionKey es Key
+     *
+     * @param promotionMessage  信息队列传输促销信息实体
+     * @param esPromotionKey    es Key
      * @param promotionTypeEnum 促销分类枚举
      * @return 修改结果
      */
-    private boolean updatePintuan(PromotionMessage promotionMessage, String esPromotionKey, PromotionTypeEnum promotionTypeEnum){
+    private boolean updatePintuan(PromotionMessage promotionMessage, String esPromotionKey, PromotionTypeEnum promotionTypeEnum) {
         boolean result;
         PintuanVO pintuanVO = this.mongoTemplate.findById(promotionMessage.getPromotionId(), PintuanVO.class);
         if (pintuanVO == null) {
@@ -342,12 +367,13 @@ public class PromotionServiceImpl implements PromotionService {
 
     /**
      * 修改秒杀状态
-     * @param promotionMessage 信息队列传输促销信息实体
-     * @param esPromotionKey es Key
+     *
+     * @param promotionMessage  信息队列传输促销信息实体
+     * @param esPromotionKey    es Key
      * @param promotionTypeEnum 促销分类枚举
      * @return 修改结果
      */
-    private boolean updateSeckill(PromotionMessage promotionMessage, String esPromotionKey, PromotionTypeEnum promotionTypeEnum){
+    private boolean updateSeckill(PromotionMessage promotionMessage, String esPromotionKey, PromotionTypeEnum promotionTypeEnum) {
         boolean result;
         SeckillVO seckill = this.mongoTemplate.findById(promotionMessage.getPromotionId(), SeckillVO.class);
         if (seckill == null) {
@@ -360,7 +386,7 @@ public class PromotionServiceImpl implements PromotionService {
         result = this.seckillService.update(promotionMessage.updateWrapper());
 
         //判断参与活动的商品是否为空，如果为空则返回
-        if(seckill.getSeckillApplyList()==null){
+        if (seckill.getSeckillApplyList() == null) {
             return result;
         }
 
@@ -399,12 +425,13 @@ public class PromotionServiceImpl implements PromotionService {
 
     /**
      * 修改积分商品状态
-     * @param promotionMessage 信息队列传输促销信息实体
-     * @param esPromotionKey es Key
+     *
+     * @param promotionMessage  信息队列传输促销信息实体
+     * @param esPromotionKey    es Key
      * @param promotionTypeEnum 促销分类枚举
      * @return 修改结果
      */
-    private boolean updatePointsGoods(PromotionMessage promotionMessage, String esPromotionKey, PromotionTypeEnum promotionTypeEnum){
+    private boolean updatePointsGoods(PromotionMessage promotionMessage, String esPromotionKey, PromotionTypeEnum promotionTypeEnum) {
         boolean result;
         PointsGoodsVO pointsGoodsVO = this.mongoTemplate.findById(promotionMessage.getPromotionId(), PointsGoodsVO.class);
         if (pointsGoodsVO == null) {
@@ -421,28 +448,29 @@ public class PromotionServiceImpl implements PromotionService {
 
     /**
      * 修改优惠券活动状态
-     * @param promotionMessage 信息队列传输促销信息实体
+     *
+     * @param promotionMessage  信息队列传输促销信息实体
      * @param promotionTypeEnum 促销分类枚举
      * @return 修改结果
      */
-    private boolean updateCouponActivity(PromotionMessage promotionMessage, PromotionTypeEnum promotionTypeEnum){
+    private boolean updateCouponActivity(PromotionMessage promotionMessage, PromotionTypeEnum promotionTypeEnum) {
 
         //如果是精准发券，进行发送优惠券
-        CouponActivity couponActivity=couponActivityService.getById(promotionMessage.getPromotionId());
-        if(couponActivity.getCouponActivityType().equals(CouponActivityTypeEnum.SPECIFY.name())){
+        CouponActivity couponActivity = couponActivityService.getById(promotionMessage.getPromotionId());
+        if (couponActivity.getCouponActivityType().equals(CouponActivityTypeEnum.SPECIFY.name())) {
             couponActivityService.specify(couponActivity.getId());
         }
 
         //修改活动状态
         return couponActivityService.update(new LambdaUpdateWrapper<CouponActivity>()
-                        .eq(CouponActivity::getId,promotionMessage.getPromotionId())
-                        .set(CouponActivity::getPromotionStatus,promotionMessage.getPromotionStatus()));
+                .eq(CouponActivity::getId, promotionMessage.getPromotionId())
+                .set(CouponActivity::getPromotionStatus, promotionMessage.getPromotionStatus()));
     }
 
     /**
      * 更新促销商品信息
      *
-     * @param promotionId 促销活动ID
+     * @param promotionId     促销活动ID
      * @param promotionStatus 活动状态
      */
     private void updatePromotionGoods(String promotionId, String promotionStatus) {
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 264dce83..5f3a916f 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
@@ -25,7 +25,6 @@ import cn.lili.modules.promotion.service.SeckillApplyService;
 import cn.lili.modules.promotion.service.SeckillService;
 import cn.lili.modules.promotion.tools.PromotionCacheKeys;
 import cn.lili.modules.promotion.tools.PromotionTools;
-import cn.lili.modules.search.service.EsGoodsIndexService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -50,22 +49,29 @@ import java.util.stream.Collectors;
 @Transactional(rollbackFor = Exception.class)
 public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, SeckillApply> implements SeckillApplyService {
 
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache<Object> cache;
-    //Mongo
+    /**
+     * Mongo
+     */
     @Autowired
     private MongoTemplate mongoTemplate;
-    //规格商品
+    /**
+     * 规格商品
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
-    //ES商品
-    @Autowired
-    private EsGoodsIndexService esGoodsIndexService;
-    //促销商品
+    /**
+     * 促销商品
+     */
     @Autowired
     private PromotionGoodsService promotionGoodsService;
-    //秒杀
+    /**
+     * 秒杀
+     */
     @Autowired
     private SeckillService seckillService;
 
@@ -115,13 +121,13 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
 
     @Override
     public IPage<SeckillApply> getSeckillApplyFromMongo(SeckillSearchParams queryParam, PageVO pageVo) {
-        IPage<SeckillApply> seckillApplyIPage = new Page<>();
+        IPage<SeckillApply> seckillApplyPage = new Page<>();
         Query query = queryParam.mongoQuery();
 
         SeckillVO seckillVO = this.mongoTemplate.findOne(query, SeckillVO.class);
         if (seckillVO != null && pageVo != null) {
-            seckillApplyIPage.setCurrent(pageVo.getMongoPageNumber());
-            seckillApplyIPage.setSize(pageVo.getPageSize());
+            seckillApplyPage.setCurrent(pageVo.getMongoPageNumber());
+            seckillApplyPage.setSize(pageVo.getPageSize());
             List<SeckillApply> seckillApplyList = seckillVO.getSeckillApplyList() != null ? seckillVO.getSeckillApplyList() : new ArrayList<>();
             for (SeckillApply seckillApply : seckillApplyList) {
                 if (CharSequenceUtil.isNotEmpty(queryParam.getStoreId()) && !seckillApply.getStoreId().equals(queryParam.getStoreId())) {
@@ -134,10 +140,10 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
                     log.error("获取促销商品促销失败！", e);
                 }
             }
-            seckillApplyIPage.setTotal(seckillApplyList.size());
+            seckillApplyPage.setTotal(seckillApplyList.size());
             List<SeckillApply> page = CollUtil.page(pageVo.getMongoPageNumber(), pageVo.getPageSize(), seckillApplyList);
-            seckillApplyIPage.setRecords(page);
-            return seckillApplyIPage;
+            seckillApplyPage.setRecords(page);
+            return seckillApplyPage;
         } else {
             return null;
         }
@@ -160,7 +166,7 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
             //获取秒杀活动时间段
             DateTime startTime = DateUtil.offsetHour(seckill.getStartTime(), seckillApply.getTimeLine());
             //检测是否可以发布促销商品
-            checkSeckillGoodsSKU(seckill, seckillApply, goodsSku, startTime);
+            checkSeckillGoodsSku(seckill, seckillApply, goodsSku, startTime);
             //设置秒杀申请默认内容
             seckillApply.setOriginalPrice(goodsSku.getPrice());
             seckillApply.setPromotionApplyStatus(PromotionApplyStatusEnum.PASS.name());
@@ -307,7 +313,8 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
                 Arrays.sort(hoursSored);
                 for (int i = 0; i < hoursSored.length; i++) {
                     SeckillTimelineVO tempTimeline = new SeckillTimelineVO();
-                    if (hoursSored[i] >= hour || ((i + 1) < hoursSored.length && hoursSored[i + 1] > hour)) {
+                    boolean hoursSoredHour = (hoursSored[i] >= hour || ((i + 1) < hoursSored.length && hoursSored[i + 1] > hour));
+                    if (hoursSoredHour) {
                         SimpleDateFormat format = new SimpleDateFormat(cn.lili.common.utils.DateUtil.STANDARD_DATE_FORMAT);
                         String date = format.format(new Date());
                         //当前时间的秒数
@@ -373,7 +380,7 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
      * @param goodsSku     商品SKU
      * @param startTime    秒杀时段开启时间
      */
-    private void checkSeckillGoodsSKU(SeckillVO seckill, SeckillApplyVO seckillApply, GoodsSku goodsSku, DateTime startTime) {
+    private void checkSeckillGoodsSku(SeckillVO seckill, SeckillApplyVO seckillApply, GoodsSku goodsSku, DateTime startTime) {
         //活动库存不能大于商品库存
         if (goodsSku.getQuantity() < seckillApply.getQuantity()) {
             throw new ServiceException(seckillApply.getGoodsName() + ",此商品库存不足");
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 3f759076..6787d5d3 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
@@ -60,25 +60,39 @@ import java.util.stream.Collectors;
 @Transactional(rollbackFor = Exception.class)
 public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> implements SeckillService {
 
-    //延时任务
+    /**
+     * 延时任务
+     */
     @Autowired
     private TimeTrigger timeTrigger;
-    //Mongo
+    /**
+     * Mongo
+     */
     @Autowired
     private MongoTemplate mongoTemplate;
-    //Rocketmq
+    /**
+     * RocketMQ
+     */
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
-    //商品索引
+    /**
+     * 商品索引
+     */
     @Autowired
     private EsGoodsIndexService goodsIndexService;
-    //促销商品
+    /**
+     * 促销商品
+     */
     @Autowired
     private PromotionGoodsService promotionGoodsService;
-    //秒杀申请
+    /**
+     * 秒杀申请
+     */
     @Autowired
     private SeckillApplyService seckillApplyService;
-    //设置
+    /**
+     * 设置
+     */
     @Autowired
     private SettingService settingService;
 
@@ -114,8 +128,8 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
     public void init() {
         //清除演示数据
 
-        List<Seckill> seckillList=list();
-        for (Seckill seckill: seckillList) {
+        List<Seckill> seckillList = list();
+        for (Seckill seckill : seckillList) {
             this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR,
                     seckill.getStartTime().getTime(),
                     DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (PromotionTypeEnum.SECKILL.name() + seckill.getId())),
@@ -125,8 +139,8 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
 
         Setting setting = settingService.get(SettingEnum.SECKILL_SETTING.name());
         SeckillSetting seckillSetting = new Gson().fromJson(setting.getSettingValue(), SeckillSetting.class);
-        for (int i=1;i<=30;i++){
-            Seckill seckill = new Seckill(i,seckillSetting.getHours(), seckillSetting.getSeckillRule());
+        for (int i = 1; i <= 30; i++) {
+            Seckill seckill = new Seckill(i, seckillSetting.getHours(), seckillSetting.getSeckillRule());
             this.saveSeckill(seckill);
         }
     }
@@ -134,8 +148,8 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
     @Override
     public boolean saveSeckill(Seckill seckill) {
 
-        SeckillVO seckillVO=new SeckillVO();
-        BeanUtil.copyProperties(seckill,seckillVO);
+        SeckillVO seckillVO = new SeckillVO();
+        BeanUtil.copyProperties(seckill, seckillVO);
 
         seckillVO.setSeckillApplyStatus(SeckillApplyStatusEnum.NOT_APPLY.name());
         seckillVO.setSeckillApplyList(null);
@@ -273,6 +287,7 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
 
     /**
      * 添加秒杀活动延时任务
+     *
      * @param seckill 秒杀活动
      */
     private void addSeckillStartTask(SeckillVO seckill) {
@@ -312,7 +327,7 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
         int sameNum = this.count(queryWrapper);
         //当前时间段是否存在同类活动
         if (sameNum > 0) {
-            throw new ServiceException("当前时间内已存在同类活动:"+seckill.getStartTime());
+            throw new ServiceException("当前时间内已存在同类活动:" + seckill.getStartTime());
         }
     }
 }
\ No newline at end of file
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 d9d9f27e..369a6e11 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
@@ -92,7 +92,6 @@ public class PromotionTools {
                 i.or(i1 -> i1.le(startTimeColumn, endTime).ge(endTimeColumn, endTime));
             });
         } else {
-            //queryWrapper.le(startTimeColumn, startTime).ge(endTimeColumn, startTime);
             queryWrapper.ge(startTimeColumn, cn.hutool.core.date.DateUtil.beginOfDay(startTime)).le(endTimeColumn, cn.hutool.core.date.DateUtil.endOfDay(endTime));
         }
         if (storeId != null) {
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 102d8062..7a2aecc7 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
@@ -19,7 +19,6 @@ import java.util.List;
  * @date 2020/11/26 16:13
  */
 @Service
-@Transactional
 public class PurchaseOrderItemServiceImpl extends ServiceImpl<PurchaseOrderItemMapper, PurchaseOrderItem> implements PurchaseOrderItemService {
 
     @Override
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 b9f46d84..c063855a 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
@@ -2,8 +2,8 @@ package cn.lili.modules.purchase.serviceimpl;
 
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.modules.purchase.entity.dos.PurchaseOrder;
-import cn.lili.modules.purchase.entity.vos.PurchaseOrderVO;
 import cn.lili.modules.purchase.entity.params.PurchaseOrderSearchParams;
+import cn.lili.modules.purchase.entity.vos.PurchaseOrderVO;
 import cn.lili.modules.purchase.mapper.PurchaseOrderMapper;
 import cn.lili.modules.purchase.service.PurchaseOrderItemService;
 import cn.lili.modules.purchase.service.PurchaseOrderService;
@@ -13,10 +13,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.HashMap;
 import java.util.Map;
@@ -29,7 +27,6 @@ import java.util.Map;
  * @date 2020/11/26 16:13
  */
 @Service
-@Transactional
 public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, PurchaseOrder> implements PurchaseOrderService {
     @Autowired
     private PurchaseOrderItemService purchaseOrderItemService;
@@ -54,7 +51,7 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
         BeanUtil.copyProperties(purchaseOrder, purchaseOrderVO);
 
         //获取采购单子内容
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(2);
         map.put("purchaseOrderId", id);
         purchaseOrderVO.setPurchaseOrderItems(purchaseOrderItemService.listByMap(map));
         return purchaseOrderVO;
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 6569c7b1..d653dd94 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
@@ -17,7 +17,6 @@ import java.util.List;
  * @date 2020/11/26 16:13
  */
 @Service
-@Transactional
 public class PurchaseQuotedItemServiceImpl extends ServiceImpl<PurchaseQuotedItemMapper, PurchaseQuotedItem> implements PurchaseQuotedItemService {
 
     @Override
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 cb7d3833..4a3e6e12 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
@@ -23,7 +23,6 @@ import java.util.List;
  * @date 2020/11/26 16:13
  */
 @Service
-@Transactional
 public class PurchaseQuotedServiceImpl extends ServiceImpl<PurchaseQuotedMapper, PurchaseQuoted> implements PurchaseQuotedService {
     @Autowired
     private PurchaseQuotedItemService purchaseQuotedItemService;
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
index c9ba5a38..932e032a 100644
--- 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
@@ -6,6 +6,9 @@ package cn.lili.modules.search.entity.enums;
  **/
 public enum HotWordsRedisKeyEnum {
 
+    /**
+     * "搜索热词"
+     */
     SEARCH_HOT_WORD("搜索热词");
 
 
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 79cbdf70..2b33fc99 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
@@ -10,6 +10,7 @@ import java.util.List;
 
 /**
  * ES商品搜索业务层
+ *
  * @author paulG
  * @date 2020/10/15
  **/
@@ -38,9 +39,15 @@ public interface EsGoodsSearchService {
      *
      * @param goodsSearch 搜索条件
      * @param pageVo      分页参数
-     * @return Map
+     * @return ES商品关联
      */
     EsGoodsRelatedInfo getSelector(EsGoodsSearchDTO goodsSearch, PageVO pageVo);
 
+    /**
+     * 根据SkuID列表获取ES商品
+     *
+     * @param skuIds SkuId列表
+     * @return ES商品列表
+     */
     List<EsGoodsIndex> getEsGoodsBySkuIds(List<String> skuIds);
 }
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 8ac541e4..65c4415e 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
@@ -332,7 +332,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements
         if (goodsIndex != null) {
             Map<String, Object> promotionMap = goodsIndex.getPromotionMap();
             if (promotionMap == null || promotionMap.isEmpty()) {
-                return new HashMap<>();
+                return new HashMap<>(16);
             }
             return promotionMap;
         }
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 58e736a4..72239a17 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
@@ -22,7 +22,6 @@ 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.NestedQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
@@ -65,16 +64,24 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
 
     @Autowired
     private EsGoodsIndexRepository goodsIndexRepository;
-    //商品分类
+    /**
+     * 商品分类
+     */
     @Autowired
     private CategoryService categoryService;
-    //品牌
+    /**
+     * 品牌
+     */
     @Autowired
     private BrandService brandService;
-    //ES
+    /**
+     * ES
+     */
     @Autowired
     private ElasticsearchRestTemplate restTemplate;
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache cache;
 
@@ -341,7 +348,7 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
             String[] props = searchDTO.getProp().split("@");
             List<String> nameList = new ArrayList<>();
             List<String> valueList = new ArrayList<>();
-            Map<String, List<String>> valueMap = new HashMap<>();
+            Map<String, List<String>> valueMap = new HashMap<>(16);
             for (String prop : props) {
                 String[] propValues = prop.split("_");
                 String name = propValues[0];
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 0a8cb42a..862528a9 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
@@ -6,6 +6,9 @@ import java.lang.annotation.*;
 
 /**
  * 埋点统计
+ *
+ * @author Bulbasaur
+ * @date: 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 465764ad..1d200b34 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
@@ -66,11 +66,6 @@ public class PageViewInterceptor {
                 storeId = "-1";
         }
         String ip = IpUtils.getIpAddress(request);
-//       //如果用户不为空，则ip后追加用户id，这样一个用户多个ip登录，可以被多次记录访客数
-//       if (UserContext.getCurrentUser() != null) {
-//           ip += UserContext.getCurrentUser().getId();
-//       }
-
         try {
             //PV 统计48小时过期 留下一定时间予以统计累计数据库
             cache.incr(CachePrefix.PV.getPrefix() + StatisticsSuffix.suffix(), 60 * 60 * 48);
@@ -98,7 +93,7 @@ public class PageViewInterceptor {
      */
     private static Map<String, String> spelFormat(JoinPoint joinPoint) {
 
-        Map<String, String> result = new HashMap<>();
+        Map<String, String> result = new HashMap<>(2);
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         PageViewPoint pageViewPoint = signature.getMethod().getAnnotation(PageViewPoint.class);
         String id = SpelUtil.compileParams(joinPoint, pageViewPoint.id());
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 0f691763..6601a78d 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
@@ -20,11 +20,22 @@ import java.util.List;
  */
 public interface GoodsStatisticsDataMapper extends BaseMapper<StoreFlow> {
 
-    //商品统计
+    /**
+     * 商品统计
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 商品统计列表
+     */
     @Select("SELECT goods_id,goods_name,SUM(final_price) AS price,SUM(num) AS num FROM li_store_flow ${ew.customSqlSegment}")
     List<GoodsStatisticsDataVO> getGoodsStatisticsData(IPage<GoodsStatisticsDataVO> page, @Param(Constants.WRAPPER) Wrapper<GoodsStatisticsDataVO> queryWrapper);
 
-    //分类统计
+    /**
+     * 分类统计
+     *
+     * @param queryWrapper 查询条件
+     * @return 分类统计列表
+     */
     @Select("SELECT category_id,category_name,SUM(price) AS price,SUM(num) AS num FROM li_store_flow ${ew.customSqlSegment}")
     List<CategoryStatisticsDataVO> getCateGoryStatisticsData(@Param(Constants.WRAPPER) Wrapper<CategoryStatisticsDataVO> queryWrapper);
 }
\ No newline at end of file
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 62673999..435b1096 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
@@ -15,7 +15,12 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface MemberStatisticsDataMapper extends BaseMapper<MemberStatisticsData> {
 
-
+    /**
+     * 获取会员统计数量
+     *
+     * @param queryWrapper 查询条件
+     * @return 会员统计数量
+     */
     @Select("SELECT  COUNT(0)  FROM li_member  ${ew.customSqlSegment}")
     Integer customSqlQuery(@Param(Constants.WRAPPER) Wrapper queryWrapper);
 
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 894fba0b..ed9561b9 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
@@ -18,10 +18,20 @@ import java.util.List;
  */
 public interface OrderStatisticsDataMapper extends BaseMapper<StoreFlow> {
 
+    /**
+     * 获取订单统计数据
+     * @param queryWrapper 查询条件
+     * @return 订单统计列表
+     */
     @Select("SELECT DATE_FORMAT(create_time,'%Y-%m-%d') AS create_time,sum(flow_price) AS price FROM li_order " +
             " ${ew.customSqlSegment}")
     List<OrderStatisticsDataVO> getOrderStatisticsData(@Param(Constants.WRAPPER) Wrapper queryWrapper);
 
+    /**
+     * 订单数量
+     * @param queryWrapper 查询条件
+     * @return 订单数量
+     */
     @Select("SELECT count(0) FROM li_order ${ew.customSqlSegment}")
     Integer count(@Param(Constants.WRAPPER) Wrapper queryWrapper);
 
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 b52ff7e6..89185d8d 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
@@ -14,7 +14,12 @@ import org.apache.ibatis.annotations.Select;
  * @date 2020/11/17 7:34 下午
  */
 public interface PlatformViewDataMapper extends BaseMapper<PlatformViewData> {
-    //UV流量统计
+    /**
+     * UV流量统计
+     *
+     * @param queryWrapper 查询条件
+     * @return UV流量统计数量
+     */
     @Select("SELECT sum(uv_num) FROM li_s_platform_view_data ${ew.customSqlSegment}")
     Integer count(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 }
\ No newline at end of file
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 1cd4d80d..6495deda 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
@@ -17,6 +17,13 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface RefundOrderStatisticsDataMapper extends BaseMapper<StoreFlow> {
 
+    /**
+     * 退款统计
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 退款统计分页
+     */
     @Select("SELECT refund_sn,store_name,member_name,name,specs,final_price FROM li_store_flow ${ew.customSqlSegment}")
     IPage<RefundOrderStatisticsDataVO> getRefundStatisticsData(IPage<RefundOrderStatisticsDataVO> page, @Param(Constants.WRAPPER) Wrapper<RefundOrderStatisticsDataVO> queryWrapper);
 }
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 bc8dd21b..718fe86d 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
@@ -20,6 +20,13 @@ import java.util.List;
  */
 public interface StoreStatisticsDataMapper extends BaseMapper<StoreFlow> {
 
+    /**
+     * 店铺统计列表
+     *
+     * @param page         分页
+     * @param queryWrapper 查询参数
+     * @return 店铺统计列表
+     */
     @Select("SELECT store_id AS storeId,store_name AS storeName,SUM(final_price) AS price,SUM(num) AS num FROM li_store_flow ${ew.customSqlSegment}")
     List<StoreStatisticsDataVO> getStoreStatisticsData(IPage<GoodsStatisticsDataVO> page, @Param(Constants.WRAPPER) Wrapper<GoodsStatisticsDataVO> queryWrapper);
 
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 2064a11c..4e279d93 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
@@ -48,8 +48,6 @@ public class IndexStatisticsVO {
     private Integer todayStoreNum;
     @ApiModelProperty(value = "今日新增评论数量")
     private Integer todayMemberEvaluation;
-
-    //当前在线人数
     @ApiModelProperty(value = "当前在线人数")
     private Long currentNumberPeopleOnline;
 }
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 ecad5579..e91168e6 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
@@ -16,11 +16,15 @@ import java.util.Date;
 @AllArgsConstructor
 public class OnlineMemberVO {
 
-    //在线时间
+    /**
+     * 在线时间
+     */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH")
     private Date date;
 
-    //在线会员人数
+    /**
+     * 在线会员人数
+     */
     private Integer num;
 
 }
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 fbb3bd5d..70dda2b4 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
@@ -15,7 +15,9 @@ public class OrderOverviewVO {
     @ApiModelProperty(value = "UV人次")
     private Integer uvNum = 0;
 
-    //下单统计
+    /**
+     * 下单统计
+     */
     @ApiModelProperty(value = "下单数量")
     private Long orderNum = 0L;
 
@@ -25,7 +27,9 @@ public class OrderOverviewVO {
     @ApiModelProperty(value = "下单金额")
     private Double orderAmount = 0D;
 
-    //付款统计
+    /**
+     * 付款统计
+     */
     @ApiModelProperty(value = "付款订单数量")
     private Long paymentOrderNum = 0L;
 
@@ -36,14 +40,18 @@ public class OrderOverviewVO {
     private Double paymentAmount = 0D;
 
 
-    //退单统计
+    /**
+     * 退单统计
+     */
     @ApiModelProperty(value = "退单笔数")
     private Long refundOrderNum = 0L;
 
     @ApiModelProperty(value = "退单金额")
     private Double refundOrderPrice = 0D;
 
-    //转换率
+    /**
+     * 转换率
+     */
     @ApiModelProperty(value = "下单转换率")
     private String orderConversionRate;
 
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 b22148c8..a70fcf83 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
@@ -38,12 +38,14 @@ public interface IndexStatisticsService {
     /**
      * 查询热卖商品TOP10
      *
+     * @param statisticsQueryParam 商品统计查询参数
      * @return 热卖商品TOP10
      */
     List<GoodsStatisticsDataVO> goodsStatistics(GoodsStatisticsQueryParam statisticsQueryParam);
 
     /**
      * 查询热卖店铺TOP10
+     * @param statisticsQueryParam 统计查询参数
      *
      * @return 当月的热卖店铺TOP10
      */
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 ec68595a..4db9c32f 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
@@ -35,11 +35,14 @@ public interface OrderStatisticsDataService extends IService<StoreFlow> {
 
     /**
      * 查询今日付款统计
+     *
+     * @return 订单统计金额
      */
     Map<String, Object> getOrderStatisticsPrice();
 
     /**
      * 获取订单总数量
+     *
      * @param orderStatus 订单状态
      * @return 订单总数量
      */
@@ -48,6 +51,7 @@ public interface OrderStatisticsDataService extends IService<StoreFlow> {
     /**
      * 图表统计
      *
+     * @param statisticsQueryParam 统计查询参数
      * @return 订单总数量
      */
     List<OrderStatisticsDataVO> statisticsChart(StatisticsQueryParam statisticsQueryParam);
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 55a63aec..c7dcf070 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
@@ -20,6 +20,7 @@ public interface RefundOrderStatisticsService extends IService<StoreFlow> {
      * 查询订单统计分页
      *
      * @param statisticsQueryParam 查询参数
+     * @param pageVO               分页
      * @return 退款统计
      */
     IPage<RefundOrderStatisticsDataVO> getRefundOrderStatisticsData(PageVO pageVO, StatisticsQueryParam statisticsQueryParam);
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 e581d414..6876984e 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
@@ -35,10 +35,14 @@ import java.util.*;
  */
 @Service
 public class OrderStatisticsDataServiceImpl extends ServiceImpl<OrderStatisticsDataMapper, StoreFlow> implements OrderStatisticsDataService {
-    //平台PV统计
+    /**
+     * 平台PV统计
+     */
     @Autowired
     private PlatformViewDataService platformViewDataService;
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
 
@@ -64,7 +68,11 @@ public class OrderStatisticsDataServiceImpl extends ServiceImpl<OrderStatisticsD
         return orderOverviewVO;
     }
 
-    //运算转换率
+    /**
+     * 运算转换率
+     *
+     * @param orderOverviewVO 订单统计视图
+     */
     private void conversionRateOperation(OrderOverviewVO orderOverviewVO) {
 
         //下单转换率 订单数/UV
@@ -213,7 +221,6 @@ public class OrderStatisticsDataServiceImpl extends ServiceImpl<OrderStatisticsD
     @Override
     public Integer orderNum(String orderStatus) {
         LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper();
-        //queryWrapper.eq("flow_type", FlowTypeEnum.PAY.name());
         queryWrapper.eq(StringUtils.isNotEmpty(orderStatus), Order::getOrderStatus, orderStatus);
         queryWrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),
                 Order::getStoreId, UserContext.getCurrentUser().getStoreId());
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 c39cf71e..0cecb039 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
@@ -2,6 +2,8 @@ package cn.lili.modules.statistics.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.security.enums.UserEnums;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.config.properties.StatisticsProperties;
@@ -25,6 +27,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -41,18 +44,25 @@ import java.util.List;
  */
 @Service
 public class PlatformViewDataServiceImpl extends ServiceImpl<PlatformViewDataMapper, PlatformViewData> implements PlatformViewDataService {
-    //在线人数统计
+    /**
+     * 在线人数统计
+     */
     @Autowired
     private StatisticsProperties statisticsProperties;
-    //会员
+    /**
+     * 会员
+     */
     @Autowired
     private MemberService memberService;
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache cache;
-
-    //平台流量统计
-    @Autowired
+    /**
+     * 平台流量统计
+     */
+    @Resource
     private PlatformViewDataMapper platformViewDataMapper;
 
     @Override
@@ -185,6 +195,8 @@ public class PlatformViewDataServiceImpl extends ServiceImpl<PlatformViewDataMap
                     startTime = dates[0];
                     break;
                 }
+                default:
+                    throw new ServiceException(ResultCode.ERROR);
             }
         } else {
             //根据查询时间来确定查询参数
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 47221c20..76ed86e0 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
@@ -1,5 +1,7 @@
 package cn.lili.modules.statistics.util;
 
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
 import cn.lili.modules.statistics.model.enums.SearchTypeEnum;
@@ -72,6 +74,8 @@ public class StatisticsDateUtil {
                 //获取过去七天
                 dateArray[1] = calendar.getTime();
                 break;
+            default:
+                throw new ServiceException(ResultCode.ERROR);
         }
         return dateArray;
     }
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 b2e8939a..8f0aaaf5 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
@@ -28,7 +28,7 @@ import java.util.Date;
 @Table(name = "li_bill")
 @TableName("li_bill")
 @ApiModel(value = "结算单")
-public class Bill  {
+public class Bill {
 
     private static final long serialVersionUID = 1L;
 
@@ -36,7 +36,7 @@ public class Bill  {
     @TableId
     @TableField
     @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id ;
+    private String id;
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@@ -86,11 +86,13 @@ public class Bill  {
     @ApiModelProperty(value = "支行联行号")
     private String bankCode;
 
-    ////开始算钱啦
-    //billPrice=orderPrice-refundPrice
-    //-commissionPrice+refundCommissionPrice
-    //-distributionCommission+distributionRefundCommission
-    //+siteCouponCommission-siteCouponRefundCommission
+    /**
+     * 开始算钱啦
+     * billPrice=orderPrice-refundPrice
+     * -commissionPrice+refundCommissionPrice
+     * -distributionCommission+distributionRefundCommission
+     * +siteCouponCommission-siteCouponRefundCommission
+     */
     @ApiModelProperty(value = "结算周期内订单付款总金额")
     private Double orderPrice;
 
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 df4deef9..c9af0c94 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
@@ -169,6 +169,7 @@ public class StoreDetail {
     private String ddCode;
 
     //店铺退货收件地址
+
     @ApiModelProperty(value = "收货人姓名")
     private String salesConsigneeName;
 
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 b88b84b3..814ce4d5 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
@@ -34,7 +34,7 @@ public class StoreLogistics extends BaseEntity {
 
     @ApiModelProperty(value = "物流公司ID")
     @NotNull
-    private String LogisticsId;
+    private String logisticsId;
 
 
 }
\ No newline at end of file
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 3c43d7e3..dd95640c 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
@@ -1,7 +1,6 @@
 package cn.lili.modules.store.entity.dto;
 
 import cn.lili.common.validation.Mobile;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
@@ -41,7 +40,7 @@ public class AdminStoreApplyDTO {
     private String goodsManagementCategory;
 
     @ApiModelProperty(value = "是否自营")
-    private boolean selfOperated;
+    private Boolean selfOperated;
 
     @ApiModelProperty(value = "地址名称， '，'分割")
     private String storeAddressPath;
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 f846dcf5..ca1c5a32 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
@@ -15,7 +15,6 @@ import javax.validation.constraints.Size;
 @Data
 public class StoreBankDTO {
 
-    //结算银行信息
     @Size(min = 1, max = 200)
     @NotBlank(message = "结算银行开户行名称不能为空")
     @ApiModelProperty(value = "结算银行开户行名称")
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 3219f465..56d7c0e5 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
@@ -17,6 +17,7 @@ import javax.validation.constraints.*;
 public class StoreCompanyDTO {
 
     //公司基本信息
+
     @Size(min = 2, max = 100)
     @NotBlank(message = "公司名称不能为空")
     @ApiModelProperty(value = "公司名称")
@@ -66,6 +67,7 @@ public class StoreCompanyDTO {
     private String linkPhone;
 
     //营业执照信息
+
     @Size(min = 18, max = 18)
     @ApiModelProperty(value = "营业执照号")
     private String licenseNum;
@@ -79,6 +81,7 @@ public class StoreCompanyDTO {
     private String licencePhoto;
 
     //法人信息
+
     @Size(min = 2, max = 20)
     @NotBlank(message = "法人姓名不能为空")
     @ApiModelProperty(value = "法人姓名")
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 3a814565..824bf81e 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
@@ -2,14 +2,11 @@ package cn.lili.modules.store.entity.dto;
 
 import cn.lili.common.validation.Mobile;
 import cn.lili.common.validation.Phone;
-import cn.lili.modules.store.entity.dos.StoreDetail;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Id;
@@ -17,7 +14,6 @@ import javax.validation.constraints.Email;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.util.Date;
 
 /**
  * 店铺修改DTO
@@ -153,6 +149,7 @@ public class StoreEditDTO {
     private String ddCode;
 
     //店铺退货收件地址
+
     @ApiModelProperty(value = "收货人姓名")
     private String salesConsigneeName;
 
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 627c0368..38566428 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
@@ -8,8 +8,17 @@ package cn.lili.modules.store.entity.enums;
  */
 public enum BillStatusEnum {
 
+    /**
+     * "已出账"
+     */
     OUT("已出账"),
+    /**
+     * "已核对"
+     */
     CHECK("已核对"),
+    /**
+     * "已完成"
+     */
     COMPLETE("已完成");
     private final String description;
 
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 e7277c8d..6d6aad3a 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
@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
 public class StoreManagementCategoryVO extends Category {
 
     @ApiModelProperty(value = "已选择")
-    private boolean selected;
+    private Boolean selected;
 
     public StoreManagementCategoryVO(Category category) {
         BeanUtil.copyProperties(this, category);
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 468ebc87..9fdef23f 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
@@ -19,14 +19,33 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface BillMapper extends BaseMapper<Bill> {
 
+    /**
+     * 查询结算单分页
+     *
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 结算单分页
+     */
     @Select("select b.id,b.sn,b.start_time,b.end_time,b.bill_status,b.store_name,b.bill_price,b.create_time from li_bill as b ${ew.customSqlSegment}")
     IPage<BillListVO> queryBillPage(IPage<BillListVO> page, @Param(Constants.WRAPPER) Wrapper<BillListVO> queryWrapper);
 
+    /**
+     * 查询订单结算
+     *
+     * @param queryWrapper 查询条件
+     * @return 结算单
+     */
     @Select("SELECT SUM( final_price ) AS orderPrice,SUM( commission_price ) AS commissionPrice" +
             ",SUM( distribution_rebate ) AS distributionCommission,SUM( site_coupon_commission ) AS siteCouponCommission" +
             ",SUM( bill_price ) AS billPrice FROM li_store_flow ${ew.customSqlSegment}")
     Bill getOrderBill(@Param(Constants.WRAPPER) QueryWrapper<Bill> queryWrapper);
 
+    /**
+     * 查询退款结算单
+     *
+     * @param queryWrapper 查询条件
+     * @return 结算单
+     */
     @Select("SELECT SUM( final_price ) AS refundPrice,SUM( commission_price ) AS refundCommissionPrice" +
             ",SUM( distribution_rebate ) AS distributionRefundCommission,SUM( site_coupon_commission ) AS siteCouponRefundCommission" +
             ",SUM( bill_price ) AS billPrice FROM li_store_flow ${ew.customSqlSegment}")
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 4253411e..ba0d9cdd 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
@@ -20,27 +20,63 @@ import java.util.List;
  */
 public interface StoreDetailMapper extends BaseMapper<StoreDetail> {
 
+    /**
+     * 获取店铺详情VO
+     *
+     * @param storeId 店铺ID
+     * @return 店铺详情VO
+     */
     @Select("select s.store_logo,s.member_name,s.store_name,s.store_disable,s.self_operated,s.store_address_detail,s.store_address_path,s.store_address_id_path,s.store_center,s.store_desc,s.yzf_sign,s.yzf_mp_sign," +
             "d.* from li_store s inner join li_store_detail d on s.id=d.store_id where s.id=#{storeId}")
     StoreDetailVO getStoreDetail(String storeId);
 
+    /**
+     * 根据会员ID获取店铺详情
+     *
+     * @param memberId 会员ID
+     * @return 店铺详情
+     */
     @Select("select s.member_name,s.store_name,s.store_disable,s.self_operated,s.store_center,s.store_logo,s.store_desc,s.store_address_detail,s.store_address_path,s.store_address_id_path,d.* " +
             "from li_store s inner join li_store_detail d on s.id=d.store_id where s.member_id=#{memberId}")
     StoreDetailVO getStoreDetailByMemberId(String memberId);
 
+    /**
+     * 获取店铺基础信息DTO
+     *
+     * @param storeId 店铺ID
+     * @return 店铺基础信息DTO
+     */
     @Select("SELECT s.id as storeId,s.* FROM li_store s WHERE s.id=#{storeId}")
     StoreBasicInfoVO getStoreBasicInfoDTO(String storeId);
 
+    /**
+     * 获取店铺售后地址DTO
+     *
+     * @param storeId 店铺ID
+     * @return 店铺售后地址DTO
+     */
     @Select("select s.sales_consignee_name,s.sales_consignee_mobile,s.sales_consignee_address_id,s.sales_consignee_address_path,s.sales_consignee_detail " +
             "from li_store_detail s  where s.store_id=#{storeId}")
     StoreAfterSaleAddressDTO getStoreAfterSaleAddressDTO(String storeId);
 
+    /**
+     * 获取待结算店铺列表
+     *
+     * @param day 结算日
+     * @return 待结算店铺列表
+     */
     @Select("SELECT store_id,settlement_day FROM li_store_detail " +
             "WHERE settlement_cycle LIKE concat(#{day},',%')  " +
             "OR settlement_cycle LIKE concat('%,',#{day},',%') " +
             "OR settlement_cycle LIKE concat('%,',#{day})")
     List<StoreSettlementDay> getSettlementStore(int day);
 
+    /**
+     * 修改店铺的结算日
+     *
+     * @param storeId  店铺ID
+     * @param dateTime 结算日
+     */
     @Update("UPDATE li_store_detail SET settlement_day=#{dateTime} WHERE store_id=#{storeId}")
     void updateSettlementDay(String storeId, DateTime dateTime);
 }
\ No newline at end of file
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 5759a700..e626c98e 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
@@ -46,6 +46,7 @@ public interface BillService extends IService<Bill> {
      *
      * @param pageVO 分页
      * @param id     结算单ID
+     * @param type   类型
      * @return 商家流水
      */
     IPage<StoreFlow> getStoreFlow(String id, String type, PageVO pageVO);
@@ -86,6 +87,7 @@ public interface BillService extends IService<Bill> {
     /**
      * 商家待结算数量
      *
+     * @param billStatusEnum 结算单类型
      * @return 待结算商家数量
      */
     Integer billNum(BillStatusEnum billStatusEnum);
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 12aaf05f..18b0e81c 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
@@ -14,9 +14,10 @@ import java.util.List;
 public interface FreightTemplateChildService extends IService<FreightTemplateChild> {
 
     /**
-     * 获取当前商家的运费模板列表
+     * 获取当前商家的运费模板子内容列表
      *
-     * @return 运费模板列表
+     * @param freightTemplateId 运费模板ID
+     * @return 运费模板子内容列表
      */
     List<FreightTemplateChild> getFreightTemplateChild(String freightTemplateId);
 
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 c4b82724..da6a020b 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
@@ -19,9 +19,10 @@ public interface FreightTemplateService extends IService<FreightTemplate> {
     /**
      * 获取当前商家的运费模板列表
      *
+     * @param pageVO 分页
      * @return 运费模板列表
      */
-    IPage<FreightTemplate> getFreightTemplate(PageVO pageVo);
+    IPage<FreightTemplate> getFreightTemplate(PageVO pageVO);
 
     /**
      * 获取商家的运费模板
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 3c808f46..e6dca6e4 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
@@ -16,6 +16,7 @@ public interface StoreAddressService extends IService<StoreAddress> {
     /**
      * 获取当前商家的自提点列表
      *
+     * @param pageVo 分页
      * @return 自提点列表
      */
     IPage<StoreAddress> getStoreAddress(PageVO pageVo);
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 8f01b0e8..dbc8b1af 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
@@ -67,6 +67,7 @@ public interface StoreDetailService extends IService<StoreDetail> {
     /**
      * 获取某一个店铺的退货收件地址信息
      *
+     * @param id 店铺ID
      * @return 店铺售后收件地址
      */
     StoreAfterSaleAddressDTO getStoreAfterSaleAddressDTO(String id);
@@ -74,16 +75,24 @@ public interface StoreDetailService extends IService<StoreDetail> {
     /**
      * 修改当前登录店铺售后收件地址
      *
+     * @param storeAfterSaleAddressDTO 店铺售后DTO
      * @return 店铺售后收件地址
      */
     boolean editStoreAfterSaleAddressDTO(StoreAfterSaleAddressDTO storeAfterSaleAddressDTO);
 
     /**
      * 修改店铺库存预警数量
+     *
      * @param stockWarning 库存预警数量
      * @return 操作状态
      */
     boolean updateStockWarning(Integer stockWarning);
 
+    /**
+     * 获取店铺经营范围
+     *
+     * @param storeId 店铺ID
+     * @return 店铺经营范围
+     */
     List goodsManagementCategory(String storeId);
 }
\ No newline at end of file
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 8731846a..ca70226f 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
@@ -38,6 +38,7 @@ public interface StoreService extends IService<Store> {
      * 用于后台添加店铺
      *
      * @param adminStoreApplyDTO 后台添加店铺信息
+     * @return 店铺
      */
     Store add(AdminStoreApplyDTO adminStoreApplyDTO);
 
@@ -45,6 +46,7 @@ public interface StoreService extends IService<Store> {
      * 编辑店铺
      *
      * @param storeEditDTO 店铺修改信息
+     * @return 店铺
      */
     Store edit(StoreEditDTO storeEditDTO);
 
@@ -53,6 +55,7 @@ public interface StoreService extends IService<Store> {
      *
      * @param id     店铺ID
      * @param passed 审核结果
+     * @return 操作结果
      */
     boolean audit(String id, Integer passed);
 
@@ -100,6 +103,7 @@ public interface StoreService extends IService<Store> {
 
     /**
      * 获取待审核店铺数量
+     *
      * @return 待审核店铺数量
      */
     Integer auditNum();
@@ -120,12 +124,14 @@ public interface StoreService extends IService<Store> {
 
     /**
      * 更新店铺商品数量
+     *
      * @param storeId 店铺ID
      */
     void updateStoreGoodsNum(String storeId);
 
     /**
      * 更新店铺收藏数量
+     *
      * @param goodsId 店铺ID
      */
     void updateStoreCollectionNum(String goodsId);
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 561b9c14..e72d7729 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
@@ -32,7 +32,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.Date;
 
 /**
@@ -42,18 +41,19 @@ import java.util.Date;
  * @date 2020/11/17 4:28 下午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements BillService {
 
-    //店铺详情
+    /**
+     * 店铺详情
+     */
     @Autowired
     private StoreDetailService storeDetailService;
-    //商家流水
+    /**
+     * 商家流水
+     */
     @Autowired
     private StoreFlowService storeFlowService;
-    //结算单
-    @Resource
-    private BillMapper billMapper;
 
     @Override
     public void createBill(String storeId, Date startTime, DateTime endTime) {
@@ -80,31 +80,31 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements Bi
 
         //入账结算信息
         Bill orderBill = this.baseMapper.getOrderBill(new QueryWrapper<Bill>()
-                .eq("store_id",storeId)
-                .eq("flow_type",FlowTypeEnum.PAY.name())
-                .between("create_time",startTime,endTime));
+                .eq("store_id", storeId)
+                .eq("flow_type", FlowTypeEnum.PAY.name())
+                .between("create_time", startTime, endTime));
         Double orderPrice = 0D;
         if (orderBill != null) {
             bill.setOrderPrice(orderBill.getOrderPrice());
             bill.setCommissionPrice(orderBill.getCommissionPrice());
             bill.setDistributionCommission(orderBill.getDistributionCommission());
             bill.setSiteCouponCommission(orderBill.getSiteCouponCommission());
-            orderPrice=orderBill.getBillPrice();
+            orderPrice = orderBill.getBillPrice();
         }
 
 
         //退款结算信息
         Bill refundBill = this.baseMapper.getRefundBill(new QueryWrapper<Bill>()
-                .eq("store_id",storeId)
-                .eq("flow_type",FlowTypeEnum.REFUND.name())
-                .between("create_time",startTime,endTime));
+                .eq("store_id", storeId)
+                .eq("flow_type", FlowTypeEnum.REFUND.name())
+                .between("create_time", startTime, endTime));
         Double refundPrice = 0D;
-        if(refundBill!=null){
+        if (refundBill != null) {
             bill.setRefundPrice(refundBill.getRefundPrice());
             bill.setRefundCommissionPrice(refundBill.getRefundCommissionPrice());
             bill.setDistributionRefundCommission(refundBill.getDistributionRefundCommission());
             bill.setSiteCouponRefundCommission(refundBill.getSiteCouponRefundCommission());
-            refundPrice=refundBill.getBillPrice();
+            refundPrice = refundBill.getBillPrice();
         }
 
         //最终结算金额=入款结算金额-退款结算金额
@@ -197,6 +197,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements Bi
         return this.update(lambdaUpdateWrapper);
     }
 
+    @Override
     public Integer billNum(BillStatusEnum billStatusEnum) {
         LambdaUpdateWrapper<Bill> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
         lambdaUpdateWrapper.eq(Bill::getBillStatus, billStatusEnum.name());
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 46224790..e3ea52be 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
@@ -29,13 +29,13 @@ public class FreightTemplateServiceChildImpl extends ServiceImpl<FreightTemplate
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public boolean addFreightTemplateChild(List<FreightTemplateChild> freightTemplateChildren) {
         return this.saveBatch(freightTemplateChildren);
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public boolean removeFreightTemplate(String freightTemplateId) {
         LambdaQueryWrapper<FreightTemplateChild> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(FreightTemplateChild::getFreightTemplateId, freightTemplateId);
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 a239e50e..509b0c81 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
@@ -36,10 +36,14 @@ import java.util.List;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class FreightTemplateServiceImpl extends ServiceImpl<FreightTemplateMapper, FreightTemplate> implements FreightTemplateService {
-    //配送子模板
+    /**
+     * 配送子模板
+     */
     @Autowired
     private FreightTemplateChildService freightTemplateChildService;
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache cache;
 
@@ -109,7 +113,7 @@ public class FreightTemplateServiceImpl extends ServiceImpl<FreightTemplateMappe
         //给子模板赋父模板的id
         List<FreightTemplateChild> list = new ArrayList<>();
         //如果子运费模板不为空则进行新增
-        if(freightTemplateVO.getFreightTemplateChildList()!=null){
+        if (freightTemplateVO.getFreightTemplateChildList() != null) {
             for (FreightTemplateChild freightTemplateChild : freightTemplateVO.getFreightTemplateChildList()) {
                 freightTemplateChild.setFreightTemplateId(freightTemplate.getId());
                 list.add(freightTemplateChild);
@@ -124,7 +128,7 @@ public class FreightTemplateServiceImpl extends ServiceImpl<FreightTemplateMappe
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public FreightTemplateVO editFreightTemplate(FreightTemplateVO freightTemplateVO) {
         //获取当前登录商家账号
         AuthUser tokenUser = UserContext.getCurrentUser();
@@ -153,7 +157,7 @@ public class FreightTemplateServiceImpl extends ServiceImpl<FreightTemplateMappe
 
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public boolean removeFreightTemplate(String id) {
         //获取当前登录商家账号
         AuthUser tokenUser = UserContext.getCurrentUser();
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 5ebc54b6..4aa827fe 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
@@ -36,10 +36,14 @@ import java.util.List;
 @Transactional(rollbackFor = Exception.class)
 public class StoreDetailServiceImpl extends ServiceImpl<StoreDetailMapper, StoreDetail> implements StoreDetailService {
 
-    //店铺
+    /**
+     * 店铺
+     */
     @Autowired
     private StoreService storeService;
-    //分类
+    /**
+     * 分类
+     */
     @Autowired
     private CategoryService categoryService;
 
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 72b1513e..95cb3090 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
@@ -4,7 +4,6 @@ import cn.lili.common.cache.Cache;
 import cn.lili.common.cache.CachePrefix;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.modules.goods.entity.vos.CategoryVO;
 import cn.lili.modules.store.entity.dos.StoreGoodsLabel;
 import cn.lili.modules.store.entity.vos.StoreGoodsLabelVO;
 import cn.lili.modules.store.mapper.StoreGoodsLabelMapper;
@@ -31,7 +30,9 @@ import java.util.List;
 @Transactional(rollbackFor = Exception.class)
 public class StoreGoodsLabelServiceImpl extends ServiceImpl<StoreGoodsLabelMapper, StoreGoodsLabel> implements StoreGoodsLabelService {
 
-    //缓存
+    /**
+     * 缓存
+     */
     @Autowired
     private Cache cache;
 
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 3900662a..9240fe9d 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
@@ -50,22 +50,34 @@ import java.util.Optional;
 @Transactional(rollbackFor = Exception.class)
 public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements StoreService {
 
-    //会员
+    /**
+     * 会员
+     */
     @Autowired
     private MemberService memberService;
-    //商品
+    /**
+     * 商品
+     */
     @Autowired
     private GoodsService goodsService;
-    //商品SKU
+    /**
+     * 商品SKU
+     */
     @Autowired
     private GoodsSkuService goodsSkuService;
-    //店铺详情
+    /**
+     * 店铺详情
+     */
     @Autowired
     private StoreDetailService storeDetailService;
-    //页面
+    /**
+     * 页面
+     */
     @Autowired
     private PageDataService pageDataService;
-    //店铺收藏
+    /**
+     * 店铺收藏
+     */
     @Autowired
     private StoreCollectionService storeCollectionService;
 
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 1d8a571f..3d892132 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
@@ -21,7 +21,9 @@ public class OrderSetting implements Serializable {
     @ApiModelProperty(value = "自动收货 天")
     private Integer autoReceive;
 
-    //已完成订单允许退单：X天内，允许客户发起退货退款申请，未发货订单随时可退，未发货订单随时可退。
+    /**
+     * 已完成订单允许退单：X天内，允许客户发起退货退款申请，未发货订单随时可退，未发货订单随时可退
+     */
     @ApiModelProperty(value = "已完成订单允许退单 天")
     private Integer autoComplete;
 
@@ -31,11 +33,15 @@ public class OrderSetting implements Serializable {
     @ApiModelProperty(value = "售后自动取消 天")
     private Integer autoCancelAfterSale;
 
-    //待审核退单自动审核：X天后，商家逾期未处理的待审核退单，将会自动审核通过。
+    /**
+     * 待审核退单自动审核：X天后，商家逾期未处理的待审核退单，将会自动审核通过。
+     */
     @ApiModelProperty(value = "待审核退单自动审核 天")
     private Integer autoAfterSaleReview;
 
-    //退单自动确认收货：X天后，商家逾期未处理的待收货退单，将会自动确认收货，非快递退货的退单，再审核通过后开始计时。
+    /**
+     * 退单自动确认收货：X天后，商家逾期未处理的待收货退单，将会自动确认收货，非快递退货的退单，再审核通过后开始计时。
+     */
     @ApiModelProperty(value = "已完成订单允许退单 天")
     private Integer autoAfterSaleComplete;
 }
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 83bcf735..ef0414c0 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
@@ -15,18 +15,24 @@ import java.io.Serializable;
 public class OssSetting implements Serializable {
 
     private static final long serialVersionUID = 2975271656230801861L;
-    //域名
+    /**
+     * 域名
+     */
     private String endPoint = "oss-cn-beijing.aliyuncs.com";
-
-    //储存空间
+    /**
+     * 储存空间
+     */
     private String bucketName = "lilishop-oss";
-
-    //存放路径路径
+    /**
+     * 存放路径路径
+     */
     private String picLocation = "/template";
-
-    //密钥id
+    /**
+     * 密钥id
+     */
     private String accessKeyId = "LTAI4G4deX59EyjpEULaJdsU";
-
-    //密钥
+    /**
+     * 密钥
+     */
     private String accessKeySecret = "BlRBpl7WBman6GYYwLKMiKqMTXFhWf";
 }
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 087639b0..eeae1694 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
@@ -13,19 +13,29 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class AlipayPaymentSetting {
 
-    //应用id
+    /**
+     * 应用id
+     */
     private String appId;
 
-    //私钥
+    /**
+     * 私钥
+     */
     private String privateKey;
 
-    //应用证书
+    /**
+     * 应用证书
+     */
     private String certPath;
 
-    //支付宝公钥
+    /**
+     * 支付宝公钥
+     */
     private String alipayPublicCertPath;
 
-    //支付宝根证书
+    /**
+     * 支付宝根证书
+     */
     private String rootCertPath;
 
 }
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 b80ceb5d..380fce0f 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
@@ -13,19 +13,32 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class WechatPaymentSetting {
 
-
-    //应用id
+    /**
+     * 应用id
+     */
     private String appId;
-    //商户号
+    /**
+     * 商户号
+     */
     private String mchId;
-    //私钥
+    /**
+     * 私钥
+     */
     private String apiclient_key;
-    //pem 证书
+    /**
+     * pem 证书
+     */
     private String apiclient_cert_pem;
-    //p12 证书
+    /**
+     * p12 证书
+     */
     private String apiclient_cert_p12;
-    //商户证书序列号
+    /**
+     * 商户证书序列号
+     */
     private String serialNumber;
-    //apiv3私钥
+    /**
+     * apiv3私钥
+     */
     private String apiKey3;
 }
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java
index fe28379b..9897cf72 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java
@@ -27,7 +27,9 @@ public class PaymentSupportForm {
     public List<ClientTypeEnum> getClients() {
         List<ClientTypeEnum> keys = new ArrayList<>();
         for (ClientTypeEnum clientTypeEnum : ClientTypeEnum.values()) {
-            if (clientTypeEnum.equals(ClientTypeEnum.UNKNOWN)) continue;
+            if (clientTypeEnum.equals(ClientTypeEnum.UNKNOWN)){
+                continue;
+            }
             keys.add(clientTypeEnum);
         }
         return keys;
@@ -42,7 +44,9 @@ public class PaymentSupportForm {
 
         List<PaymentMethodEnum> keys = new ArrayList<>();
         for (PaymentMethodEnum paymentMethodEnum : PaymentMethodEnum.values()) {
-            if (paymentMethodEnum.equals(PaymentMethodEnum.BANK_TRANSFER)) continue;
+            if (paymentMethodEnum.equals(PaymentMethodEnum.BANK_TRANSFER)){
+                continue;
+            }
             keys.add(paymentMethodEnum);
         }
         return keys;
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 6ab8c062..298ef77f 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
@@ -106,7 +106,8 @@ public interface InstantDeliveryPlugin {
      * @param memberAddress 会员地址
      * @param type          类型
      * @param config        配置
-     * @return
+     * @param storeDetailVO 店铺详情VO
+     * @return 配送订单返回
      */
     InstantDeliveryResultVO sendReOrder(Order order, StoreDetailVO storeDetailVO, MemberAddress memberAddress, Integer type, Map config);
 
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 d7fbea48..a0d29e2b 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
@@ -183,7 +183,7 @@ public class DadaPlugin implements InstantDeliveryPlugin {
         String result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_UPDATE_SHOP.getUrl(), requestJson);
         //组织返回参数
         InstantDeliveryResultVO instantDeliveryResultVO = JSONUtil.toBean(result, InstantDeliveryResultVO.class);
-        if (instantDeliveryResultVO.getStatus().equals("fail")) {
+        if ("fail".equals(instantDeliveryResultVO.getStatus())) {
             log.error("达达店铺信息修改失败",instantDeliveryResultVO.getMsg());
         }
         return instantDeliveryResultVO;
@@ -270,7 +270,7 @@ public class DadaPlugin implements InstantDeliveryPlugin {
             result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_RE_ADD_ORDER.getUrl(), requstJson);
         }
         InstantDeliveryResultVO instantDeliveryResultVO = JSONUtil.toBean(result, InstantDeliveryResultVO.class);
-        if (instantDeliveryResultVO.getStatus().equals("fail")) {
+        if ("fail".equals(instantDeliveryResultVO.getStatus())) {
             log.error("达达订单发送失败，订单号为",order.getSn() + "," + instantDeliveryResultVO.getMsg());
             //如果发送失败择等待一秒重新发送，如果失败择记录日志
             try {
@@ -280,7 +280,7 @@ public class DadaPlugin implements InstantDeliveryPlugin {
             }
             result = HttpUtils.doPostWithJson(url + InstantDeliveryUrl.DD_RE_ADD_ORDER.getUrl(), requstJson);
             InstantDeliveryResultVO instantDeliveryResResultVO = JSONUtil.toBean(result, InstantDeliveryResultVO.class);
-            if (instantDeliveryResResultVO.getStatus().equals("fail")) {
+            if ("fail".equals(instantDeliveryResResultVO.getStatus())) {
                 log.error("达达订单重试发送失败，订单号为" + order.getSn() + "," + instantDeliveryResultVO.getMsg());
             }
         }
@@ -307,7 +307,7 @@ public class DadaPlugin implements InstantDeliveryPlugin {
         //签名发送请求
         String mysing = appSecret + "app_key" + appKey + "body" + json + "formatjsonsource_id" + merchantsId + "timestamp" + DateUtil.getDateline() + "v1.0" + appSecret;
         String signature = StringUtils.md5(mysing).toUpperCase();
-        Map<String, String> requstJson = new HashMap<>();
+        Map<String, String> requstJson = new HashMap<>(8);
         requstJson.put("source_id", merchantsId);
         requstJson.put("app_key", appKey);
         requstJson.put("format", "json");
diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/enums/DadaOrderStatusEnum.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/enums/DadaOrderStatusEnum.java
index 24588f04..66de614e 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/enums/DadaOrderStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/enums/DadaOrderStatusEnum.java
@@ -47,7 +47,11 @@ public enum DadaOrderStatusEnum {
         this.text = text;
     }
 
-    //获取配送模版
+    /**
+     * 获取配送模版
+     * @param status 状态
+     * @return 配送模板
+     */
     public static String getText(Integer status) {
         //如果空，则直接返回
         if (status == null) {
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 9b5ce5d1..9ae3fd04 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
@@ -17,7 +17,7 @@ import lombok.Data;
 public class StoreLogisticsVO extends BaseEntity {
 
     @ApiModelProperty(value = "物流公司ID")
-    private String LogisticsId;
+    private String logisticsId;
 
     @ApiModelProperty(value = "物流公司名称")
     private String name;
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 23fe19dc..1052be21 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
@@ -26,7 +26,7 @@ public class Traces {
     /**
      * 物流单号
      */
-    private String LogisticCode;
+    private String logisticCode;
 
     /**
      * 物流详细信息
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 5aab7101..62dbad5d 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
@@ -12,6 +12,12 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface AppVersionMapper extends BaseMapper<AppVersion> {
 
+    /**
+     * 获取最新版本号
+     *
+     * @param appType APP类型（Android、IOS）
+     * @return APP版本
+     */
     @Select("SELECT * FROM li_app_version WHERE type=#{appType} ORDER BY version_update_date DESC LIMIT 1")
     AppVersion getLatestVersion(String appType);
 
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 a0c06324..687a2549 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
@@ -15,12 +15,30 @@ import java.util.List;
  */
 public interface StoreLogisticsMapper extends BaseMapper<StoreLogistics> {
 
+    /**
+     * 获取店铺选择的物流公司
+     *
+     * @param storeId 店铺ID
+     * @return 物流公司列表
+     */
     @Select("SELECT l.* FROM li_logistics l RIGHT JOIN  li_store_logistics sl ON l.id=sl.logistics_id WHERE sl.store_id=#{storeId} AND l.disabled='OPEN'")
     List<StoreLogisticsVO> getSelectedStoreLogistics(String storeId);
 
+    /**
+     * 店铺已选择的物流公司名称列表
+     *
+     * @param storeId 店铺ID
+     * @return 店铺已选择的物流公司名称列表
+     */
     @Select("SELECT l.name FROM li_logistics l RIGHT JOIN  li_store_logistics sl ON l.id=sl.logistics_id WHERE sl.store_id=#{storeId} AND l.disabled='OPEN'")
     List<String> getSelectedStoreLogisticsName(String storeId);
 
+    /**
+     * 获取店铺地址VO列表
+     *
+     * @param storeId 店铺列表
+     * @return 店铺地址VO列表
+     */
     @Select("SELECT *, ( SELECT sl.id FROM li_store_logistics sl WHERE l.id = sl.logistics_id AND sl.store_id=#{storeId} ) AS selected FROM li_logistics l AND l.disabled='OPEN';")
     List<StoreLogisticsVO> getStoreLogistics(String storeId);
 
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 a54652c0..4952123a 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
@@ -14,12 +14,15 @@ public interface AppVersionService extends IService<AppVersion> {
     /**
      * 获取当前最新的APP版本
      * 获取用户的APP类型，返回最新的数据的版本号
+     *
+     * @param appType APP版本类型
      * @return 最新的APP版本号
      */
     AppVersion getAppVersion(String appType);
 
     /**
      * 检测APP版本信息
+     *
      * @param appVersion app版本
      * @return 是否可添加
      */
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 bf6e05ec..f4966910 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
@@ -19,7 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020/11/17 8:02 下午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVersion> implements AppVersionService {
 
     @Override
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 c7257c6b..942f853b 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
@@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020/11/17 8:02 下午
  */
 @Service
-@Transactional
 public class InstantDeliveryLogServiceImpl extends ServiceImpl<InstantDeliveryLogMapper, InstantDeliveryLog> implements InstantDeliveryLogService {
 
 }
\ No newline at end of file
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 b44f713a..0939156c 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
@@ -30,7 +30,7 @@ import java.util.Map;
  * @date 2020/11/17 8:02 下午
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class InstantDeliveryServiceImpl extends ServiceImpl<InstantDeliveryMapper, InstantDelivery> implements InstantDeliveryService {
 
     @Autowired
@@ -43,7 +43,7 @@ public class InstantDeliveryServiceImpl extends ServiceImpl<InstantDeliveryMappe
         //循环数据，对未入库的数据进行入库操作
         for (InstantDeliveryVO instantDeliveryVO : resultList) {
             //根据id是否为0校验 如果为0则不在数据中，进行入库操作
-            if (instantDeliveryVO.getId().equals("0")) {
+            if (("0").equals(instantDeliveryVO.getId())) {
                 //入库
                 InstantDelivery instantDelivery = new InstantDelivery(instantDeliveryVO);
                 this.baseMapper.insert(instantDelivery);
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 7c33e996..9d9e0f2f 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
@@ -19,7 +19,6 @@ import com.google.gson.Gson;
 import groovy.util.logging.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -39,7 +38,6 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-@Transactional
 public class LogisticsServiceImpl extends ServiceImpl<LogisticsMapper, Logistics> implements LogisticsService {
     @Autowired
     private SettingService settingService;
@@ -90,7 +88,7 @@ public class LogisticsServiceImpl extends ServiceImpl<LogisticsMapper, Logistics
 
         if (logistics != null) {
             String requestData = "{'OrderCode':'','ShipperCode':'" + logistics.getCode() + "','LogisticCode':'" + expNo + "'}";
-            Map<String, String> params = new HashMap<String, String>();
+            Map<String, String> params = new HashMap<String, String>(8);
             params.put("RequestData", urlEncoder(requestData, "UTF-8"));
             params.put("EBusinessID", EBusinessID);
             params.put("RequestType", "8001");
@@ -202,9 +200,7 @@ public class LogisticsServiceImpl extends ServiceImpl<LogisticsMapper, Logistics
                     param.append(entry.getKey());
                     param.append("=");
                     param.append(entry.getValue());
-                    //System.out.println(entry.getKey()+":"+entry.getValue());
                 }
-                //System.out.println("param:"+param.toString());
                 out.write(param.toString());
             }
             //flush输出流的缓冲
@@ -236,7 +232,7 @@ public class LogisticsServiceImpl extends ServiceImpl<LogisticsMapper, Logistics
     }
 
 
-    private static final char[] base64EncodeChars = new char[]{
+    private static final char[] BASE64_ENCODE_CHARS = new char[]{
             'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
             'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
             'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
@@ -254,24 +250,24 @@ public class LogisticsServiceImpl extends ServiceImpl<LogisticsMapper, Logistics
         while (i < len) {
             b1 = data[i++] & 0xff;
             if (i == len) {
-                sb.append(base64EncodeChars[b1 >>> 2]);
-                sb.append(base64EncodeChars[(b1 & 0x3) << 4]);
+                sb.append(BASE64_ENCODE_CHARS[b1 >>> 2]);
+                sb.append(BASE64_ENCODE_CHARS[(b1 & 0x3) << 4]);
                 sb.append("==");
                 break;
             }
             b2 = data[i++] & 0xff;
             if (i == len) {
-                sb.append(base64EncodeChars[b1 >>> 2]);
-                sb.append(base64EncodeChars[((b1 & 0x03) << 4) | ((b2 & 0xf0) >>> 4)]);
-                sb.append(base64EncodeChars[(b2 & 0x0f) << 2]);
+                sb.append(BASE64_ENCODE_CHARS[b1 >>> 2]);
+                sb.append(BASE64_ENCODE_CHARS[((b1 & 0x03) << 4) | ((b2 & 0xf0) >>> 4)]);
+                sb.append(BASE64_ENCODE_CHARS[(b2 & 0x0f) << 2]);
                 sb.append("=");
                 break;
             }
             b3 = data[i++] & 0xff;
-            sb.append(base64EncodeChars[b1 >>> 2]);
-            sb.append(base64EncodeChars[((b1 & 0x03) << 4) | ((b2 & 0xf0) >>> 4)]);
-            sb.append(base64EncodeChars[((b2 & 0x0f) << 2) | ((b3 & 0xc0) >>> 6)]);
-            sb.append(base64EncodeChars[b3 & 0x3f]);
+            sb.append(BASE64_ENCODE_CHARS[b1 >>> 2]);
+            sb.append(BASE64_ENCODE_CHARS[((b1 & 0x03) << 4) | ((b2 & 0xf0) >>> 4)]);
+            sb.append(BASE64_ENCODE_CHARS[((b2 & 0x0f) << 2) | ((b3 & 0xc0) >>> 6)]);
+            sb.append(BASE64_ENCODE_CHARS[b3 & 0x3f]);
         }
         return sb.toString();
     }
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 cddfc6a3..875fa4c3 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
@@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020/11/17 8:02 下午
  */
 @Service
-@Transactional
 public class SensitiveWordsServiceImpl extends ServiceImpl<SensitiveWordsMapper, SensitiveWords> implements SensitiveWordsService {
 
 }
\ No newline at end of file
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 f9e8726d..7123df2d 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
@@ -15,7 +15,6 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020/11/17 8:02 下午
  */
 @Service
-@Transactional
 public class ServiceNoticeServiceImpl extends ServiceImpl<ServiceNoticeMapper, ServiceNotice> implements ServiceNoticeService {
 
 }
\ No newline at end of file
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 65a5f519..ca8517b8 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
@@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2020/11/17 3:52 下午
  */
 @Service
-@Transactional
 public class SettingServiceImpl extends ServiceImpl<SettingMapper, Setting> implements SettingService {
 
     @Override
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 b9f542ec..bc99bd52 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
@@ -20,8 +20,6 @@ import java.util.List;
  * @date 2020/11/17 8:02 下午
  */
 @Service
-@Transactional
-
 public class StoreLogisticsServiceImpl extends ServiceImpl<StoreLogisticsMapper, StoreLogistics> implements StoreLogisticsService {
 
     @Override
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 ad1e07af..9dc27a06 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
@@ -41,7 +41,7 @@ public final class HttpUtils {
     /**
      * post携带json请求
      *
-     * @param reqUrl 请求地址
+     * @param reqUrl         请求地址
      * @param jsonParameters 参数
      * @return
      */
@@ -49,18 +49,21 @@ public final class HttpUtils {
 
         BufferedReader reader = null;
         try {
-            URL url = new URL(reqUrl);//创建连接
+            //创建连接
+            URL url = new URL(reqUrl);
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setDoOutput(true);
             connection.setDoInput(true);
             connection.setUseCaches(false);
             connection.setInstanceFollowRedirects(true);
-            connection.setRequestMethod("POST"); //设置请求方式
-            //connection.setRequestProperty("Accept", "application/json"); //设置接收数据的格式
-            connection.setRequestProperty("Content-Type", "application/json"); //设置发送数据的格式
+            //设置请求方式
+            connection.setRequestMethod("POST");
+            //设置发送数据的格式
+            connection.setRequestProperty("Content-Type", "application/json");
             connection.connect();
             //一定要用BufferedReader 来接收响应， 使用字节来接收响应的方法是接收不到内容的
-            OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), StandardCharsets.UTF_8); //utf-8编码
+            //utf-8编码
+            OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), StandardCharsets.UTF_8);
             out.append(JSONObject.toJSONString(jsonParameters));
             out.flush();
             out.close();
@@ -75,9 +78,10 @@ public final class HttpUtils {
 
             return res;
         } catch (IOException e) {
-            log.error("post请求错误",e);
+            log.error("post请求错误", e);
         }
-        return "error"; //自定义错误信息
+        //自定义错误信息
+        return "error";
 
     }
 
@@ -92,18 +96,21 @@ public final class HttpUtils {
 
         BufferedReader reader = null;
         try {
-            URL url = new URL(reqUrl);//创建连接
+            //创建连接
+            URL url = new URL(reqUrl);
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setDoOutput(true);
             connection.setDoInput(true);
             connection.setUseCaches(false);
             connection.setInstanceFollowRedirects(true);
-            connection.setRequestMethod("POST"); //设置请求方式
-            //connection.setRequestProperty("Accept", "application/json"); //设置接收数据的格式
-            connection.setRequestProperty("Content-Type", "application/json"); //设置发送数据的格式
+            //设置请求方式
+            connection.setRequestMethod("POST");
+            //设置发送数据的格式
+            connection.setRequestProperty("Content-Type", "application/json");
             connection.connect();
             //一定要用BufferedReader 来接收响应， 使用字节来接收响应的方法是接收不到内容的
-            OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), StandardCharsets.UTF_8); //utf-8编码
+            //utf-8编码
+            OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), StandardCharsets.UTF_8);
             out.append(JSONObject.toJSONString(object));
             out.flush();
             out.close();
@@ -118,9 +125,10 @@ public final class HttpUtils {
 
             return res;
         } catch (IOException e) {
-            log.error("post错误",e);
+            log.error("post错误", e);
         }
-        return "error"; //自定义错误信息
+        //自定义错误信息
+        return "error";
 
     }
 
@@ -132,10 +140,6 @@ public final class HttpUtils {
             URL url = new URL(reqUrl);
             urlConn = (HttpURLConnection) url.openConnection();
             urlConn.setRequestMethod("POST");
-            //urlConn
-            //.setRequestProperty(
-            //"User-Agent",
-            //"Mozilla/5.0 (Windows; U; Windows NT 6.1; zh-CN; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3");
             //（单位：毫秒）jdk
             urlConn.setConnectTimeout(connectTimeout);
             //（单位：毫秒）jdk 1.5换成这个,读操作超时
@@ -187,7 +191,6 @@ public final class HttpUtils {
             conn.setRequestMethod("GET");
             conn.setConnectTimeout(connectTimeout);
             conn.setReadTimeout(readTimeout);
-            //conn.setRequestProperty("User-Agent", "Mozilla/5.0");
             BufferedInputStream in = new BufferedInputStream(
                     conn.getInputStream());
             ByteArrayOutputStream out = new ByteArrayOutputStream();
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 e70458d6..001fdd2d 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
@@ -134,8 +134,8 @@ public class StringPointer implements Serializable, CharSequence, Comparable<Str
         if (anObject instanceof StringPointer) {
             StringPointer that = (StringPointer)anObject;
             if (length == that.length) {
-                char v1[] = this.value;
-                char v2[] = that.value;
+                char[] v1 = this.value;
+                char[] v2 = that.value;
                 for(int i = 0; i < this.length; i ++){
                     if(v1[this.offset + i] != v2[that.offset + i]){
                         return false;
@@ -152,8 +152,8 @@ public class StringPointer implements Serializable, CharSequence, Comparable<Str
         int len1 = this.length;
         int len2 = that.length;
         int lim = Math.min(len1, len2);
-        char v1[] = this.value;
-        char v2[] = that.value;
+        char[] v1 = this.value;
+        char[] v2 = that.value;
 
         int k = 0;
         while (k < lim) {
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 ccd1d8f5..9bc52024 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
@@ -43,7 +43,7 @@ import java.util.List;
 @RestController
 @Api(tags = "管理员")
 @RequestMapping("/manager/user")
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 @Validated
 public class AdminUserManagerController {
     @Autowired
@@ -156,8 +156,9 @@ public class AdminUserManagerController {
     @ApiOperation(value = "添加用户")
     public ResultMessage<Object> register(AdminUserDTO adminUser,
                                           @RequestParam(required = false) List<String> roles) {
+        int rolesMaxSize=10;
         try {
-            if (roles != null && roles.size() >= 10) {
+            if (roles != null && roles.size() >= rolesMaxSize) {
                 throw new ServiceException(ResultCode.PERMISSION_BEYOND_TEN);
             }
             adminUserService.saveAdminUser(adminUser, roles);
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 e755aa74..9214e1a0 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
@@ -52,7 +52,7 @@ public class StoreMessageController {
     @GetMapping("/all")
     public ResultMessage<Map<String, Object>> getPage(PageVO pageVo) {
         //返回值定义
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(4);
         StoreMessageQueryVO storeMessageQueryVO = new StoreMessageQueryVO();
         storeMessageQueryVO.setStoreId(UserContext.getCurrentUser().getStoreId());
         //未读消息