merge branch "master"

manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

manager-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsManagerController.java

@@ -1,6 +1,5 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
-import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams;

manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java

@@ -1,8 +1,8 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultCode;
-import cn.lili.common.exception.ServiceException;
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.exception.ServiceException;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.distribution.entity.dos.Distribution;

manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

manager-api/src/main/java/cn/lili/controller/goods/HotWordsManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.goods;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java

@@ -1,35 +0,0 @@
-package cn.lili.controller.member;
-
-import cn.lili.common.utils.IpHelper;
-import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.vo.ResultMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 管理端,IP接口
- *
- * @author Chopper
- * @since 2020-02-25 14:10:16
- */
-@RestController
-@Api(tags = "管理端,IP接口")
-@RequestMapping("/manager/common/ip")
-public class IpInfoManagerController {
-    @Autowired
-    private IpHelper ipHelper;
-
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    @ApiOperation(value = "IP及天气相关信息")
-    public ResultMessage<Object> upload(HttpServletRequest request) {
-
-        String result = ipHelper.getIpCity(request);
-        return ResultUtil.data(result);
-    }
-}

manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java

@@ -1,5 +1,6 @@
 package cn.lili.controller.member;
 
+import cn.lili.common.aop.annotation.DemoSite;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -9,7 +10,6 @@ import cn.lili.modules.member.entity.dto.MemberAddDTO;
 import cn.lili.modules.member.entity.vo.MemberSearchVO;
 import cn.lili.modules.member.entity.vo.MemberVO;
 import cn.lili.modules.member.service.MemberService;
-import cn.lili.modules.system.aspect.annotation.DemoSite;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

manager-api/src/main/java/cn/lili/controller/message/MemberMessageManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.member;
+package cn.lili.controller.message;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;

manager-api/src/main/java/cn/lili/controller/message/MemberNoticeLogManagerController.java

@@ -1,11 +1,11 @@
-package cn.lili.controller.member;
+package cn.lili.controller.message;
 
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.MemberNoticeLog;
 import cn.lili.modules.member.service.MemberNoticeLogService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/message/MemberNoticeManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.message;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;

manager-api/src/main/java/cn/lili/controller/message/MemberNoticeSenterManagerController.java

@@ -1,12 +1,12 @@
-package cn.lili.controller.member;
+package cn.lili.controller.message;
 
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
 import cn.lili.modules.member.entity.dos.MemberNoticeSenter;
 import cn.lili.modules.member.service.MemberNoticeSenterService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/message/ServiceNoticeManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.message;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;

manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java

@@ -1,11 +1,11 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
-import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
-import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
-import cn.lili.modules.order.order.service.AfterSaleService;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
+import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
+import cn.lili.modules.order.aftersale.service.AfterSaleService;
 import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
 import cn.lili.modules.system.entity.vo.Traces;
 import com.baomidou.mybatisplus.core.metadata.IPage;

manager-api/src/main/java/cn/lili/controller/order/AfterSaleReasonManagerController.java

@@ -1,10 +1,10 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.order.entity.dos.AfterSaleReason;
-import cn.lili.modules.order.order.service.AfterSaleReasonService;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSaleReason;
+import cn.lili.modules.order.aftersale.service.AfterSaleReasonService;
 import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

manager-api/src/main/java/cn/lili/controller/order/OrderComplaintManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.AuthUser;

manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java

@@ -1,12 +1,12 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
 import cn.lili.modules.order.trade.entity.dos.OrderLog;
 import cn.lili.modules.order.trade.service.OrderLogService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;

manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java

@@ -1,13 +1,13 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
 import cn.lili.modules.order.order.entity.dos.Order;
 import cn.lili.modules.order.order.entity.vo.PaymentLog;
