From ed55b07e0000d99d0aeb796649077d178256fbb8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Jan 2021 17:17:08 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java |   80 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
index 0b7fba6..9389cc0 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
@@ -1,13 +1,28 @@
 package com.matrix.system.app.action;
 
 import com.matrix.core.pojo.AjaxResult;
-import com.matrix.system.app.vo.RankingDto;
+import com.matrix.core.tools.DateUtil;
+import com.matrix.system.app.dto.RankingDto;
+import com.matrix.system.app.vo.RankingVo;
+import com.matrix.system.common.tools.DataAuthUtil;
+import com.matrix.system.hive.action.util.QueryUtil;
+import com.matrix.system.hive.bean.AchieveNew;
+import com.matrix.system.hive.bean.SysOrder;
+import com.matrix.system.hive.dao.AchieveNewDao;
+import com.matrix.system.hive.service.AchieveNewService;
+import com.matrix.system.hive.service.SysOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * @author wzy
@@ -18,19 +33,68 @@
 @RequestMapping(value ="/api/ranking")
 public class ApiRankingAction {
 
-    public AjaxResult findStaffAchieveRanking() {
-        return null;
+    @Autowired
+    private SysOrderService sysOrderService;
+
+    @Autowired
+    private AchieveNewDao achieveNewDao;
+
+    @ApiOperation(value = "顾问业绩排行榜", notes = "顾问业绩排行榜")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "ok", response = RankingVo.class)
+    })
+    @PostMapping(value = "/findStaffAchieveRanking")
+    public AjaxResult findStaffAchieveRanking(@RequestBody RankingDto rankingDto) {
+        SysOrder sysOrder = new SysOrder();
+        if (DataAuthUtil.hasAllShopAuth()) {
+            QueryUtil.setQueryLimitCom(sysOrder);
+        } else {
+            QueryUtil.setQueryLimit(sysOrder);
+        }
+        sysOrder.setOrderTime(new Date());
+        sysOrder.setType(rankingDto.getType());
+        return AjaxResult.buildSuccessInstance(sysOrderService.findStaffSaleAchieveRanking(sysOrder));
     }
 
     @ApiOperation(value = "门店业绩排行榜", notes = "门店业绩排行榜")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "ok", response = RankingDto.class)
+            @ApiResponse(code = 200, message = "ok", response = RankingVo.class)
     })
-    public AjaxResult findShopAchieveRanking() {
-        return null;
+    @PostMapping(value = "/findShopAchieveRanking")
+    public AjaxResult findShopAchieveRanking(@RequestBody RankingDto rankingDto) {
+        AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("");
+        if (RankingDto.SALE.equals(rankingDto.getDataType())) {
+            SysOrder sysOrder = new SysOrder();
+            QueryUtil.setQueryLimitCom(sysOrder);
+            sysOrder.setType(rankingDto.getType());
+            sysOrder.setOrderTime(new Date());
+            List<RankingVo> list = sysOrderService.findApiShopAchieveRanking(sysOrder);
+            ajaxResult.setRows(list);
+        } else {
+            AchieveNew achieveNew = new AchieveNew();
+            QueryUtil.setQueryLimitCom(achieveNew);
+            achieveNew.setDatatime(new Date());
+            achieveNew.setT1(rankingDto.getType());
+            List<RankingVo> rankingVos = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
+            ajaxResult.setRows(rankingVos);
+        }
+        return ajaxResult;
     }
 
-    public AjaxResult findBeauticianAchieveRanking() {
-        return null;
+    @ApiOperation(value = "美疗师业绩排行榜", notes = "美疗师业绩排行榜")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "ok", response = RankingVo.class)
+    })
+    @PostMapping(value = "/findBeauticianAchieveRanking")
+    public AjaxResult findBeauticianAchieveRanking(@RequestBody RankingDto rankingDto) {
+        AchieveNew achieveNew = new AchieveNew();
+        if (DataAuthUtil.hasAllShopAuth()) {
+            QueryUtil.setQueryLimitCom(achieveNew);
+        } else {
+            QueryUtil.setQueryLimit(achieveNew);
+        }
+        achieveNew.setDatatime(new Date());
+        achieveNew.setT1(rankingDto.getType());
+        return AjaxResult.buildSuccessInstance(achieveNewDao.selectBeauticianConsumeAchieveRanking(achieveNew));
     }
 }

--
Gitblit v1.9.1