merge branch "master"

seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java

@@ -1,6 +1,7 @@
-package cn.lili.controller.other.distribution;
+package cn.lili.controller.distribution;
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.distribution.entity.dos.DistributionGoods;
@@ -9,7 +10,6 @@ import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams;
 import cn.lili.modules.distribution.entity.vos.DistributionGoodsVO;
 import cn.lili.modules.distribution.service.DistributionGoodsService;
 import cn.lili.modules.distribution.service.DistributionSelectedGoodsService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;

seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.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.security.context.UserContext;

seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java

@@ -2,7 +2,6 @@ package cn.lili.controller.goods;
 
 import cn.lili.modules.goods.entity.vos.ParameterGroupVO;
 import cn.lili.modules.goods.service.CategoryParameterGroupService;
-import cn.lili.modules.goods.service.ParametersService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -27,8 +26,6 @@ import java.util.List;
 @Transactional(rollbackFor = Exception.class)
 public class CategoryParameterGroupStoreController {
 
-    @Autowired
-    private ParametersService parametersService;
 
     @Autowired
     private CategoryParameterGroupService categoryParameterGroupService;

seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java

@@ -3,6 +3,7 @@ package cn.lili.controller.goods;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.goods.entity.dos.DraftGoods;
@@ -10,7 +11,6 @@ import cn.lili.modules.goods.entity.dto.DraftGoodsDTO;
 import cn.lili.modules.goods.entity.dto.DraftGoodsSearchParams;
 import cn.lili.modules.goods.entity.vos.DraftGoodsVO;
 import cn.lili.modules.goods.service.DraftGoodsService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java

@@ -1,12 +1,12 @@
 package cn.lili.controller.goods;
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.store.entity.dos.StoreGoodsLabel;
-import cn.lili.modules.store.entity.vos.StoreGoodsLabelVO;
-import cn.lili.modules.store.service.StoreGoodsLabelService;
-import cn.lili.modules.system.utils.OperationalJudgment;
+import cn.lili.modules.goods.entity.dos.StoreGoodsLabel;
+import cn.lili.modules.goods.entity.vos.StoreGoodsLabelVO;
+import cn.lili.modules.goods.service.StoreGoodsLabelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java

@@ -1,6 +1,7 @@
 package cn.lili.controller.goods;
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.goods.entity.dos.Goods;
@@ -16,7 +17,6 @@ import cn.lili.modules.goods.service.GoodsService;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.store.entity.dos.StoreDetail;
 import cn.lili.modules.store.service.StoreDetailService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;

seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java

@@ -1,16 +1,17 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.member;
 
 import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 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;
 import cn.lili.modules.store.service.BillService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -36,6 +37,9 @@ public class BillStoreController {
     @Autowired
     private BillService billService;
 
+    @Autowired
+    private StoreFlowService storeFlowService;
+
     @ApiOperation(value = "获取结算单分页")
     @GetMapping(value = "/getByPage")
     public ResultMessage<IPage<BillListVO>> getByPage(BillSearchParams billSearchParams) {
@@ -59,7 +63,7 @@ public class BillStoreController {
     @GetMapping(value = "/{id}/getStoreFlow")
     public ResultMessage<IPage<StoreFlow>> getStoreFlow(@PathVariable String id, String flowType, PageVO pageVO) {
         OperationalJudgment.judgment(billService.getById(id));
-        return ResultUtil.data(billService.getStoreFlow(id, flowType, pageVO));
+        return ResultUtil.data(storeFlowService.getStoreFlow(id, flowType, pageVO));
     }
 
     @ApiOperation(value = "获取商家分销订单流水分页")
@@ -69,7 +73,7 @@ public class BillStoreController {
     @GetMapping(value = "/{id}/getDistributionFlow")
     public ResultMessage<IPage<StoreFlow>> getDistributionFlow(@PathVariable String id, PageVO pageVO) {
         OperationalJudgment.judgment(billService.getById(id));
-        return ResultUtil.data(billService.getDistributionFlow(id, pageVO));
+        return ResultUtil.data(storeFlowService.getDistributionFlow(id, pageVO));
     }
 
     @ApiOperation(value = "核对结算单")
@@ -81,13 +85,13 @@ public class BillStoreController {
         return ResultUtil.success();
     }
 
-    @ApiOperation(value = "下载结算单",produces="application/octet-stream")
+    @ApiOperation(value = "下载结算单", produces = "application/octet-stream")
     @ApiImplicitParam(name = "id", value = "结算单ID", required = true, paramType = "path", dataType = "String")
     @GetMapping(value = "/downLoad/{id}")
     public void downLoadDeliverExcel(@PathVariable String id) {
         OperationalJudgment.judgment(billService.getById(id));
         HttpServletResponse response = ThreadContextHolder.getHttpResponse();
-        billService.download(response,id);
+        billService.download(response, id);
 
     }
 

seller-api/src/main/java/cn/lili/controller/member/MemberEvaluationStoreController.java

@@ -1,13 +1,13 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.member;
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dto.EvaluationQueryParams;
 import cn.lili.modules.member.entity.vo.MemberEvaluationListVO;
 import cn.lili.modules.member.entity.vo.MemberEvaluationVO;
 import cn.lili.modules.member.service.MemberEvaluationService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/message/StoreMessageController.java

@@ -1,7 +1,8 @@
-package cn.lili.controller.settings;
+package cn.lili.controller.message;
 
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -9,7 +10,6 @@ import cn.lili.modules.message.entity.dos.StoreMessage;
 import cn.lili.modules.message.entity.enums.MessageStatusEnum;
 import cn.lili.modules.message.entity.vos.StoreMessageQueryVO;
 import cn.lili.modules.message.service.StoreMessageService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java

@@ -1,15 +1,15 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 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 cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java

@@ -1,7 +1,8 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.AuthUser;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -10,7 +11,6 @@ import cn.lili.modules.order.order.entity.enums.CommunicationOwnerEnum;
 import cn.lili.modules.order.order.entity.vo.*;
 import cn.lili.modules.order.order.service.OrderComplaintCommunicationService;
 import cn.lili.modules.order.order.service.OrderComplaintService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.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.security.OperationalJudgment;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.order.trade.entity.dos.OrderLog;
 import cn.lili.modules.order.trade.service.OrderLogService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java

@@ -1,19 +1,19 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dto.MemberAddressDTO;
+import cn.lili.modules.member.service.StoreLogisticsService;
 import cn.lili.modules.order.order.entity.dto.OrderExportDTO;
 import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
 import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
 import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
 import cn.lili.modules.order.order.service.OrderPriceService;
 import cn.lili.modules.order.order.service.OrderService;
-import cn.lili.modules.system.service.StoreLogisticsService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java

@@ -1,6 +1,7 @@
-package cn.lili.controller.trade;
+package cn.lili.controller.order;
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -9,7 +10,6 @@ import cn.lili.modules.order.order.entity.dto.OrderReceiptDTO;
 import cn.lili.modules.order.order.entity.dto.ReceiptSearchParams;
 import cn.lili.modules.order.order.service.OrderService;
 import cn.lili.modules.order.order.service.ReceiptService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java

@@ -3,13 +3,13 @@ package cn.lili.controller.other.broadcast;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.goods.entity.dos.Studio;
 import cn.lili.modules.goods.entity.vos.StudioVO;
 import cn.lili.modules.goods.service.StudioService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java

@@ -8,7 +8,7 @@ import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
-import cn.lili.modules.verification.enums.VerificationEnums;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
 import cn.lili.modules.verification.service.VerificationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java

@@ -4,6 +4,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -11,7 +12,6 @@ import cn.lili.modules.promotion.entity.dos.Coupon;
 import cn.lili.modules.promotion.entity.vos.CouponSearchParams;
 import cn.lili.modules.promotion.entity.vos.CouponVO;
 import cn.lili.modules.promotion.service.CouponService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;

seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java

@@ -3,6 +3,7 @@ package cn.lili.controller.promotion;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.AuthUser;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -10,7 +11,6 @@ import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
 import cn.lili.modules.promotion.entity.dos.FullDiscount;
 import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams;
 import cn.lili.modules.promotion.service.FullDiscountService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java

@@ -5,6 +5,7 @@ import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -15,7 +16,6 @@ import cn.lili.modules.promotion.entity.vos.PintuanVO;
 import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;
 import cn.lili.modules.promotion.service.PintuanService;
 import cn.lili.modules.promotion.service.PromotionGoodsService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java

@@ -1,6 +1,7 @@
 package cn.lili.controller.promotion;
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -10,7 +11,6 @@ import cn.lili.modules.promotion.entity.vos.SeckillApplyVO;
 import cn.lili.modules.promotion.entity.vos.SeckillSearchParams;
 import cn.lili.modules.promotion.service.SeckillApplyService;
 import cn.lili.modules.promotion.service.SeckillService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java

@@ -1,11 +1,11 @@
 package cn.lili.controller.settings;
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.store.entity.vos.FreightTemplateVO;
 import cn.lili.modules.store.service.FreightTemplateService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java

@@ -4,9 +4,9 @@ package cn.lili.controller.settings;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.member.service.StoreLogisticsService;
 import cn.lili.modules.store.entity.dos.StoreLogistics;
 import cn.lili.modules.system.entity.vo.StoreLogisticsVO;
-import cn.lili.modules.system.service.StoreLogisticsService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java

@@ -2,12 +2,12 @@ package cn.lili.controller.settings;
 
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.store.entity.dos.StoreAddress;
 import cn.lili.modules.store.service.StoreAddressService;
-import cn.lili.modules.system.utils.OperationalJudgment;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java

@@ -56,6 +56,14 @@ public class StoreSettingsController {
         return ResultUtil.data(result);
     }
 
+    @ApiOperation(value = "修改商家设置")
+    @PutMapping("/merchantEuid")
+    public ResultMessage<Object> edit(String merchantEuid) {
+        //修改UDESK设置
+        Boolean result = storeDetailService.editMerchantEuid(merchantEuid);
+        return ResultUtil.data(result);
+    }
+
     @ApiOperation(value = "修改店铺库存预警数量")
     @ApiImplicitParam(name = "stockWarning", value = "库存预警数量", required = true, dataType = "Integer", paramType = "query")
     @PutMapping("/updateStockWarning")

seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java

@@ -5,7 +5,7 @@ import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
 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;
@@ -31,13 +31,13 @@ public class GoodsStatisticsStoreController {
      * 商品统计
      */
     @Autowired
-    private GoodsStatisticsDataService goodsStatisticsDataService;
+    private StoreFlowStatisticsService storeFlowStatisticsService;
 
     @ApiOperation(value = "获取统计列表,排行前一百的数据")
     @GetMapping
     public ResultMessage<List<GoodsStatisticsDataVO>> getByPage(GoodsStatisticsQueryParam statisticsQueryParam) {
         String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
         statisticsQueryParam.setStoreId(storeId);
-        return ResultUtil.data(goodsStatisticsDataService.getGoodsStatisticsData(statisticsQueryParam, 100));
+        return ResultUtil.data(storeFlowStatisticsService.getGoodsStatisticsData(statisticsQueryParam, 100));
     }
 }

seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java

@@ -6,8 +6,8 @@ import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
 import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
 import cn.lili.modules.statistics.entity.vo.StoreIndexStatisticsVO;
-import cn.lili.modules.statistics.service.GoodsStatisticsDataService;
 import cn.lili.modules.statistics.service.IndexStatisticsService;
+import cn.lili.modules.statistics.service.StoreFlowStatisticsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ public class IndexStatisticsStoreController {
      * 热卖商品统计
      */
     @Autowired
-    private GoodsStatisticsDataService goodsStatisticsDataService;
+    private StoreFlowStatisticsService storeFlowStatisticsService;
     /**
      * 首页统计
      */
@@ -45,7 +45,7 @@ public class IndexStatisticsStoreController {
     public ResultMessage<List<GoodsStatisticsDataVO>> getByPage(GoodsStatisticsQueryParam statisticsQueryParam) {
         String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
         statisticsQueryParam.setStoreId(storeId);
-        return ResultUtil.data(goodsStatisticsDataService.getGoodsStatisticsData(statisticsQueryParam, 100));
+        return ResultUtil.data(storeFlowStatisticsService.getGoodsStatisticsData(statisticsQueryParam, 100));
     }
 
     @ApiOperation(value = "获取首页查询数据")

seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java

@@ -4,14 +4,13 @@ import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.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;
@@ -36,21 +35,16 @@ import java.util.Objects;
 @RequestMapping("/store/statistics/order")
 public class OrderStatisticsStoreController {
 
-    /**
-     * 订单
-     */
-    @Autowired
-    private OrderService orderService;
     /**
      * 售后
      */
     @Autowired
-    private AfterSaleService afterSaleService;
+    private AfterSaleStatisticsService afterSaleStatisticsService;
     /**
      * 订单统计
      */
     @Autowired
-    private OrderStatisticsDataService orderStatisticsDataService;
+    private OrderStatisticsService orderStatisticsService;
 
     @ApiOperation(value = "订单概览统计")
     @GetMapping("/overview")
@@ -58,7 +52,7 @@ public class OrderStatisticsStoreController {
         String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
         try {
             statisticsQueryParam.setStoreId(storeId);
-            return ResultUtil.data(orderStatisticsDataService.overview(statisticsQueryParam));
+            return ResultUtil.data(orderStatisticsService.overview(statisticsQueryParam));
         } catch (Exception e) {
             log.error("订单概览统计错误", e);
         }
@@ -71,7 +65,7 @@ public class OrderStatisticsStoreController {
         String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
         try {
             statisticsQueryParam.setStoreId(storeId);
-            return ResultUtil.data(orderStatisticsDataService.statisticsChart(statisticsQueryParam));
+            return ResultUtil.data(orderStatisticsService.statisticsChart(statisticsQueryParam));
         } catch (Exception e) {
             log.error("订单图表统计错误", e);
         }
@@ -85,7 +79,7 @@ public class OrderStatisticsStoreController {
         String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
         try {
             statisticsQueryParam.setStoreId(storeId);
-            return ResultUtil.data(orderService.getStatistics(statisticsQueryParam, pageVO));
+            return ResultUtil.data(orderStatisticsService.getStatistics(statisticsQueryParam, pageVO));
         } catch (Exception e) {
             log.error("订单统计错误", e);
         }
@@ -98,6 +92,6 @@ public class OrderStatisticsStoreController {
     public ResultMessage<IPage<AfterSale>> refund(StatisticsQueryParam statisticsQueryParam, PageVO pageVO) {
         String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
         statisticsQueryParam.setStoreId(storeId);
-        return ResultUtil.data(afterSaleService.getStatistics(statisticsQueryParam, pageVO));
+        return ResultUtil.data(afterSaleStatisticsService.getStatistics(statisticsQueryParam, pageVO));
     }
 }

seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java

@@ -5,7 +5,7 @@ import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
 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,13 +27,13 @@ import java.util.Objects;
 @RequestMapping("/store/statistics/view")
 public class ViewStatisticsStoreController {
     @Autowired
-    private PlatformViewDataService platformViewDataService;
+    private PlatformViewService platformViewService;
 
     @ApiOperation(value = "流量数据 表单获取")
     @GetMapping("/list")
     public ResultMessage<List<PlatformViewVO>> getByPage(StatisticsQueryParam queryParam) {
         String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
         queryParam.setStoreId(storeId);
-        return ResultUtil.data(platformViewDataService.list(queryParam));
+        return ResultUtil.data(platformViewService.list(queryParam));
     }
 }