-import cn.lili.modules.payment.service.PaymentService;
+import cn.lili.modules.order.order.service.OrderService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class PaymentLogManagerController {
 
     @Autowired
-    private PaymentService paymentService;
+    private OrderService orderService;
 
 
     @GetMapping
@@ -39,6 +39,6 @@ public class PaymentLogManagerController {
     public ResultMessage<IPage<PaymentLog>> getByPage(Order order,
                                                       SearchVO searchVo,
                                                       PageVO page) {
-        return ResultUtil.data(paymentService.page(PageUtil.initPage(page), PageUtil.initWrapper(order, searchVo)));
+        return ResultUtil.data(orderService.queryPaymentLogs(PageUtil.initPage(page), PageUtil.initWrapper(order, searchVo)));
     }
 }

manager-api/src/main/java/cn/lili/controller/order/ReceiptManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;

manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java

@@ -1,4 +1,4 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;

manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java

@@ -1,6 +1,5 @@
 package cn.lili.controller.other;
 
-import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.search.service.EsGoodsIndexService;
@@ -27,9 +26,6 @@ public class ElasticsearchController {
     @Autowired
     private EsGoodsIndexService esGoodsIndexService;
 
-    @Autowired
-    private Cache cache;
-
     @GetMapping
     public ResultMessage<String> init() {
         esGoodsIndexService.init();

manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java

@@ -1,14 +1,13 @@
 package cn.lili.controller.other;
 
+import cn.lili.common.aop.annotation.DemoSite;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.system.aspect.annotation.DemoSite;
 import cn.lili.modules.page.entity.dos.PageData;
 import cn.lili.modules.page.entity.dto.PageDataDTO;
 import cn.lili.modules.page.entity.vos.PageDataListVO;
 import cn.lili.modules.page.service.PageDataService;
-import cn.lili.modules.system.aspect.annotation.DemoSite;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java

@@ -1,12 +1,11 @@
 package cn.lili.controller.other;
 
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.system.entity.dos.SensitiveWords;
 import cn.lili.modules.system.service.SensitiveWordsService;
-import cn.lili.modules.system.utils.SensitiveWordsFilter;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -48,7 +47,7 @@ public class SensitiveWordsManagerController {
     @PostMapping
     public ResultMessage<SensitiveWords> add(@Valid SensitiveWords sensitiveWords) {
         sensitiveWordsService.save(sensitiveWords);
-        SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord());
+        sensitiveWordsService.resetCache();
         return ResultUtil.data(sensitiveWords);
     }
 
@@ -58,7 +57,7 @@ public class SensitiveWordsManagerController {
     public ResultMessage<SensitiveWords> edit(@PathVariable String id, SensitiveWords sensitiveWords) {
         sensitiveWords.setId(id);
         sensitiveWordsService.updateById(sensitiveWords);
-        SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord());
+        sensitiveWordsService.resetCache();
         return ResultUtil.data(sensitiveWords);
     }
 
@@ -66,12 +65,8 @@ public class SensitiveWordsManagerController {
     @ApiImplicitParam(name = "ids", value = "敏感词ID", required = true, dataType = "String", allowMultiple = true, paramType = "path")
     @DeleteMapping(value = "/delByIds/{ids}")
     public ResultMessage<Object> delAllByIds(@PathVariable List<String> ids) {
-        for (String id : ids) {
-            String name = sensitiveWordsService.getById(id).getSensitiveWord();
-            SensitiveWordsFilter.remove(name);
-            sensitiveWordsService.removeById(id);
-        }
+        sensitiveWordsService.removeByIds(ids);
+        sensitiveWordsService.resetCache();
         return ResultUtil.success();
-
     }
 }

manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java

@@ -1,10 +1,10 @@
 package cn.lili.controller.other;
 
+import cn.lili.common.aop.annotation.DemoSite;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
-import cn.lili.modules.system.aspect.annotation.DemoSite;
 import cn.lili.modules.verification.entity.dos.VerificationSource;
 import cn.lili.modules.verification.service.VerificationSourceService;
 import cn.lili.mybatis.util.PageUtil;

manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java

@@ -1,5 +1,6 @@
 package cn.lili.controller.passport;
 
+import cn.lili.common.aop.annotation.DemoSite;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
@@ -17,8 +18,7 @@ import cn.lili.modules.permission.entity.dto.AdminUserDTO;
 import cn.lili.modules.permission.entity.vo.AdminUserVO;
 import cn.lili.modules.permission.service.AdminUserService;
 import cn.lili.modules.permission.service.DepartmentService;
-import cn.lili.modules.system.aspect.annotation.DemoSite;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;

manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java

@@ -1,12 +1,12 @@
 package cn.lili.controller.permission;
 
+import cn.lili.common.aop.annotation.DemoSite;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.permission.entity.dos.Menu;
 import cn.lili.modules.permission.entity.dto.MenuSearchParams;
 import cn.lili.modules.permission.entity.vo.MenuVO;
 import cn.lili.modules.permission.service.MenuService;
-import cn.lili.modules.system.aspect.annotation.DemoSite;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java

@@ -1,10 +1,10 @@
 package cn.lili.controller.setting;
 
+import cn.lili.common.aop.annotation.DemoSite;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.system.aspect.annotation.DemoSite;
-import cn.lili.modules.system.service.RegionService;
 import cn.lili.modules.system.entity.dos.Region;
+import cn.lili.modules.system.service.RegionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java

@@ -1,11 +1,11 @@
 package cn.lili.controller.setting;
 
 import cn.hutool.json.JSONUtil;
+import cn.lili.common.aop.annotation.DemoSite;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.system.aspect.annotation.DemoSite;
 import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.dto.*;
 import cn.lili.modules.system.entity.dto.connect.QQConnectSetting;

manager-api/src/main/java/cn/lili/controller/sms/SmsManagerController.java

@@ -1,10 +1,10 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.sms;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.message.entity.dos.SmsReach;
-import cn.lili.modules.message.service.SmsReachService;
+import cn.lili.modules.sms.entity.dos.SmsReach;
+import cn.lili.modules.sms.service.SmsReachService;
 import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;

manager-api/src/main/java/cn/lili/controller/sms/SmsSignManagerController.java

@@ -1,10 +1,10 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.sms;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.message.entity.dos.SmsSign;
-import cn.lili.modules.message.service.SmsSignService;
+import cn.lili.modules.sms.entity.dos.SmsSign;
+import cn.lili.modules.sms.service.SmsSignService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

manager-api/src/main/java/cn/lili/controller/sms/SmsTemplateManagerController.java

@@ -1,10 +1,10 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.sms;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.message.entity.dos.SmsTemplate;
-import cn.lili.modules.message.service.SmsTemplateService;
+import cn.lili.modules.sms.entity.dos.SmsTemplate;
+import cn.lili.modules.sms.service.SmsTemplateService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java

@@ -5,7 +5,7 @@ import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
 import cn.lili.modules.statistics.entity.vo.CategoryStatisticsDataVO;
 import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
-import cn.lili.modules.statistics.service.GoodsStatisticsDataService;
+import cn.lili.modules.statistics.service.StoreFlowStatisticsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,22 +21,22 @@ import java.util.List;
  * @author Bulbasaur
  * @since 2020/12/9 19:04
  */
-@Api(tags = "管理端,商品统计接口")
+@Api(tags = "管理端,商品流水统计接口")
 @RestController
 @RequestMapping("/manager/statistics/goods")
 public class GoodsStatisticsManagerController {
     @Autowired
-    private GoodsStatisticsDataService goodsStatisticsDataService;
+    private StoreFlowStatisticsService storeFlowStatisticsService;
 
     @ApiOperation(value = "获取统计列表,排行前一百的数据")
     @GetMapping
     public ResultMessage<List<GoodsStatisticsDataVO>> getByPage(GoodsStatisticsQueryParam goodsStatisticsQueryParam) {
-        return ResultUtil.data(goodsStatisticsDataService.getGoodsStatisticsData(goodsStatisticsQueryParam, 100));
+        return ResultUtil.data(storeFlowStatisticsService.getGoodsStatisticsData(goodsStatisticsQueryParam, 100));
     }
 
     @ApiOperation(value = "获取行业统计列表")
     @GetMapping("/getCategoryByPage")
     public ResultMessage<List<CategoryStatisticsDataVO>> getCategoryByPage(GoodsStatisticsQueryParam goodsStatisticsQueryParam) {
-        return ResultUtil.data(goodsStatisticsDataService.getCategoryStatisticsData(goodsStatisticsQueryParam));
+        return ResultUtil.data(storeFlowStatisticsService.getCategoryStatisticsData(goodsStatisticsQueryParam));
     }
 }

manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java

@@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.statistics.entity.dos.MemberStatisticsData;
 import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
-import cn.lili.modules.statistics.service.MemberStatisticsDataService;
+import cn.lili.modules.statistics.service.MemberStatisticsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,11 +25,11 @@ import java.util.List;
 @RequestMapping("/manager/statistics/member")
 public class MemberStatisticsManagerController {
     @Autowired
-    private MemberStatisticsDataService memberStatisticsDataService;
+    private MemberStatisticsService memberStatisticsService;
 
     @ApiOperation(value = "获取会员统计")
     @GetMapping
     public ResultMessage<List<MemberStatisticsData>> getByList(StatisticsQueryParam statisticsQueryParam) {
-        return ResultUtil.data(memberStatisticsDataService.statistics(statisticsQueryParam));
+        return ResultUtil.data(memberStatisticsService.statistics(statisticsQueryParam));
     }
 }

manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java

@@ -3,14 +3,13 @@ package cn.lili.controller.statistics;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.order.entity.dos.AfterSale;
+import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
-import cn.lili.modules.order.order.service.AfterSaleService;
-import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
 import cn.lili.modules.statistics.entity.vo.OrderOverviewVO;
 import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO;
-import cn.lili.modules.statistics.service.OrderStatisticsDataService;
+import cn.lili.modules.statistics.service.AfterSaleStatisticsService;
+import cn.lili.modules.statistics.service.OrderStatisticsService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,17 +33,15 @@ import java.util.List;
 @RequestMapping("/manager/statistics/order")
 public class OrderStatisticsManagerController {
     @Autowired
-    private OrderStatisticsDataService orderStatisticsDataService;
+    private OrderStatisticsService orderStatisticsService;
     @Autowired
-    private OrderService orderService;
-    @Autowired
-    private AfterSaleService afterSaleService;
+    private AfterSaleStatisticsService afterSaleStatisticsService;
 
     @ApiOperation(value = "订单概览统计")
     @GetMapping("/overview")
     public ResultMessage<OrderOverviewVO> overview(StatisticsQueryParam statisticsQueryParam) {
         try {
-            return ResultUtil.data(orderStatisticsDataService.overview(statisticsQueryParam));
+            return ResultUtil.data(orderStatisticsService.overview(statisticsQueryParam));
         } catch (Exception e) {
             log.error("订单概览统计错误",e);
         }
@@ -55,7 +52,7 @@ public class OrderStatisticsManagerController {
     @GetMapping
     public ResultMessage<List<OrderStatisticsDataVO>> statisticsChart(StatisticsQueryParam statisticsQueryParam) {
         try {
-            return ResultUtil.data(orderStatisticsDataService.statisticsChart(statisticsQueryParam));
+            return ResultUtil.data(orderStatisticsService.statisticsChart(statisticsQueryParam));
         } catch (Exception e) {
             log.error("订单图表统计",e);
         }
@@ -67,7 +64,7 @@ public class OrderStatisticsManagerController {
     @GetMapping("/order")
     public ResultMessage<IPage<OrderSimpleVO>> order(StatisticsQueryParam statisticsQueryParam, PageVO pageVO) {
         try {
-            return ResultUtil.data(orderService.getStatistics(statisticsQueryParam, pageVO));
+            return ResultUtil.data(orderStatisticsService.getStatistics(statisticsQueryParam, pageVO));
         } catch (Exception e) {
             log.error("订单统计",e);
         }
@@ -78,6 +75,6 @@ public class OrderStatisticsManagerController {
     @ApiOperation(value = "退单统计")
     @GetMapping("/refund")
     public ResultMessage<IPage<AfterSale>> refund(StatisticsQueryParam statisticsQueryParam, PageVO pageVO) {
-        return ResultUtil.data(afterSaleService.getStatistics(statisticsQueryParam, pageVO));
+        return ResultUtil.data(afterSaleStatisticsService.getStatistics(statisticsQueryParam, pageVO));
     }
 }

manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java

@@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.vo.MemberDistributionVO;
 import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
 import cn.lili.modules.statistics.entity.vo.OnlineMemberVO;
 import cn.lili.modules.statistics.entity.vo.PlatformViewVO;
-import cn.lili.modules.statistics.service.PlatformViewDataService;
+import cn.lili.modules.statistics.service.PlatformViewService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,31 +27,31 @@ import java.util.List;
 @RequestMapping("/manager/statistics/view")
 public class ViewStatisticsManagerController {
     @Autowired
-    private PlatformViewDataService platformViewDataService;
+    private PlatformViewService platformViewService;
 
     @ApiOperation(value = "流量数据 表单获取")
     @GetMapping("/list")
     public ResultMessage<List<PlatformViewVO>> getByPage(StatisticsQueryParam queryParam) {
-        return ResultUtil.data(platformViewDataService.list(queryParam));
+        return ResultUtil.data(platformViewService.list(queryParam));
     }
 
     @ApiOperation(value = "当前在线人数")
     @GetMapping("/online/current")
     public ResultMessage<Long> currentNumberPeopleOnline() {
-        return ResultUtil.data(platformViewDataService.online());
+        return ResultUtil.data(platformViewService.online());
     }
 
 
     @ApiOperation(value = "会员分布")
     @GetMapping("/online/distribution")
     public ResultMessage<List<MemberDistributionVO>> memberDistribution() {
-        return ResultUtil.data(platformViewDataService.memberDistribution());
+        return ResultUtil.data(platformViewService.memberDistribution());
     }
 
     @ApiOperation(value = "在线人数历史（默认48小时）")
     @GetMapping("/online/history")
     public ResultMessage<List<OnlineMemberVO>> history() {
-        return ResultUtil.data(platformViewDataService.statisticsOnline());
+        return ResultUtil.data(platformViewService.statisticsOnline());
     }
 
 }

manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java

@@ -4,6 +4,7 @@ import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.order.order.entity.dos.StoreFlow;
+import cn.lili.modules.order.order.service.StoreFlowService;
 import cn.lili.modules.store.entity.dos.Bill;
 import cn.lili.modules.store.entity.dto.BillSearchParams;
 import cn.lili.modules.store.entity.vos.BillListVO;
@@ -31,6 +32,9 @@ public class BillManagerController {
     @Autowired
     private BillService billService;
 
+    @Autowired
+    private StoreFlowService storeFlowService;
+
     @ApiOperation(value = "通过id获取结算单")
     @ApiImplicitParam(name = "id", value = "结算单ID", required = true, paramType = "path")
     @GetMapping(value = "/get/{id}")
@@ -51,7 +55,7 @@ public class BillManagerController {
     })
     @GetMapping(value = "/{id}/getStoreFlow")
     public ResultMessage<IPage<StoreFlow>> getStoreFlow(@PathVariable String id, String flowType, PageVO pageVO) {
-        return ResultUtil.data(billService.getStoreFlow(id, flowType, pageVO));
+        return ResultUtil.data(storeFlowService.getStoreFlow(id, flowType, pageVO));
     }
 
     @ApiOperation(value = "支付结算单")

manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java

@@ -1,5 +1,6 @@
 package cn.lili.controller.store;
 
+import cn.lili.common.aop.annotation.DemoSite;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -12,7 +13,6 @@ import cn.lili.modules.store.entity.vos.StoreSearchParams;
 import cn.lili.modules.store.entity.vos.StoreVO;
 import cn.lili.modules.store.service.StoreDetailService;
 import cn.lili.modules.store.service.StoreService;
-import cn.lili.modules.system.aspect.annotation.DemoSite;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;

manager-api/src/main/java/cn/lili/controller/wallet/MemberWalletManagerController.java

@@ -1,9 +1,9 @@
-package cn.lili.controller.member;
+package cn.lili.controller.wallet;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.member.entity.vo.MemberWalletVO;
-import cn.lili.modules.member.service.MemberWalletService;
+import cn.lili.modules.wallet.entity.vo.MemberWalletVO;
+import cn.lili.modules.wallet.service.MemberWalletService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java

@@ -1,12 +1,12 @@
-package cn.lili.controller.member;
+package cn.lili.controller.wallet;
 
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
-import cn.lili.modules.member.entity.vo.MemberWithdrawApplyQueryVO;
-import cn.lili.modules.member.service.MemberWithdrawApplyService;
+import cn.lili.modules.wallet.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.wallet.entity.vo.MemberWithdrawApplyQueryVO;
+import cn.lili.modules.wallet.service.MemberWithdrawApplyService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java

@@ -1,11 +1,11 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.wallet;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.trade.entity.dos.Recharge;
 import cn.lili.modules.order.trade.entity.vo.RechargeQueryVO;
-import cn.lili.modules.order.trade.service.RechargeService;
+import cn.lili.modules.wallet.entity.dos.Recharge;
+import cn.lili.modules.wallet.service.RechargeService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java

@@ -1,11 +1,11 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.wallet;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.order.trade.entity.dos.WalletLog;
 import cn.lili.modules.order.trade.entity.vo.DepositQueryVO;
-import cn.lili.modules.order.trade.service.WalletLogService;
+import cn.lili.modules.wallet.entity.dos.WalletLog;
+import cn.lili.modules.wallet.service.WalletLogService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/wechat/WechatMPMessageManagerController.java

@@ -1,12 +1,12 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.wechat;
 
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.common.vo.SearchVO;
-import cn.lili.modules.message.entity.dos.WechatMPMessage;
-import cn.lili.modules.message.service.WechatMPMessageService;
+import cn.lili.modules.wechat.entity.dos.WechatMPMessage;
+import cn.lili.modules.wechat.service.WechatMPMessageService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/controller/wechat/WechatMessageManageController.java

@@ -1,11 +1,11 @@
-package cn.lili.controller.setting;
+package cn.lili.controller.wechat;
 
 import cn.lili.common.enums.ResultUtil;
-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.message.entity.dos.WechatMessage;
-import cn.lili.modules.message.service.WechatMessageService;
+import cn.lili.modules.wechat.entity.dos.WechatMessage;
+import cn.lili.modules.wechat.service.WechatMessageService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java

@@ -1,6 +1,7 @@
 package cn.lili.security;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import cn.lili.cache.Cache;
 import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.AuthUser;
@@ -90,25 +91,39 @@ public class ManagerAuthenticationFilter extends BasicAuthenticationFilter {
             //获取数据(GET 请求)权限
             if (request.getMethod().equals(RequestMethod.GET.name())) {
                 //如果用户的超级权限和查阅权限都不包含当前请求的api
-                if (PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), requestUrl)
-                        || PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.QUERY.name()).toArray(new String[0]), requestUrl)) {
+                if (match(permission.get(PermissionEnum.SUPER.name()), requestUrl) ||
+                        match(permission.get(PermissionEnum.QUERY.name()), requestUrl)) {
                 } else {
                     ResponseUtil.output(response, ResponseUtil.resultMap(false, 400, "权限不足"));
+                    log.error("当前请求路径：{},所拥有权限：{}", requestUrl, JSONUtil.toJsonStr(permission));
                     throw new NoPermissionException("权限不足");
                 }
             }
             //非get请求（数据操作） 判定鉴权
             else {
-                if (PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), requestUrl)) {
-
-                } else {
+                if (!match(permission.get(PermissionEnum.SUPER.name()), requestUrl)) {
                     ResponseUtil.output(response, ResponseUtil.resultMap(false, 400, "权限不足"));
+                    log.error("当前请求路径：{},所拥有权限：{}", requestUrl, JSONUtil.toJsonStr(permission));
                     throw new NoPermissionException("权限不足");
                 }
             }
         }
     }
 
+    /**
+     * 校验权限
+     *
+     * @param permissions 权限集合
+     * @param url         请求地址
+     * @return 是否拥有权限
+     */
+    boolean match(List<String> permissions, String url) {
+        if (permissions == null || permissions.isEmpty()) {
+            return false;
+        }
+        return PatternMatchUtils.simpleMatch(permissions.toArray(new String[0]), url);
+    }
+
     /**
      * 获取token信息
      *

manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java

@@ -1,8 +1,8 @@
 package cn.lili.test.rocketmq;
 
-import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.rocketmq.tags.MqOrderTagsEnum;
 import cn.lili.common.properties.RocketmqCustomProperties;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.OrderTagsEnum;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -29,7 +29,7 @@ class MsgExtRocketMqTest {
 
     @Test
     void searchAll() {
-        String destination = rocketmqCustomProperties.getOrderTopic() + ":" + MqOrderTagsEnum.STATUS_CHANGE.name();
+        String destination = rocketmqCustomProperties.getOrderTopic() + ":" + OrderTagsEnum.STATUS_CHANGE.name();
         Message<String> message = MessageBuilder.withPayload("Context").build();
         rocketMQTemplate.asyncSend(destination, message, RocketmqSendCallbackBuilder.commonCallback());
         rocketMQTemplate.send(destination, message);