瀏覽代碼

Merge remote-tracking branch 'origin/master'

zhaoxian 2 年之前
父節點
當前提交
3a39bf8730
共有 32 個文件被更改,包括 833 次插入210 次删除
  1. 1 1
      ruixuan-admin/src/main/resources/application-prod.yml
  2. 60 6
      ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java
  3. 43 1
      ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemListController.java
  4. 5 7
      ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouRuleDetailController.java
  5. 139 9
      ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouRuleSettlementDataController.java
  6. 61 58
      ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouSettlementRulesController.java
  7. 6 3
      ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java
  8. 12 0
      ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouItemCollectSamples.java
  9. 11 0
      ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouItemList.java
  10. 66 58
      ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouRuleDetail.java
  11. 0 3
      ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouRuleSettlementData.java
  12. 23 21
      ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouSettlementRules.java
  13. 2 0
      ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouItemListMapper.java
  14. 8 0
      ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouRuleDetailMapper.java
  15. 6 0
      ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouRuleSettlementDataMapper.java
  16. 7 0
      ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouSettlementRulesMapper.java
  17. 2 0
      ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouItemListService.java
  18. 6 0
      ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouRuleSettlementDataService.java
  19. 8 0
      ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouSettlementRulesService.java
  20. 5 0
      ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemListServiceImpl.java
  21. 15 0
      ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouRuleSettlementDataServiceImpl.java
  22. 61 0
      ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouSettlementRulesServiceImpl.java
  23. 15 1
      ruixuan-live/src/main/resources/mapper/isc/KuaishouItemCollectSamplesMapper.xml
  24. 23 8
      ruixuan-live/src/main/resources/mapper/isc/KuaishouItemListMapper.xml
  25. 48 16
      ruixuan-live/src/main/resources/mapper/isc/KuaishouRuleDetailMapper.xml
  26. 97 2
      ruixuan-live/src/main/resources/mapper/isc/KuaishouRuleSettlementDataMapper.xml
  27. 51 13
      ruixuan-live/src/main/resources/mapper/isc/KuaishouSettlementRulesMapper.xml
  28. 22 3
      ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml
  29. 4 0
      ruixuan-system/src/main/java/com/ruixuan/system/mapper/SysDeptMapper.java
  30. 3 0
      ruixuan-system/src/main/java/com/ruixuan/system/service/ISysDeptService.java
  31. 7 0
      ruixuan-system/src/main/java/com/ruixuan/system/service/impl/SysDeptServiceImpl.java
  32. 16 0
      ruixuan-system/src/main/resources/mapper/system/SysDeptMapper.xml

+ 1 - 1
ruixuan-admin/src/main/resources/application-prod.yml

@@ -185,7 +185,7 @@ telephoneRobot:
 
 
 promoter:
 promoter:
   #启动宇鹏清洗数据的服务IP
   #启动宇鹏清洗数据的服务IP
-  start_ip_path: http://111.206.86.187:9999/
+  start_ip_path: http://103.46.170.108:9999/
   #内网数据库服务IP
   #内网数据库服务IP
   internal_ip_path: http://api.tjyourong.com.cn/material/
   internal_ip_path: http://api.tjyourong.com.cn/material/
 
 

+ 60 - 6
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -82,14 +82,13 @@ public class KuaishouItemCollectSamplesController extends BaseController {
      */
      */
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(Long itemId, Long promoterId, Long userId, Integer collectSampleStatus, String itemTitle, String promoterNickName, String promoterPhone,
     public TableDataInfo list(Long itemId, Long promoterId, Long userId, Integer collectSampleStatus, String itemTitle, String promoterNickName, String promoterPhone,
-                              String consignee, Long itemCreateId, Long collectSampleId
-    ) {
+                              String consignee, Long itemCreateId, Long collectSampleId, String courierNumber, String collectSampleDesc, String fieId, String sort) {
         TableDataInfo tableDataInfo = new TableDataInfo();
         TableDataInfo tableDataInfo = new TableDataInfo();
         try {
         try {
             Map<String, Object> requestMap = new HashMap<>();
             Map<String, Object> requestMap = new HashMap<>();
             if (!Check.isNull(userId)) {
             if (!Check.isNull(userId)) {
+                String roleId = sysRoleService.getRoleBYUserId(userId);
                 if (!Check.isNull(collectSampleStatus)) {
                 if (!Check.isNull(collectSampleStatus)) {
-                    String roleId = sysRoleService.getRoleBYUserId(userId);
                     if (roleId.equals("courtshipManager") || roleId.equals("bdManager") || roleId.equals("associationManager")) { // 经理层级查看部门下所有数据
                     if (roleId.equals("courtshipManager") || roleId.equals("bdManager") || roleId.equals("associationManager")) { // 经理层级查看部门下所有数据
                         Long deptId = sysDeptService.getDeptIdByUserId(userId);
                         Long deptId = sysDeptService.getDeptIdByUserId(userId);
                         List<Long> userIds = sysDeptService.getDeptUserListByDeptId(deptId);
                         List<Long> userIds = sysDeptService.getDeptUserListByDeptId(deptId);
@@ -103,6 +102,20 @@ public class KuaishouItemCollectSamplesController extends BaseController {
                     } else if (roleId.equals("courtship")) { // 招商查看创建人为自己的领样信息
                     } else if (roleId.equals("courtship")) { // 招商查看创建人为自己的领样信息
                         requestMap.put("itemCreateId", userId);
                         requestMap.put("itemCreateId", userId);
                     }
                     }
+                } else {
+                    if (roleId.equals("courtshipManager")) { // 经理层级查看部门下所有数据
+                        Long deptId = sysDeptService.getDeptIdByUserId(userId);
+                        List<Long> userIds = sysDeptService.getDeptUserListByDeptId(deptId);
+                        if (roleId.equals("bdManager") || roleId.equals("associationManager")) {
+                            requestMap.put("collectSampleIds", userIds);
+                        } else {
+                            requestMap.put("itemCreateIds", userIds);
+                        }
+                    } else if (roleId.equals("bd")) { // 社群和bd查看申请人为自己的领样信息
+                        requestMap.put("collectSampleId", userId);
+                    } else if (roleId.equals("courtship")) { // 招商查看创建人为自己的领样信息
+                        requestMap.put("itemCreateId", userId);
+                    }
                 }
                 }
             }
             }
             if (!Check.isNull(itemId)) {
             if (!Check.isNull(itemId)) {
@@ -132,6 +145,18 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             if (!Check.isNull(collectSampleId)) {
             if (!Check.isNull(collectSampleId)) {
                 requestMap.put("collectSampleId", collectSampleId);
                 requestMap.put("collectSampleId", collectSampleId);
             }
             }
+            if (!Check.isNull(courierNumber)) {
+                requestMap.put("courierNumber", courierNumber);
+            }
+            if (!Check.isNull(collectSampleDesc)) {
+                requestMap.put("collectSampleDesc", collectSampleDesc);
+            }
+            if (!Check.isNull(fieId)) {
+                requestMap.put("fieId", fieId);
+            }
+            if (!Check.isNull(sort)) {
+                requestMap.put("sort", sort);
+            }
             startPage();
             startPage();
             List<KuaishouItemCollectSamples> list = kuaishouItemCollectSamplesService.selectKuaishouItemCollectSamplesList(requestMap);
             List<KuaishouItemCollectSamples> list = kuaishouItemCollectSamplesService.selectKuaishouItemCollectSamplesList(requestMap);
             return getDataTable(list);
             return getDataTable(list);
@@ -144,6 +169,18 @@ public class KuaishouItemCollectSamplesController extends BaseController {
     }
     }
 
 
 
 
+    @GetMapping("/getUserList")
+    public JSONObject getUserList(Long userId) {
+        JSONObject returnJson = new JSONObject();
+        Long deptId = sysDeptService.getDeptIdByUserId(userId);
+        List<JSONObject> userIds = sysDeptService.getUserListByDeptId(deptId);
+        returnJson.put("code", 0);
+        returnJson.put("message", "查询成功");
+        returnJson.put("data", userIds);
+        return returnJson;
+    }
+
+
     /**
     /**
      * 领样预览
      * 领样预览
      */
      */
@@ -256,9 +293,13 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             }
             }
             String courierNumber = kuaishouItemCollectSamples.getCourierNumber();
             String courierNumber = kuaishouItemCollectSamples.getCourierNumber();
             if (!Check.isNull(courierNumber)) {
             if (!Check.isNull(courierNumber)) {
+                if (courierNumber.contains(" ") || courierNumber.contains(".") || courierNumber.contains("、") || courierNumber.contains(",") || courierNumber.contains("@") || courierNumber.contains("#")) {
+                    throw new Exception("快递单号不能包含空格及特殊字符");
+                }
                 sampleLog.setCollectSampleStatus(4);
                 sampleLog.setCollectSampleStatus(4);
                 kuaishouItemCollectSamples.setCollectSampleStatus(4);
                 kuaishouItemCollectSamples.setCollectSampleStatus(4);
                 kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
                 kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
+                kuaishouItemCollectSamples.setCourierNumberTime(new Date());
                 // 调用快递接口
                 // 调用快递接口
                 kuaishouItemCollectSamplesService.subscribe(id, courierNumber, kuaishouItemCollectSamples.getCompanyCode());
                 kuaishouItemCollectSamplesService.subscribe(id, courierNumber, kuaishouItemCollectSamples.getCompanyCode());
             }
             }
@@ -364,9 +405,15 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             if (Check.isNull(companyCode)) {
             if (Check.isNull(companyCode)) {
                 throw new Exception("公司编号不能为空");
                 throw new Exception("公司编号不能为空");
             }
             }
+
+            if (courierNumber.contains(" ") || courierNumber.contains(".") || courierNumber.contains("、") || courierNumber.contains(",") || courierNumber.contains("@") || courierNumber.contains("#")) {
+                throw new Exception("快递单号不能包含空格及特殊字符");
+            }
             KuaishouItemCollectSamples kuaishouItemCollectSamples = new KuaishouItemCollectSamples();
             KuaishouItemCollectSamples kuaishouItemCollectSamples = new KuaishouItemCollectSamples();
             kuaishouItemCollectSamples.setId(id);
             kuaishouItemCollectSamples.setId(id);
+            kuaishouItemCollectSamples.setCollectSampleDesc("商品已发货");
             kuaishouItemCollectSamples.setCourierNumber(courierNumber);
             kuaishouItemCollectSamples.setCourierNumber(courierNumber);
+            kuaishouItemCollectSamples.setCourierNumberTime(new Date());
             int i = kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
             int i = kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
             if (i > 0) {
             if (i > 0) {
                 kuaishouItemCollectSamplesService.subscribe(id, courierNumber, companyCode);
                 kuaishouItemCollectSamplesService.subscribe(id, courierNumber, companyCode);
@@ -459,15 +506,17 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             if (Check.isNull(paramJson)) {
             if (Check.isNull(paramJson)) {
                 throw new Exception("回调信息为空");
                 throw new Exception("回调信息为空");
             }
             }
+            String status = paramJson.getString("status");
+            String message = paramJson.getString("message");
             JSONObject lastResult = paramJson.getJSONObject("lastResult");
             JSONObject lastResult = paramJson.getJSONObject("lastResult");
             if (!Check.isNull(lastResult)) {
             if (!Check.isNull(lastResult)) {
                 String state = lastResult.getString("state");
                 String state = lastResult.getString("state");
                 String nu = lastResult.getString("nu");
                 String nu = lastResult.getString("nu");
                 String com = lastResult.getString("com");
                 String com = lastResult.getString("com");
                 if ("3".equals(state)) {
                 if ("3".equals(state)) {
-                    Integer status = kuaishouItemCollectSamplesService.getStatusByCourierNumbe(nu);
-                    if (!Check.isNull(status)) {
-                        if (status < 5) { // 防止快递重复回调
+                    Integer sampleStatus = kuaishouItemCollectSamplesService.getStatusByCourierNumbe(nu);
+                    if (!Check.isNull(sampleStatus)) {
+                        if (sampleStatus < 5) { // 防止快递重复回调
                             KuaishouItemCollectSamples updateSample = new KuaishouItemCollectSamples();
                             KuaishouItemCollectSamples updateSample = new KuaishouItemCollectSamples();
                             updateSample.setCourierNumber(nu);
                             updateSample.setCourierNumber(nu);
                             updateSample.setCollectSampleStatus(5);
                             updateSample.setCollectSampleStatus(5);
@@ -475,6 +524,11 @@ public class KuaishouItemCollectSamplesController extends BaseController {
                             kuaishouItemCollectSamplesService.updateByNum(updateSample);
                             kuaishouItemCollectSamplesService.updateByNum(updateSample);
                         }
                         }
                     }
                     }
+                } else if ("0".equals(state) && "abort".equals(status) && message.contains("无记录")) {
+                    KuaishouItemCollectSamples updateSample = new KuaishouItemCollectSamples();
+                    updateSample.setCourierNumber(nu);
+                    updateSample.setCollectSampleDesc("单号异常");
+                    kuaishouItemCollectSamplesService.updateByNum(updateSample);
                 }
                 }
                 JSONArray data = lastResult.getJSONArray("data");
                 JSONArray data = lastResult.getJSONArray("data");
                 KuaishouItemCollectSampleExpress express = new KuaishouItemCollectSampleExpress();
                 KuaishouItemCollectSampleExpress express = new KuaishouItemCollectSampleExpress();

+ 43 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemListController.java

@@ -351,7 +351,6 @@ public class KuaishouItemListController extends BaseController {
     }
     }
 
 
 
 
-    @Log(title = "修改", businessType = BusinessType.UPDATE)
     @GetMapping("/editRelateByItemId")
     @GetMapping("/editRelateByItemId")
     public JSONObject editRelateByItemId(Long itemId, Long relateId) {
     public JSONObject editRelateByItemId(Long itemId, Long relateId) {
         JSONObject returnJson = new JSONObject();
         JSONObject returnJson = new JSONObject();
@@ -375,5 +374,48 @@ public class KuaishouItemListController extends BaseController {
         return returnJson;
         return returnJson;
     }
     }
 
 
+
+    @GetMapping("/editRuleIdByItemId")
+    public JSONObject editRuleIdByItemId(Long itemId, Long ruleId) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            KuaishouItemList itemInfoByItemId = kuaishouItemListService.getItemInfoByItemId(itemId);
+            if (Check.isNull(itemInfoByItemId)) {
+                throw new Exception("该商品未绑定");
+            }
+            KuaishouItemList update = new KuaishouItemList();
+            update.setItemId(itemId);
+            update.setRuleId(ruleId);
+            int i = kuaishouItemListService.updateKuaishouItemList(update);
+            if (i > 0) {
+                returnJson.put("code", 0);
+                returnJson.put("message", "修改成功");
+            }
+        } catch (Exception e) {
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+    }
+
+
+
+    @GetMapping("/getListByRelateId")
+    public JSONObject getListByRelateId(Long relateId) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            List<JSONObject> list = kuaishouItemListService.getListByRelateId(relateId);
+            returnJson.put("code", 0);
+            returnJson.put("data", list);
+            returnJson.put("message", "修改成功");
+
+        } catch (Exception e) {
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+    }
+
+
 }
 }
 
 

+ 5 - 7
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouRuleDetailController.java

@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2023-05-15
  * @date 2023-05-15
  */
  */
 @RestController
 @RestController
-@RequestMapping("/system/detail")
+@RequestMapping("/detail")
 public class KuaishouRuleDetailController extends BaseController {
 public class KuaishouRuleDetailController extends BaseController {
     @Autowired
     @Autowired
     private IKuaishouRuleDetailService kuaishouRuleDetailService;
     private IKuaishouRuleDetailService kuaishouRuleDetailService;
@@ -70,9 +70,8 @@ public class KuaishouRuleDetailController extends BaseController {
     /**
     /**
      * 新增【请填写功能名称】
      * 新增【请填写功能名称】
      */
      */
-    @PreAuthorize("@ss.hasPermi('system:detail:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
-    @PostMapping
+
+    @PostMapping("/add")
     public AjaxResult add(@RequestBody KuaishouRuleDetail kuaishouRuleDetail) {
     public AjaxResult add(@RequestBody KuaishouRuleDetail kuaishouRuleDetail) {
         return toAjax(kuaishouRuleDetailService.insertKuaishouRuleDetail(kuaishouRuleDetail));
         return toAjax(kuaishouRuleDetailService.insertKuaishouRuleDetail(kuaishouRuleDetail));
     }
     }
@@ -80,9 +79,8 @@ public class KuaishouRuleDetailController extends BaseController {
     /**
     /**
      * 修改【请填写功能名称】
      * 修改【请填写功能名称】
      */
      */
-    @PreAuthorize("@ss.hasPermi('system:detail:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping
+
+    @PutMapping("/edit")
     public AjaxResult edit(@RequestBody KuaishouRuleDetail kuaishouRuleDetail) {
     public AjaxResult edit(@RequestBody KuaishouRuleDetail kuaishouRuleDetail) {
         return toAjax(kuaishouRuleDetailService.updateKuaishouRuleDetail(kuaishouRuleDetail));
         return toAjax(kuaishouRuleDetailService.updateKuaishouRuleDetail(kuaishouRuleDetail));
     }
     }

+ 139 - 9
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouRuleSettlementDataController.java

@@ -1,8 +1,12 @@
 package com.ruixuan.isc.controller;
 package com.ruixuan.isc.controller;
 
 
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Executors;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
@@ -14,10 +18,11 @@ import com.ruixuan.common.core.page.TableDataInfo;
 import com.ruixuan.common.enums.BusinessType;
 import com.ruixuan.common.enums.BusinessType;
 import com.ruixuan.common.utils.Check;
 import com.ruixuan.common.utils.Check;
 import com.ruixuan.common.utils.poi.ExcelUtil;
 import com.ruixuan.common.utils.poi.ExcelUtil;
-import com.ruixuan.isc.entity.KuaishouPromoter;
+import com.ruixuan.data.utils.ExportExcelUtils;
 import com.ruixuan.isc.entity.KuaishouRuleSettlementData;
 import com.ruixuan.isc.entity.KuaishouRuleSettlementData;
 import com.ruixuan.isc.service.IKuaishouRuleSettlementDataService;
 import com.ruixuan.isc.service.IKuaishouRuleSettlementDataService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
@@ -45,7 +50,6 @@ public class KuaishouRuleSettlementDataController extends BaseController {
         if (Check.isNull(data)) {
         if (Check.isNull(data)) {
             return;
             return;
         }
         }
-     //   kuaishouRuleSettlementDataService.data(statDate, data);
         executorService.submit(new Runnable() {
         executorService.submit(new Runnable() {
             @Override
             @Override
             public void run() {
             public void run() {
@@ -66,14 +70,123 @@ public class KuaishouRuleSettlementDataController extends BaseController {
     /**
     /**
      * 查询【请填写功能名称】列表
      * 查询【请填写功能名称】列表
      */
      */
-    @PreAuthorize("@ss.hasPermi('system:data:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(KuaishouRuleSettlementData kuaishouRuleSettlementData) {
+    @GetMapping("/getSettlementList")
+    public TableDataInfo list(String statDate, Long promoterId, String promoterName) {
+        Long date = Long.valueOf(statDate.replace("-", ""));
         startPage();
         startPage();
-        List<KuaishouRuleSettlementData> list = kuaishouRuleSettlementDataService.selectKuaishouRuleSettlementDataList(kuaishouRuleSettlementData);
+        List<JSONObject> list = kuaishouRuleSettlementDataService.getSettlementDate(date, promoterId, promoterName);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
 
 
+
+    @RequestMapping(value = "/exportSettlementList")
+    @ResponseBody
+    public void exportSettlementList(HttpServletRequest request, HttpServletResponse response, @RequestBody JSONObject requestJson) throws Exception {
+        Long date = Long.valueOf(requestJson.getString("statDate").replace("-", ""));
+        List<JSONObject> list = kuaishouRuleSettlementDataService.getSettlementDate(date, null, null);
+        List<List<Object>> exportList = new ArrayList<>();
+        if (!Check.isNull(list)) {
+            for (int i = 0; i < list.size(); i++) {
+                JSONObject data = list.get(i);
+                List<Object> export = new ArrayList();
+                export.add(data.getString("ruleName"));
+                export.add(data.getString("itemIds"));
+                export.add(data.getString("itemName"));
+                export.add(data.getString("promoterId"));
+                export.add(data.getString("promoterName"));
+                export.add(data.getString("orderNum"));
+                export.add(data.getString("validOrderNum"));
+                export.add(data.getString("lastSettlementOrderNum"));
+                export.add(data.getString("anchorAmount"));
+                export.add(data.getString("referenceAmount"));
+                export.add(data.getString("settlementStatusDesc"));
+                exportList.add(export);
+            }
+        }
+        String[] headers = {"规则名称", "商品ID", "商品名称", "达人ID", "达人名称", "订单数", "有效订单数", "上次结算有效单数", "达人激励", "推荐人激励", "结算状态"};
+        OutputStream os = response.getOutputStream();
+        ExportExcelUtils eeu = new ExportExcelUtils();
+        XSSFWorkbook workbook = new XSSFWorkbook();
+        eeu.exportExcel(workbook, 0, "达人激励", headers, exportList);
+        this.setResponseHeader(response, "达人激励.xls");
+        workbook.write(os);
+        os.flush();
+        os.close();
+    }
+
+    @GetMapping("/updatePromoterStatus")
+    public JSONObject updatePromoterStatus(String statDate, Long promoterId, Integer status) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            if (Check.isNull(statDate)) {
+                throw new Exception("请输入日期");
+            }
+            if (Check.isNull(promoterId)) {
+                throw new Exception("请输入达人ID");
+            }
+
+            if (Check.isNull(status)) {
+                throw new Exception("请输入状态");
+            }
+            Long date = Long.valueOf(statDate.replace("-", ""));
+            kuaishouRuleSettlementDataService.updatePromoterStatus(date, promoterId, status);
+        } catch (Exception e) {
+            e.printStackTrace();
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+
+        return returnJson;
+    }
+
+
+    @GetMapping("/getPromoterSettlementDetail")
+    public TableDataInfo getPromoterSettlementDetail(String statDate, Long promoterId, Integer settlementStatus) {
+        Long date = Long.valueOf(statDate.replace("-", ""));
+        startPage();
+        List<JSONObject> list = kuaishouRuleSettlementDataService.getPromoterSettlementDetail(date, promoterId, settlementStatus);
+        return getDataTable(list);
+    }
+
+    @RequestMapping(value = "/exportPromoterSettlementDetail")
+    @ResponseBody
+    public void exportPromoterSettlementDetail(HttpServletRequest request, HttpServletResponse response, @RequestBody JSONObject requestJson) throws Exception {
+        Long date = Long.valueOf(requestJson.getString("statDate").replace("-", ""));
+        Long promoterId = requestJson.getLong("promoterId");
+
+        List<JSONObject> list = kuaishouRuleSettlementDataService.getPromoterSettlementDetail(date, promoterId, null);
+        List<List<Object>> exportList = new ArrayList<>();
+        if (!Check.isNull(list)) {
+            for (int i = 0; i < list.size(); i++) {
+                JSONObject data = list.get(i);
+                List<Object> export = new ArrayList();
+                export.add(data.getString("ruleName"));
+                export.add(data.getString("itemIds"));
+                export.add(data.getString("promoterId"));
+                export.add(data.getString("promoterName"));
+                export.add(data.getString("itemCreateName"));
+                export.add(data.getString("promoterCreateName"));
+                export.add(data.getString("orderNum"));
+                export.add(data.getString("validOrderNum"));
+                export.add(data.getString("lastSettlementOrderNum"));
+                export.add(data.getString("anchorAmount"));
+                export.add(data.getString("referenceAmount"));
+                export.add(data.getString("settlementStatusStr"));
+                exportList.add(export);
+            }
+        }
+        String[] headers = {"规则名称", "结算商品ID", "达人ID", "达人名称", "商品创建人", "达人归属人", "结算单量", "有效结算单量", "上次结算单量", "达人激励金额", "推荐人激励金额", "结算状态"};
+        OutputStream os = response.getOutputStream();
+        ExportExcelUtils eeu = new ExportExcelUtils();
+        XSSFWorkbook workbook = new XSSFWorkbook();
+        eeu.exportExcel(workbook, 0, "达人激励", headers, exportList);
+        this.setResponseHeader(response, "达人激励.xls");
+        workbook.write(os);
+        os.flush();
+        os.close();
+    }
+
+
     /**
     /**
      * 导出【请填写功能名称】列表
      * 导出【请填写功能名称】列表
      */
      */
@@ -108,9 +221,8 @@ public class KuaishouRuleSettlementDataController extends BaseController {
     /**
     /**
      * 修改【请填写功能名称】
      * 修改【请填写功能名称】
      */
      */
-    @PreAuthorize("@ss.hasPermi('system:data:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping
+
+    @PutMapping("/edit")
     public AjaxResult edit(@RequestBody KuaishouRuleSettlementData kuaishouRuleSettlementData) {
     public AjaxResult edit(@RequestBody KuaishouRuleSettlementData kuaishouRuleSettlementData) {
         return toAjax(kuaishouRuleSettlementDataService.updateKuaishouRuleSettlementData(kuaishouRuleSettlementData));
         return toAjax(kuaishouRuleSettlementDataService.updateKuaishouRuleSettlementData(kuaishouRuleSettlementData));
     }
     }
@@ -124,5 +236,23 @@ public class KuaishouRuleSettlementDataController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(kuaishouRuleSettlementDataService.deleteKuaishouRuleSettlementDataByIds(ids));
         return toAjax(kuaishouRuleSettlementDataService.deleteKuaishouRuleSettlementDataByIds(ids));
     }
     }
+
+    //发送响应流方法
+    public void setResponseHeader(HttpServletResponse response, String fileName) {
+        try {
+            try {
+                fileName = new String(fileName.getBytes(), "ISO8859-1");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            response.setContentType("application/octet-stream;charset=ISO8859-1");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            response.addHeader("Pargam", "no-cache");
+            response.addHeader("Cache-Control", "no-cache");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
 }
 }
 
 

+ 61 - 58
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouSettlementRulesController.java

@@ -1,26 +1,18 @@
 package com.ruixuan.isc.controller;
 package com.ruixuan.isc.controller;
 
 
 import java.util.List;
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
 
 
-import com.ruixuan.common.annotation.Log;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.ruixuan.common.core.controller.BaseController;
 import com.ruixuan.common.core.controller.BaseController;
 import com.ruixuan.common.core.domain.AjaxResult;
 import com.ruixuan.common.core.domain.AjaxResult;
 import com.ruixuan.common.core.page.TableDataInfo;
 import com.ruixuan.common.core.page.TableDataInfo;
-import com.ruixuan.common.enums.BusinessType;
-import com.ruixuan.common.utils.poi.ExcelUtil;
+import com.ruixuan.common.utils.Check;
+import com.ruixuan.isc.entity.KuaishouRuleDetail;
 import com.ruixuan.isc.entity.KuaishouSettlementRules;
 import com.ruixuan.isc.entity.KuaishouSettlementRules;
 import com.ruixuan.isc.service.IKuaishouSettlementRulesService;
 import com.ruixuan.isc.service.IKuaishouSettlementRulesService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 /**
 /**
  * 【请填写功能名称】Controller
  * 【请填写功能名称】Controller
@@ -29,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2023-05-15
  * @date 2023-05-15
  */
  */
 @RestController
 @RestController
-@RequestMapping("/system/rules")
+@RequestMapping("/rules")
 public class KuaishouSettlementRulesController extends BaseController {
 public class KuaishouSettlementRulesController extends BaseController {
     @Autowired
     @Autowired
     private IKuaishouSettlementRulesService kuaishouSettlementRulesService;
     private IKuaishouSettlementRulesService kuaishouSettlementRulesService;
@@ -37,62 +29,73 @@ public class KuaishouSettlementRulesController extends BaseController {
     /**
     /**
      * 查询【请填写功能名称】列表
      * 查询【请填写功能名称】列表
      */
      */
-    @PreAuthorize("@ss.hasPermi('system:rules:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(KuaishouSettlementRules kuaishouSettlementRules) {
+    @GetMapping("/getRuleList")
+    public TableDataInfo list(Long userId, String ruleName) {
         startPage();
         startPage();
-        List<KuaishouSettlementRules> list = kuaishouSettlementRulesService.selectKuaishouSettlementRulesList(kuaishouSettlementRules);
+        if(userId == 1){
+            userId = null;
+        }
+        List<JSONObject> list = kuaishouSettlementRulesService.getRuleList(userId, ruleName);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
 
 
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @PreAuthorize("@ss.hasPermi('system:rules:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, KuaishouSettlementRules kuaishouSettlementRules) {
-        List<KuaishouSettlementRules> list = kuaishouSettlementRulesService.selectKuaishouSettlementRulesList(kuaishouSettlementRules);
-        ExcelUtil<KuaishouSettlementRules> util = new ExcelUtil<KuaishouSettlementRules>(KuaishouSettlementRules.class);
-        util.exportExcel(response, list, "【请填写功能名称】数据");
+    @GetMapping("/getRuleListNoPage")
+    public JSONObject getRuleListNoPage(Long userId, String ruleNam) {
+        JSONObject returnJson = new JSONObject();
+        if(userId == 1){
+            userId = null;
+        }
+        List<JSONObject> data = kuaishouSettlementRulesService.getRuleList(userId, ruleNam);
+        returnJson.put("code", 0);
+        returnJson.put("message", "true");
+        returnJson.put("data", data);
+        return returnJson;
     }
     }
 
 
-    /**
-     * 获取【请填写功能名称】详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('system:rules:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(kuaishouSettlementRulesService.selectKuaishouSettlementRulesById(id));
-    }
 
 
-    /**
-     * 新增【请填写功能名称】
-     */
-    @PreAuthorize("@ss.hasPermi('system:rules:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody KuaishouSettlementRules kuaishouSettlementRules) {
-        return toAjax(kuaishouSettlementRulesService.insertKuaishouSettlementRules(kuaishouSettlementRules));
+    @PostMapping("/addRule")
+    public JSONObject addRule(@RequestBody JSONObject requestJson) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            if (Check.isNull(requestJson)) {
+                throw new Exception("入参不能为空");
+            }
+            JSONArray ruleDetails = requestJson.getJSONArray("ruleDetails");
+            if (Check.isNull(ruleDetails)) {
+                throw new Exception("请输入规则详情");
+            }
+            kuaishouSettlementRulesService.addRules(requestJson);
+            returnJson.put("code", 0);
+            returnJson.put("message", "新增成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
     }
     }
 
 
-    /**
-     * 修改【请填写功能名称】
-     */
-    @PreAuthorize("@ss.hasPermi('system:rules:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping
+
+    @PutMapping("/edit")
     public AjaxResult edit(@RequestBody KuaishouSettlementRules kuaishouSettlementRules) {
     public AjaxResult edit(@RequestBody KuaishouSettlementRules kuaishouSettlementRules) {
         return toAjax(kuaishouSettlementRulesService.updateKuaishouSettlementRules(kuaishouSettlementRules));
         return toAjax(kuaishouSettlementRulesService.updateKuaishouSettlementRules(kuaishouSettlementRules));
     }
     }
 
 
-    /**
-     * 删除【请填写功能名称】
-     */
-    @PreAuthorize("@ss.hasPermi('system:rules:remove')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(kuaishouSettlementRulesService.deleteKuaishouSettlementRulesByIds(ids));
+
+    @DeleteMapping("/remove")
+    public AjaxResult remove( Long id) {
+        return toAjax(kuaishouSettlementRulesService.deleteKuaishouSettlementRulesById(id));
     }
     }
+
+    @GetMapping("/getRuleDetailByRuleId")
+    public JSONObject getRuleDetailByRuleId(Long ruleId) {
+        JSONObject returnJson = new JSONObject();
+        List<KuaishouRuleDetail> data = kuaishouSettlementRulesService.getRuleDetailByRuleId(ruleId);
+        returnJson.put("code", 0);
+        returnJson.put("message", "true");
+        returnJson.put("data", data);
+        return returnJson;
+    }
+
+
 }
 }

+ 6 - 3
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -663,6 +663,9 @@ public class SupplyChainController extends BaseController {
                 export.add(date.getInteger("orderNum"));
                 export.add(date.getInteger("orderNum"));
                 export.add(date.getInteger("validOrderNUm"));
                 export.add(date.getInteger("validOrderNUm"));
                 export.add(date.getString("validRadio"));
                 export.add(date.getString("validRadio"));
+                export.add(date.getString("payAmount"));
+                export.add(date.getString("validPayAmount"));
+             //   export.add(date.getString("regimentalPromotionAmount"));
                 export.add(date.getString("deliveryNum"));
                 export.add(date.getString("deliveryNum"));
                 export.add(date.getString("deliveryRadio"));
                 export.add(date.getString("deliveryRadio"));
                 export.add(date.getString("notDeliveryNum"));
                 export.add(date.getString("notDeliveryNum"));
@@ -673,8 +676,7 @@ public class SupplyChainController extends BaseController {
                 exportList.add(export);
                 exportList.add(export);
             }
             }
         }
         }
-
-        String[] headers = {"达人名称", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数", "绑定人"};
+        String[] headers = {"达人名称", "订单数", "有效订单数", "有效订单率", "GVM", "有效GMV", "发货数", "发货率", "未发货数", "绑定人"};
         OutputStream os = response.getOutputStream();
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();
         ExportExcelUtils eeu = new ExportExcelUtils();
         XSSFWorkbook workbook = new XSSFWorkbook();
         XSSFWorkbook workbook = new XSSFWorkbook();
@@ -730,10 +732,11 @@ public class SupplyChainController extends BaseController {
                 export.add(date.getString("validRadio"));
                 export.add(date.getString("validRadio"));
                 export.add(date.getString("deliveryNum"));
                 export.add(date.getString("deliveryNum"));
                 export.add(date.getString("deliveryRadio"));
                 export.add(date.getString("deliveryRadio"));
+                export.add(date.getString("activityItemStatus"));
                 exportList.add(export);
                 exportList.add(export);
             }
             }
         }
         }
-        String[] headers = {"达人", "商品", "商品封面", "订单数", "有效订单数", "有效订单率", "发货数", "发货率"};
+        String[] headers = {"达人", "商品", "商品封面", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "商品状态"};
         OutputStream os = response.getOutputStream();
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();
         ExportExcelUtils eeu = new ExportExcelUtils();
         XSSFWorkbook workbook = new XSSFWorkbook();
         XSSFWorkbook workbook = new XSSFWorkbook();

+ 12 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouItemCollectSamples.java

@@ -6,6 +6,8 @@ import com.ruixuan.common.core.domain.BaseEntity;
 
 
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.annotation.Transient;
 
 
+import java.util.Date;
+
 
 
 /**
 /**
  * 【请填写功能名称】对象 kuaishou_item_collect_samples
  * 【请填写功能名称】对象 kuaishou_item_collect_samples
@@ -136,6 +138,7 @@ public class KuaishouItemCollectSamples extends BaseEntity {
      */
      */
     @Excel(name = "快递单号")
     @Excel(name = "快递单号")
     private String courierNumber;
     private String courierNumber;
+    private Date courierNumberTime;
 
 
     /**
     /**
      * 作业地址
      * 作业地址
@@ -352,6 +355,14 @@ public class KuaishouItemCollectSamples extends BaseEntity {
         this.courierNumber = courierNumber;
         this.courierNumber = courierNumber;
     }
     }
 
 
+    public Date getCourierNumberTime() {
+        return courierNumberTime;
+    }
+
+    public void setCourierNumberTime(Date courierNumberTime) {
+        this.courierNumberTime = courierNumberTime;
+    }
+
     public String getTaskFileUrl() {
     public String getTaskFileUrl() {
         return taskFileUrl;
         return taskFileUrl;
     }
     }
@@ -465,6 +476,7 @@ public class KuaishouItemCollectSamples extends BaseEntity {
                 ", promoterUrl='" + promoterUrl + '\'' +
                 ", promoterUrl='" + promoterUrl + '\'' +
                 ", consignee='" + consignee + '\'' +
                 ", consignee='" + consignee + '\'' +
                 ", courierNumber='" + courierNumber + '\'' +
                 ", courierNumber='" + courierNumber + '\'' +
+                ", courierNumberTime=" + courierNumberTime +
                 ", taskFileUrl='" + taskFileUrl + '\'' +
                 ", taskFileUrl='" + taskFileUrl + '\'' +
                 ", collectSampleStatus=" + collectSampleStatus +
                 ", collectSampleStatus=" + collectSampleStatus +
                 ", collectSampleDesc='" + collectSampleDesc + '\'' +
                 ", collectSampleDesc='" + collectSampleDesc + '\'' +

+ 11 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouItemList.java

@@ -223,6 +223,8 @@ public class KuaishouItemList extends BaseEntity {
     private Long validOrderNum;
     private Long validOrderNum;
     @Transient
     @Transient
     private Long validAmount;
     private Long validAmount;
+    @Transient
+    private String ruleName;
     private Integer samplesReceived;
     private Integer samplesReceived;
     private Integer samplesPeoples;
     private Integer samplesPeoples;
 
 
@@ -537,6 +539,14 @@ public class KuaishouItemList extends BaseEntity {
         this.validAmount = validAmount;
         this.validAmount = validAmount;
     }
     }
 
 
+    public String getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
+    }
+
     public Integer getSamplesReceived() {
     public Integer getSamplesReceived() {
         return samplesReceived;
         return samplesReceived;
     }
     }
@@ -610,6 +620,7 @@ public class KuaishouItemList extends BaseEntity {
                 ", detailUrl='" + detailUrl + '\'' +
                 ", detailUrl='" + detailUrl + '\'' +
                 ", validOrderNum=" + validOrderNum +
                 ", validOrderNum=" + validOrderNum +
                 ", validAmount=" + validAmount +
                 ", validAmount=" + validAmount +
+                ", ruleName='" + ruleName + '\'' +
                 ", samplesReceived=" + samplesReceived +
                 ", samplesReceived=" + samplesReceived +
                 ", samplesPeoples=" + samplesPeoples +
                 ", samplesPeoples=" + samplesPeoples +
                 ", relateId=" + relateId +
                 ", relateId=" + relateId +

+ 66 - 58
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouRuleDetail.java

@@ -1,9 +1,10 @@
 package com.ruixuan.isc.entity;
 package com.ruixuan.isc.entity;
+
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+
 import com.ruixuan.common.annotation.Excel;
 import com.ruixuan.common.annotation.Excel;
 import com.ruixuan.common.core.domain.BaseEntity;
 import com.ruixuan.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+
 
 
 
 
 /**
 /**
@@ -12,114 +13,121 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @author ruoyi
  * @date 2023-05-15
  * @date 2023-05-15
  */
  */
-public class KuaishouRuleDetail extends BaseEntity
-{
+public class KuaishouRuleDetail extends BaseEntity {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    /** 规则ID */
+    /**
+     * 规则ID
+     */
     private Long id;
     private Long id;
 
 
-    /** 规则名称 */
+    /**
+     * 规则名称
+     */
     @Excel(name = "规则名称")
     @Excel(name = "规则名称")
-    private String ruleId;
+    private Long ruleId;
 
 
-    /** 起始单数 */
+    /**
+     * 起始单数
+     */
     @Excel(name = "起始单数")
     @Excel(name = "起始单数")
     private Integer startItemCount;
     private Integer startItemCount;
 
 
-    /** 结束单数 */
+    /**
+     * 结束单数
+     */
     @Excel(name = "结束单数")
     @Excel(name = "结束单数")
     private Integer endItemCount;
     private Integer endItemCount;
 
 
-    /** 主播奖励金额 */
+    /**
+     * 主播奖励金额
+     */
     @Excel(name = "主播奖励金额")
     @Excel(name = "主播奖励金额")
     private BigDecimal anchorAmount;
     private BigDecimal anchorAmount;
 
 
-    /** 推荐人奖励金额 */
+    /**
+     * 推荐人奖励金额
+     */
     @Excel(name = "推荐人奖励金额")
     @Excel(name = "推荐人奖励金额")
     private BigDecimal referenceAmount;
     private BigDecimal referenceAmount;
 
 
-    /** 排序 */
+    /**
+     * 排序
+     */
     @Excel(name = "排序")
     @Excel(name = "排序")
     private Integer sortCount;
     private Integer sortCount;
 
 
-    public void setId(Long id)
-    {
-        this.id = id;
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
     }
 
 
-    public Long getId()
-    {
+    public Long getId() {
         return id;
         return id;
     }
     }
-    public void setRuleId(String ruleId)
-    {
-        this.ruleId = ruleId;
+
+    public void setId(Long id) {
+        this.id = id;
     }
     }
 
 
-    public String getRuleId()
-    {
+    public Long getRuleId() {
         return ruleId;
         return ruleId;
     }
     }
-    public void setStartItemCount(Integer startItemCount)
-    {
-        this.startItemCount = startItemCount;
+
+    public void setRuleId(Long ruleId) {
+        this.ruleId = ruleId;
     }
     }
 
 
-    public Integer getStartItemCount()
-    {
+    public Integer getStartItemCount() {
         return startItemCount;
         return startItemCount;
     }
     }
-    public void setEndItemCount(Integer endItemCount)
-    {
-        this.endItemCount = endItemCount;
+
+    public void setStartItemCount(Integer startItemCount) {
+        this.startItemCount = startItemCount;
     }
     }
 
 
-    public Integer getEndItemCount()
-    {
+    public Integer getEndItemCount() {
         return endItemCount;
         return endItemCount;
     }
     }
-    public void setAnchorAmount(BigDecimal anchorAmount)
-    {
-        this.anchorAmount = anchorAmount;
+
+    public void setEndItemCount(Integer endItemCount) {
+        this.endItemCount = endItemCount;
     }
     }
 
 
-    public BigDecimal getAnchorAmount()
-    {
+    public BigDecimal getAnchorAmount() {
         return anchorAmount;
         return anchorAmount;
     }
     }
-    public void setReferenceAmount(BigDecimal referenceAmount)
-    {
-        this.referenceAmount = referenceAmount;
+
+    public void setAnchorAmount(BigDecimal anchorAmount) {
+        this.anchorAmount = anchorAmount;
     }
     }
 
 
-    public BigDecimal getReferenceAmount()
-    {
+    public BigDecimal getReferenceAmount() {
         return referenceAmount;
         return referenceAmount;
     }
     }
-    public void setSortCount(Integer sortCount)
-    {
-        this.sortCount = sortCount;
+
+    public void setReferenceAmount(BigDecimal referenceAmount) {
+        this.referenceAmount = referenceAmount;
     }
     }
 
 
-    public Integer getSortCount()
-    {
+    public Integer getSortCount() {
         return sortCount;
         return sortCount;
     }
     }
 
 
+    public void setSortCount(Integer sortCount) {
+        this.sortCount = sortCount;
+    }
+
     @Override
     @Override
     public String toString() {
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("ruleId", getRuleId())
-                .append("startItemCount", getStartItemCount())
-                .append("endItemCount", getEndItemCount())
-                .append("anchorAmount", getAnchorAmount())
-                .append("referenceAmount", getReferenceAmount())
-                .append("sortCount", getSortCount())
-                .append("createTime", getCreateTime())
-                .append("updateTime", getUpdateTime())
-                .toString();
+        return "KuaishouRuleDetail{" +
+                "id=" + id +
+                ", ruleId=" + ruleId +
+                ", startItemCount=" + startItemCount +
+                ", endItemCount=" + endItemCount +
+                ", anchorAmount=" + anchorAmount +
+                ", referenceAmount=" + referenceAmount +
+                ", sortCount=" + sortCount +
+                '}';
     }
     }
 }
 }
 
 

+ 0 - 3
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouRuleSettlementData.java

@@ -5,9 +5,6 @@ import java.math.BigDecimal;
 
 
 import com.ruixuan.common.annotation.Excel;
 import com.ruixuan.common.annotation.Excel;
 import com.ruixuan.common.core.domain.BaseEntity;
 import com.ruixuan.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 /**
 /**
  * 【请填写功能名称】对象 kuaishou_rule_settlement_data
  * 【请填写功能名称】对象 kuaishou_rule_settlement_data
  *
  *

+ 23 - 21
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouSettlementRules.java

@@ -35,7 +35,7 @@ public class KuaishouSettlementRules extends BaseEntity {
      * 创建人id
      * 创建人id
      */
      */
     @Excel(name = "创建人id")
     @Excel(name = "创建人id")
-    private Integer userId;
+    private Long userId;
 
 
     /**
     /**
      * 创建人
      * 创建人
@@ -43,56 +43,58 @@ public class KuaishouSettlementRules extends BaseEntity {
     @Excel(name = "创建人")
     @Excel(name = "创建人")
     private String userName;
     private String userName;
 
 
-    public void setId(Long id) {
-        this.id = id;
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
     }
 
 
     public Long getId() {
     public Long getId() {
         return id;
         return id;
     }
     }
 
 
-    public void setRuleName(String ruleName) {
-        this.ruleName = ruleName;
+    public void setId(Long id) {
+        this.id = id;
     }
     }
 
 
     public String getRuleName() {
     public String getRuleName() {
         return ruleName;
         return ruleName;
     }
     }
 
 
-    public void setRuleType(Integer ruleType) {
-        this.ruleType = ruleType;
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
     }
     }
 
 
     public Integer getRuleType() {
     public Integer getRuleType() {
         return ruleType;
         return ruleType;
     }
     }
 
 
-    public void setUserId(Integer userId) {
-        this.userId = userId;
+    public void setRuleType(Integer ruleType) {
+        this.ruleType = ruleType;
     }
     }
 
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
         return userId;
     }
     }
 
 
-    public void setUserName(String userName) {
-        this.userName = userName;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
     }
 
 
     public String getUserName() {
     public String getUserName() {
         return userName;
         return userName;
     }
     }
 
 
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
     @Override
     @Override
     public String toString() {
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("ruleName", getRuleName())
-                .append("ruleType", getRuleType())
-                .append("userId", getUserId())
-                .append("userName", getUserName())
-                .append("createTime", getCreateTime())
-                .append("updateTime", getUpdateTime())
-                .toString();
+        return "KuaishouSettlementRules{" +
+                "id=" + id +
+                ", ruleName='" + ruleName + '\'' +
+                ", ruleType=" + ruleType +
+                ", userId=" + userId +
+                ", userName='" + userName + '\'' +
+                '}';
     }
     }
 }
 }

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouItemListMapper.java

@@ -53,5 +53,7 @@ public interface KuaishouItemListMapper {
     List<JSONObject> getRegimental();
     List<JSONObject> getRegimental();
 
 
     Long selectMaxRelateId();
     Long selectMaxRelateId();
+
+    List<JSONObject> getListByRelateId(@Param("relateId") Long relateId);
 }
 }
 
 

+ 8 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouRuleDetailMapper.java

@@ -1,5 +1,7 @@
 package com.ruixuan.isc.mapper;
 package com.ruixuan.isc.mapper;
+
 import com.ruixuan.isc.entity.KuaishouRuleDetail;
 import com.ruixuan.isc.entity.KuaishouRuleDetail;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -59,5 +61,11 @@ public interface KuaishouRuleDetailMapper
      * @return 结果
      * @return 结果
      */
      */
     public int deleteKuaishouRuleDetailByIds(Long[] ids);
     public int deleteKuaishouRuleDetailByIds(Long[] ids);
+
+    void addAll(@Param("adds") List<KuaishouRuleDetail> details);
+
+    void deleteKuaishouRuleDetailByRuleId(@Param("id") Long id);
+
+    List<KuaishouRuleDetail> getRuleDetailByRuleId(@Param("ruleId") Long ruleId);
 }
 }
 
 

+ 6 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouRuleSettlementDataMapper.java

@@ -78,4 +78,10 @@ public interface KuaishouRuleSettlementDataMapper {
     Integer getMaxRuleCountByRuleId(@Param("ruleId") Long ruleId);
     Integer getMaxRuleCountByRuleId(@Param("ruleId") Long ruleId);
 
 
     void replaceDatas(@Param("adds") List<KuaishouRuleSettlementData> adds);
     void replaceDatas(@Param("adds") List<KuaishouRuleSettlementData> adds);
+
+    List<JSONObject> getSettlementDate(@Param("statDate") Long statDate, @Param("promoterId") Long promoterId, @Param("promoterName") String promoterName);
+
+    void updatePromoterStatus(@Param("statDate") Long statDate, @Param("promoterId") Long promoterId, @Param("status") Integer status);
+
+    List<JSONObject> getPromoterSettlementDetail(@Param("date") Long date, @Param("promoterId") Long promoterId, @Param("settlementStatus") Integer settlementStatus);
 }
 }

+ 7 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouSettlementRulesMapper.java

@@ -1,5 +1,8 @@
 package com.ruixuan.isc.mapper;
 package com.ruixuan.isc.mapper;
+
+import com.alibaba.fastjson.JSONObject;
 import com.ruixuan.isc.entity.KuaishouSettlementRules;
 import com.ruixuan.isc.entity.KuaishouSettlementRules;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -59,5 +62,9 @@ public interface KuaishouSettlementRulesMapper
      * @return 结果
      * @return 结果
      */
      */
     public int deleteKuaishouSettlementRulesByIds(Long[] ids);
     public int deleteKuaishouSettlementRulesByIds(Long[] ids);
+
+    List<JSONObject> getRuleList(@Param("userId") Long userId, @Param("ruleName") String ruleName);
+
+    Long getMaxRuleId();
 }
 }
 
 

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouItemListService.java

@@ -46,5 +46,7 @@ public interface IKuaishouItemListService {
     void batchItemProcess(JSONArray itemIds, Integer status,Long examineId,String examineName);
     void batchItemProcess(JSONArray itemIds, Integer status,Long examineId,String examineName);
 
 
     List<JSONObject> getRegimental();
     List<JSONObject> getRegimental();
+
+    List<JSONObject> getListByRelateId(Long relateId);
 }
 }
 
 

+ 6 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouRuleSettlementDataService.java

@@ -64,5 +64,11 @@ public interface IKuaishouRuleSettlementDataService {
     void data(Long statDate, JSONArray dataArr);
     void data(Long statDate, JSONArray dataArr);
 
 
     JSONObject getRuleData(Long relateId, Long promoterId, Long ruleId, Long orderNum, Long validOrderNum, Long yesterdayOrderNum, Long yesterdayValidOrderNum);
     JSONObject getRuleData(Long relateId, Long promoterId, Long ruleId, Long orderNum, Long validOrderNum, Long yesterdayOrderNum, Long yesterdayValidOrderNum);
+
+    List<JSONObject> getSettlementDate(Long statDate, Long promoterId, String promoterName);
+
+    void updatePromoterStatus(Long statDate, Long promoterId, Integer status);
+
+    List<JSONObject> getPromoterSettlementDetail(Long date, Long promoterId,Integer settlementStatus);
 }
 }
 
 

+ 8 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouSettlementRulesService.java

@@ -1,5 +1,7 @@
 package com.ruixuan.isc.service;
 package com.ruixuan.isc.service;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.ruixuan.isc.entity.KuaishouRuleDetail;
 import com.ruixuan.isc.entity.KuaishouSettlementRules;
 import com.ruixuan.isc.entity.KuaishouSettlementRules;
 import java.util.List;
 import java.util.List;
 
 
@@ -59,5 +61,11 @@ public interface IKuaishouSettlementRulesService
      * @return 结果
      * @return 结果
      */
      */
     public int deleteKuaishouSettlementRulesById(Long id);
     public int deleteKuaishouSettlementRulesById(Long id);
+
+    List<JSONObject> getRuleList(Long userId,String ruleNam);
+
+    void addRules(JSONObject requestJson);
+
+    List<KuaishouRuleDetail> getRuleDetailByRuleId(Long ruleId);
 }
 }
 
 

+ 5 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemListServiceImpl.java

@@ -408,6 +408,11 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
         return kuaishouItemListMapper.getRegimental();
         return kuaishouItemListMapper.getRegimental();
     }
     }
 
 
+    @Override
+    public List<JSONObject> getListByRelateId(Long relateId) {
+        return kuaishouItemListMapper.getListByRelateId(relateId);
+    }
+
 
 
 }
 }
 
 

+ 15 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouRuleSettlementDataServiceImpl.java

@@ -412,5 +412,20 @@ public class KuaishouRuleSettlementDataServiceImpl implements IKuaishouRuleSettl
         }
         }
         return returnJson;
         return returnJson;
     }
     }
+
+    @Override
+    public List<JSONObject> getSettlementDate(Long statDate, Long promoterId, String promoterName) {
+        return kuaishouRuleSettlementDataMapper.getSettlementDate(statDate,promoterId,promoterName);
+    }
+
+    @Override
+    public void updatePromoterStatus(Long statDate, Long promoterId, Integer status) {
+        kuaishouRuleSettlementDataMapper.updatePromoterStatus(statDate, promoterId, status);
+    }
+
+    @Override
+    public List<JSONObject> getPromoterSettlementDetail(Long date, Long promoterId,Integer settlementStatus) {
+        return kuaishouRuleSettlementDataMapper.getPromoterSettlementDetail(date,promoterId,settlementStatus);
+    }
 }
 }
 
 

+ 61 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouSettlementRulesServiceImpl.java

@@ -1,9 +1,16 @@
 package com.ruixuan.isc.service.impl;
 package com.ruixuan.isc.service.impl;
 
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruixuan.common.utils.Check;
 import com.ruixuan.common.utils.DateUtils;
 import com.ruixuan.common.utils.DateUtils;
+import com.ruixuan.isc.entity.KuaishouRuleDetail;
 import com.ruixuan.isc.entity.KuaishouSettlementRules;
 import com.ruixuan.isc.entity.KuaishouSettlementRules;
+import com.ruixuan.isc.mapper.KuaishouRuleDetailMapper;
 import com.ruixuan.isc.mapper.KuaishouSettlementRulesMapper;
 import com.ruixuan.isc.mapper.KuaishouSettlementRulesMapper;
 import com.ruixuan.isc.service.IKuaishouSettlementRulesService;
 import com.ruixuan.isc.service.IKuaishouSettlementRulesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +27,8 @@ import org.springframework.stereotype.Service;
 public class KuaishouSettlementRulesServiceImpl implements IKuaishouSettlementRulesService {
 public class KuaishouSettlementRulesServiceImpl implements IKuaishouSettlementRulesService {
     @Autowired
     @Autowired
     private KuaishouSettlementRulesMapper kuaishouSettlementRulesMapper;
     private KuaishouSettlementRulesMapper kuaishouSettlementRulesMapper;
+    @Autowired
+    private KuaishouRuleDetailMapper kuaishouRuleDetailMapper;
 
 
     /**
     /**
      * 查询【请填写功能名称】
      * 查询【请填写功能名称】
@@ -86,7 +95,59 @@ public class KuaishouSettlementRulesServiceImpl implements IKuaishouSettlementRu
      */
      */
     @Override
     @Override
     public int deleteKuaishouSettlementRulesById(Long id) {
     public int deleteKuaishouSettlementRulesById(Long id) {
+        kuaishouRuleDetailMapper.deleteKuaishouRuleDetailByRuleId(id);
         return kuaishouSettlementRulesMapper.deleteKuaishouSettlementRulesById(id);
         return kuaishouSettlementRulesMapper.deleteKuaishouSettlementRulesById(id);
     }
     }
+
+    @Override
+    public List<JSONObject> getRuleList(Long userId, String ruleName) {
+        return kuaishouSettlementRulesMapper.getRuleList(userId, ruleName);
+    }
+
+    @Override
+    public void addRules(JSONObject requestJson) {
+        Long maxRuleId = kuaishouSettlementRulesMapper.getMaxRuleId();
+        Long newId = maxRuleId + 1;
+        String ruleName = requestJson.getString("ruleName");
+        Integer ruleType = requestJson.getInteger("ruleType");
+        Long userId = requestJson.getLong("userId");
+        String userName = requestJson.getString("userName");
+        KuaishouSettlementRules settlementRules = new KuaishouSettlementRules();
+        settlementRules.setId(newId);
+        settlementRules.setRuleName(ruleName);
+        settlementRules.setRuleType(ruleType);
+        settlementRules.setUserId(userId);
+        settlementRules.setUserName(userName);
+        int i = kuaishouSettlementRulesMapper.insertKuaishouSettlementRules(settlementRules);
+        if (i > 0) {
+            JSONArray ruleDetails = requestJson.getJSONArray("ruleDetails");
+            List<KuaishouRuleDetail> details = new ArrayList<>();
+
+            for (int j = 0; j < ruleDetails.size(); j++) {
+                JSONObject jsonObject = ruleDetails.getJSONObject(j);
+                KuaishouRuleDetail detail = new KuaishouRuleDetail();
+                detail.setRuleId(newId);
+                Integer startItemCount = jsonObject.getInteger("startItemCount");
+                Integer endItemCount = jsonObject.getInteger("endItemCount");
+                BigDecimal anchorAmount = jsonObject.getBigDecimal("anchorAmount");
+                BigDecimal referenceAmount = jsonObject.getBigDecimal("referenceAmount");
+                Integer sortCount = jsonObject.getInteger("sortCount");
+                detail.setStartItemCount(startItemCount);
+                detail.setEndItemCount(endItemCount);
+                detail.setAnchorAmount(anchorAmount);
+                detail.setReferenceAmount(referenceAmount);
+                detail.setSortCount(sortCount);
+                details.add(detail);
+            }
+            if (!Check.isNull(details)) {
+                kuaishouRuleDetailMapper.addAll(details);
+            }
+        }
+    }
+
+    @Override
+    public List<KuaishouRuleDetail> getRuleDetailByRuleId(Long ruleId) {
+        return kuaishouRuleDetailMapper.getRuleDetailByRuleId(ruleId);
+    }
 }
 }
 
 

+ 15 - 1
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemCollectSamplesMapper.xml

@@ -27,6 +27,7 @@
         <result property="promoterAddress" column="promoter_address"/>
         <result property="promoterAddress" column="promoter_address"/>
         <result property="consignee" column="consignee"/>
         <result property="consignee" column="consignee"/>
         <result property="courierNumber" column="courier_number"/>
         <result property="courierNumber" column="courier_number"/>
+        <result property="courierNumberTime" column="courier_number_time"/>
         <result property="taskFileUrl" column="task_file_url"/>
         <result property="taskFileUrl" column="task_file_url"/>
         <result property="collectSampleStatus" column="collect_sample_status"/>
         <result property="collectSampleStatus" column="collect_sample_status"/>
         <result property="collectSampleDesc" column="collect_sample_desc"/>
         <result property="collectSampleDesc" column="collect_sample_desc"/>
@@ -60,6 +61,7 @@
                promoter_address,
                promoter_address,
                consignee,
                consignee,
                courier_number,
                courier_number,
+               courier_number_time,
                task_file_url,
                task_file_url,
                collect_sample_status,
                collect_sample_status,
                collect_sample_desc,
                collect_sample_desc,
@@ -95,6 +97,7 @@
         t1.promoter_address,
         t1.promoter_address,
         t1.consignee,
         t1.consignee,
         t1.courier_number,
         t1.courier_number,
+        t1.courier_number_time,
         t1.task_file_url,
         t1.task_file_url,
         t1.collect_sample_status,
         t1.collect_sample_status,
         t1.collect_sample_desc,
         t1.collect_sample_desc,
@@ -148,8 +151,14 @@
             <if test="collectSampleId != null and collectSampleId != ''">
             <if test="collectSampleId != null and collectSampleId != ''">
                 and t1.collect_sample_id = #{collectSampleId}
                 and t1.collect_sample_id = #{collectSampleId}
             </if>
             </if>
+            <if test="courierNumber != null and courierNumber != ''">
+                and t1.courier_number = #{courierNumber}
+            </if>
+            <if test="collectSampleDesc != null and collectSampleDesc != ''">
+                and t1.collect_sample_desc = #{collectSampleDesc}
+            </if>
         </where>
         </where>
-        order by t1.create_time desc
+        order by ${fieId} ${sort}
     </select>
     </select>
 
 
     <select id="selectKuaishouItemCollectSamplesById" parameterType="java.lang.Long"
     <select id="selectKuaishouItemCollectSamplesById" parameterType="java.lang.Long"
@@ -311,6 +320,7 @@
             <if test="promoterAddress != null">promoter_address,</if>
             <if test="promoterAddress != null">promoter_address,</if>
             <if test="consignee != null">consignee,</if>
             <if test="consignee != null">consignee,</if>
             <if test="courierNumber != null">courier_number,</if>
             <if test="courierNumber != null">courier_number,</if>
+            <if test="courierNumberTime != null">courier_number_time,</if>
             <if test="taskFileUrl != null">task_file_url,</if>
             <if test="taskFileUrl != null">task_file_url,</if>
             <if test="collectSampleStatus != null">collect_sample_status,</if>
             <if test="collectSampleStatus != null">collect_sample_status,</if>
             <if test="collectSampleDesc != null">collect_sample_desc,</if>
             <if test="collectSampleDesc != null">collect_sample_desc,</if>
@@ -342,6 +352,7 @@
             <if test="promoterAddress != null">#{promoterAddress},</if>
             <if test="promoterAddress != null">#{promoterAddress},</if>
             <if test="consignee != null">#{consignee},</if>
             <if test="consignee != null">#{consignee},</if>
             <if test="courierNumber != null">#{courierNumber},</if>
             <if test="courierNumber != null">#{courierNumber},</if>
+            <if test="courierNumberTime != null">#{courierNumberTime},</if>
             <if test="taskFileUrl != null">#{taskFileUrl},</if>
             <if test="taskFileUrl != null">#{taskFileUrl},</if>
             <if test="collectSampleStatus != null">#{collectSampleStatus},</if>
             <if test="collectSampleStatus != null">#{collectSampleStatus},</if>
             <if test="collectSampleDesc != null">#{collectSampleDesc},</if>
             <if test="collectSampleDesc != null">#{collectSampleDesc},</if>
@@ -373,6 +384,7 @@
         promoter_address,
         promoter_address,
         consignee,
         consignee,
         courier_number,
         courier_number,
+        courier_number_time,
         task_file_url,
         task_file_url,
         promoter_url,
         promoter_url,
         collect_sample_status,
         collect_sample_status,
@@ -403,6 +415,7 @@
             #{add.promoterAddress},
             #{add.promoterAddress},
             #{add.consignee},
             #{add.consignee},
             #{add.courierNumber},
             #{add.courierNumber},
+            #{add.courierNumberTime},
             #{add.taskFileUrl},
             #{add.taskFileUrl},
             #{add.promoterUrl},
             #{add.promoterUrl},
             #{add.collectSampleStatus },
             #{add.collectSampleStatus },
@@ -493,6 +506,7 @@
             <if test="promoterAddress != null">promoter_address = #{promoterAddress},</if>
             <if test="promoterAddress != null">promoter_address = #{promoterAddress},</if>
             <if test="consignee != null">consignee = #{consignee},</if>
             <if test="consignee != null">consignee = #{consignee},</if>
             <if test="courierNumber != null">courier_number = #{courierNumber},</if>
             <if test="courierNumber != null">courier_number = #{courierNumber},</if>
+            <if test="courierNumberTime != null">courier_number_time = #{courierNumberTime},</if>
             <if test="taskFileUrl != null">task_file_url = #{taskFileUrl},</if>
             <if test="taskFileUrl != null">task_file_url = #{taskFileUrl},</if>
             <if test="collectSampleStatus != null">collect_sample_status = #{collectSampleStatus},</if>
             <if test="collectSampleStatus != null">collect_sample_status = #{collectSampleStatus},</if>
             <if test="collectSampleDesc != null">collect_sample_desc = #{collectSampleDesc},</if>
             <if test="collectSampleDesc != null">collect_sample_desc = #{collectSampleDesc},</if>

文件差異過大導致無法顯示
+ 23 - 8
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemListMapper.xml


+ 48 - 16
ruixuan-live/src/main/resources/mapper/isc/KuaishouRuleDetailMapper.xml

@@ -5,30 +5,31 @@
 <mapper namespace="com.ruixuan.isc.mapper.KuaishouRuleDetailMapper">
 <mapper namespace="com.ruixuan.isc.mapper.KuaishouRuleDetailMapper">
 
 
     <resultMap type="com.ruixuan.isc.entity.KuaishouRuleDetail" id="KuaishouRuleDetailResult">
     <resultMap type="com.ruixuan.isc.entity.KuaishouRuleDetail" id="KuaishouRuleDetailResult">
-        <result property="id"    column="id"    />
-        <result property="ruleId"    column="rule_id"    />
-        <result property="startItemCount"    column="start_item_count"    />
-        <result property="endItemCount"    column="end_item_count"    />
-        <result property="anchorAmount"    column="anchor_amount"    />
-        <result property="referenceAmount"    column="reference_amount"    />
-        <result property="sortCount"    column="sort_count"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="id" column="id"/>
+        <result property="ruleId" column="rule_id"/>
+        <result property="startItemCount" column="start_item_count"/>
+        <result property="endItemCount" column="end_item_count"/>
+        <result property="anchorAmount" column="anchor_amount"/>
+        <result property="referenceAmount" column="reference_amount"/>
+        <result property="sortCount" column="sort_count"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="selectKuaishouRuleDetailVo">
     <sql id="selectKuaishouRuleDetailVo">
         select id, rule_id, start_item_count, end_item_count, anchor_amount, reference_amount, sort_count, create_time, update_time from kuaishou_rule_detail
         select id, rule_id, start_item_count, end_item_count, anchor_amount, reference_amount, sort_count, create_time, update_time from kuaishou_rule_detail
     </sql>
     </sql>
 
 
-    <select id="selectKuaishouRuleDetailList" parameterType="com.ruixuan.isc.entity.KuaishouRuleDetail" resultMap="KuaishouRuleDetailResult">
+    <select id="selectKuaishouRuleDetailList" parameterType="com.ruixuan.isc.entity.KuaishouRuleDetail"
+            resultMap="KuaishouRuleDetailResult">
         <include refid="selectKuaishouRuleDetailVo"/>
         <include refid="selectKuaishouRuleDetailVo"/>
         <where>
         <where>
-            <if test="ruleId != null  and ruleId != ''"> and rule_id = #{ruleId}</if>
-            <if test="startItemCount != null "> and start_item_count = #{startItemCount}</if>
-            <if test="endItemCount != null "> and end_item_count = #{endItemCount}</if>
-            <if test="anchorAmount != null "> and anchor_amount = #{anchorAmount}</if>
-            <if test="referenceAmount != null "> and reference_amount = #{referenceAmount}</if>
-            <if test="sortCount != null "> and sort_count = #{sortCount}</if>
+            <if test="ruleId != null  and ruleId != ''">and rule_id = #{ruleId}</if>
+            <if test="startItemCount != null ">and start_item_count = #{startItemCount}</if>
+            <if test="endItemCount != null ">and end_item_count = #{endItemCount}</if>
+            <if test="anchorAmount != null ">and anchor_amount = #{anchorAmount}</if>
+            <if test="referenceAmount != null ">and reference_amount = #{referenceAmount}</if>
+            <if test="sortCount != null ">and sort_count = #{sortCount}</if>
         </where>
         </where>
     </select>
     </select>
 
 
@@ -36,6 +37,12 @@
         <include refid="selectKuaishouRuleDetailVo"/>
         <include refid="selectKuaishouRuleDetailVo"/>
         where id = #{id}
         where id = #{id}
     </select>
     </select>
+    <select id="getRuleDetailByRuleId" resultMap="KuaishouRuleDetailResult"
+            parameterType="java.lang.Long">
+        <include refid="selectKuaishouRuleDetailVo"/>
+        where rule_id = #{ruleId}
+        order by sort_count asc
+    </select>
 
 
     <insert id="insertKuaishouRuleDetail" parameterType="com.ruixuan.isc.entity.KuaishouRuleDetail">
     <insert id="insertKuaishouRuleDetail" parameterType="com.ruixuan.isc.entity.KuaishouRuleDetail">
         insert into kuaishou_rule_detail
         insert into kuaishou_rule_detail
@@ -62,6 +69,28 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
         </trim>
         </trim>
     </insert>
     </insert>
+    <insert id="addAll">
+
+        replace into kuaishou_rule_detail (
+        rule_id,
+        start_item_count,
+        end_item_count,
+        anchor_amount,
+        reference_amount,
+        sort_count
+        ) values
+        <foreach collection="adds" item="add" separator=",">
+            (
+            #{add.ruleId},
+            #{add.startItemCount},
+            #{add.endItemCount},
+            #{add.anchorAmount},
+            #{add.referenceAmount},
+            #{add.sortCount}
+            )
+        </foreach>
+
+    </insert>
 
 
     <update id="updateKuaishouRuleDetail" parameterType="com.ruixuan.isc.entity.KuaishouRuleDetail">
     <update id="updateKuaishouRuleDetail" parameterType="com.ruixuan.isc.entity.KuaishouRuleDetail">
         update kuaishou_rule_detail
         update kuaishou_rule_detail
@@ -88,4 +117,7 @@
             #{id}
             #{id}
         </foreach>
         </foreach>
     </delete>
     </delete>
+    <delete id="deleteKuaishouRuleDetailByRuleId" parameterType="java.lang.Long">
+        delete  from kuaishou_rule_detail where rule_id = #{id}
+    </delete>
 </mapper>
 </mapper>

+ 97 - 2
ruixuan-live/src/main/resources/mapper/isc/KuaishouRuleSettlementDataMapper.xml

@@ -152,6 +152,12 @@
         </trim>
         </trim>
         where id = #{id}
         where id = #{id}
     </update>
     </update>
+    <update id="updatePromoterStatus">
+        update kuaishou_rule_settlement_data set settlement_status = #{status}
+        where promoter_id = #{promoterId}
+        and stat_date = #{statDate}
+        and settlement_status = 2
+    </update>
 
 
     <delete id="deleteKuaishouRuleSettlementDataById" parameterType="java.lang.Long">
     <delete id="deleteKuaishouRuleSettlementDataById" parameterType="java.lang.Long">
         delete from kuaishou_rule_settlement_data where id = #{id}
         delete from kuaishou_rule_settlement_data where id = #{id}
@@ -254,6 +260,95 @@
         select  max(sort_count)  from kuaishou_rule_detail where rule_id = #{ruleId}
         select  max(sort_count)  from kuaishou_rule_detail where rule_id = #{ruleId}
 
 
     </select>
     </select>
+    <select id="getSettlementDate" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
+        <!--        select t.* from (
+                select
+                promoter_id as 'promoterId',
+                promoter_name as 'promoterName',
+                sum(anchor_amount) as 'anchorAmount',
+                sum(reference_amount) as 'referenceAmount'
+                from kuaishou_rule_settlement_data
+                where stat_date = #{statDate}
+                and settlement_status != 3
+                <if test="promoterId != null and promoterId != '' ">
+                    and promoter_id = #{promoterId}
+                </if>
+                <if test="promoterName != null and promoterName != '' ">
+                    AND promoter_name LIKE CONCAT('%', #{promoterName}, '%')
+                </if>
+                group by promoter_id) t order by t.anchorAmount desc-->
+
+        select t.*, t2.item_title as 'itemName'
+        from (select id as 'id',
+        rule_name as 'ruleName',
+        item_ids as 'itemIds',
+        substring_index(item_ids, ',', 1) as 'itemId',
+        promoter_id as 'promoterId',
+        promoter_name as 'promoterName',
+        order_num as 'orderNum',
+        valid_order_num as 'validOrderNum',
+        last_settlement_order_num as 'lastSettlementOrderNum',
+        anchor_amount as 'anchorAmount',
+        reference_amount as 'referenceAmount',
+        settlement_status as 'settlementStatus',
+        (
+        case
+         when settlement_status = 1 then '未达到结算规则'
+         when settlement_status = 2 then '待结算'
+         when settlement_status = 3 then '已结算'
+        else '-'
+        end
+        ) as 'settlementStatusDesc'
+        from kuaishou_rule_settlement_data t1
+        where t1.stat_date = #{statDate}
+        and settlement_status >= 2
+        and anchor_amount > 0
+        <if test="promoterId != null and promoterId != '' ">
+            and t1.promoter_id = #{promoterId}
+        </if>
+        <if test="promoterName != null and promoterName != '' ">
+            AND t1.promoter_name LIKE CONCAT('%', #{promoterName}, '%')
+        </if>
+
+        ) t
+        left join kuaishou_item_list t2 on t.itemId = t2.item_id
+        order by t.settlementStatus asc
+    </select>
+    <select id="getPromoterSettlementDetail" resultType="com.alibaba.fastjson.JSONObject">
+        select
+        id as 'id',
+        rule_id as 'ruleId',
+        rule_name as 'ruleName',
+        son_rule_id as 'sonRuleId',
+        item_ids as 'itemIds',
+        promoter_id as 'promoterId',
+        promoter_name as 'promoterName',
+        item_create_id as 'itemCreateId',
+        item_create_name as 'itemCreateName',
+        promoter_create_id as 'promoterCreateId',
+        promoter_create_name as 'promoterCreateName',
+        order_num as 'orderNum',
+        valid_order_num as 'validOrderNum',
+        last_settlement_order_num as 'lastSettlementOrderNum',
+        anchor_amount as 'anchorAmount',
+        reference_amount as 'referenceAmount',
+        (case
+        when settlement_status = 1 then '未达到结算要求'
+        when settlement_status = 2 then '待结算'
+        when settlement_status = 3 then '已结算'
+        else ''
+        end
+        ) as 'settlementStatusStr',
+        settlement_status as 'settlementStatus'
+        from kuaishou_rule_settlement_data
+        where promoter_id = #{promoterId}
+        and stat_date = #{date}
+        <if test="settlementStatus != null and settlementStatus != ''">
+            and settlement_status = #{settlementStatus}
+        </if>
+        order by anchor_amount desc
+
+    </select>
 
 
     <insert id="replaceDatas">
     <insert id="replaceDatas">
         replace into kuaishou_rule_settlement_data(
         replace into kuaishou_rule_settlement_data(
@@ -280,7 +375,7 @@
         )
         )
         values
         values
         <foreach collection="adds" item="add" separator=",">
         <foreach collection="adds" item="add" separator=",">
-        (
+            (
             #{add.ruleId},
             #{add.ruleId},
             #{add.ruleName},
             #{add.ruleName},
             #{add.sonRuleId},
             #{add.sonRuleId},
@@ -301,7 +396,7 @@
             #{add.referenceAmount},
             #{add.referenceAmount},
             #{add.settlementStatus},
             #{add.settlementStatus},
             #{add.lastSettlementOrderNum}
             #{add.lastSettlementOrderNum}
-        )
+            )
         </foreach>
         </foreach>
 
 
     </insert>
     </insert>

+ 51 - 13
ruixuan-live/src/main/resources/mapper/isc/KuaishouSettlementRulesMapper.xml

@@ -5,33 +5,71 @@
 <mapper namespace="com.ruixuan.isc.mapper.KuaishouSettlementRulesMapper">
 <mapper namespace="com.ruixuan.isc.mapper.KuaishouSettlementRulesMapper">
 
 
     <resultMap type="com.ruixuan.isc.entity.KuaishouSettlementRules" id="KuaishouSettlementRulesResult">
     <resultMap type="com.ruixuan.isc.entity.KuaishouSettlementRules" id="KuaishouSettlementRulesResult">
-        <result property="id"    column="id"    />
-        <result property="ruleName"    column="rule_name"    />
-        <result property="ruleType"    column="rule_type"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="id" column="id"/>
+        <result property="ruleName" column="rule_name"/>
+        <result property="ruleType" column="rule_type"/>
+        <result property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="selectKuaishouSettlementRulesVo">
     <sql id="selectKuaishouSettlementRulesVo">
         select id, rule_name, rule_type, user_id, user_name, create_time, update_time from kuaishou_settlement_rules
         select id, rule_name, rule_type, user_id, user_name, create_time, update_time from kuaishou_settlement_rules
     </sql>
     </sql>
 
 
-    <select id="selectKuaishouSettlementRulesList" parameterType="com.ruixuan.isc.entity.KuaishouSettlementRules" resultMap="KuaishouSettlementRulesResult">
+    <select id="selectKuaishouSettlementRulesList" parameterType="com.ruixuan.isc.entity.KuaishouSettlementRules"
+            resultMap="KuaishouSettlementRulesResult">
         <include refid="selectKuaishouSettlementRulesVo"/>
         <include refid="selectKuaishouSettlementRulesVo"/>
         <where>
         <where>
-            <if test="ruleName != null  and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
-            <if test="ruleType != null "> and rule_type = #{ruleType}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="ruleName != null  and ruleName != ''">and rule_name like concat('%', #{ruleName}, '%')</if>
+            <if test="ruleType != null ">and rule_type = #{ruleType}</if>
+            <if test="userId != null ">and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''">and user_name like concat('%', #{userName}, '%')</if>
         </where>
         </where>
     </select>
     </select>
 
 
-    <select id="selectKuaishouSettlementRulesById" parameterType="java.lang.Long" resultMap="KuaishouSettlementRulesResult">
+    <select id="selectKuaishouSettlementRulesById" parameterType="java.lang.Long"
+            resultMap="KuaishouSettlementRulesResult">
         <include refid="selectKuaishouSettlementRulesVo"/>
         <include refid="selectKuaishouSettlementRulesVo"/>
         where id = #{id}
         where id = #{id}
     </select>
     </select>
+    <select id="getRuleList" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
+
+        select * from (
+        select id as 'id',
+        rule_name as 'ruleName',
+        rule_type as 'ruleType',
+        user_id as 'userId',
+        user_name as 'userName',
+        create_time as 'createTime'
+        from kuaishou_settlement_rules
+        where id = 1
+        <if test="ruleName != null and ruleName != ''">
+            and rule_name like concat('%',#{ruleName}, '%')
+        </if>
+        union all
+        select id as 'id',
+        rule_name as 'ruleName',
+        rule_type as 'ruleType',
+        user_id as 'userId',
+        user_name as 'userName',
+        create_time as 'createTime'
+        from kuaishou_settlement_rules
+        where 1= 1
+        <if test="userId != null and userId != ''">
+            and user_id = #{userId}
+        </if>
+        <if test="ruleName != null and ruleName != ''">
+            and rule_name like concat('%',#{ruleName}, '%')
+        </if>
+        order by createTime desc
+        ) t group by t.id
+
+    </select>
+    <select id="getMaxRuleId" resultType="java.lang.Long">
+        select  max(id) from kuaishou_settlement_rules
+    </select>
 
 
     <insert id="insertKuaishouSettlementRules" parameterType="com.ruixuan.isc.entity.KuaishouSettlementRules">
     <insert id="insertKuaishouSettlementRules" parameterType="com.ruixuan.isc.entity.KuaishouSettlementRules">
         insert into kuaishou_settlement_rules
         insert into kuaishou_settlement_rules

+ 22 - 3
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -23,10 +23,13 @@
         count(oid) as 'orderNum',
         count(oid) as 'orderNum',
         sum(case when order_status != 80 then 1 else 0 end) as 'validOrderNUm',
         sum(case when order_status != 80 then 1 else 0 end) as 'validOrderNUm',
         round(sum(case when order_status != 80 then 1 else 0 end) / count(oid),4) as 'validRadio',
         round(sum(case when order_status != 80 then 1 else 0 end) / count(oid),4) as 'validRadio',
+        sum(pay_amount) as 'payAmount',
+        sum(case when order_status != 80 then pay_amount else 0 end) as 'validPayAmount',
         sum(case when send_status = 1 and order_status != 80 then 1 else 0 end) as 'deliveryNum',
         sum(case when send_status = 1 and order_status != 80 then 1 else 0 end) as 'deliveryNum',
         sum(case when send_status = 0 and order_status != 80 then 1 else 0 end) as 'notDeliveryNum',
         sum(case when send_status = 0 and order_status != 80 then 1 else 0 end) as 'notDeliveryNum',
         round(sum(case when send_status = 1 and order_status != 80 then 1 else 0 end) / sum(case when order_status != 80
         round(sum(case when send_status = 1 and order_status != 80 then 1 else 0 end) / sum(case when order_status != 80
-        then 1 else 0 end),4) as 'deliveryRadio'
+        then 1 else 0 end),4) as 'deliveryRadio',
+        sum(case when order_status != 80 then regimental_promotion_amount else 0 end) as 'regimentalPromotionAmount'
         from kuaishou_supply_chain
         from kuaishou_supply_chain
         where 1= 1
         where 1= 1
         <if test="start != null and start != ''">
         <if test="start != null and start != ''">
@@ -64,7 +67,17 @@
     </select>
     </select>
     <select id="anchorOrderDetail" resultType="com.alibaba.fastjson.JSONObject">
     <select id="anchorOrderDetail" resultType="com.alibaba.fastjson.JSONObject">
         select t.*,
         select t.*,
-        t2.status
+        t2.status,
+        (
+        case
+        when t3.activity_item_status = 1 then '待审核'
+        when t3.activity_item_status = 2 then '已上架'
+        when t3.activity_item_status = 3 then '审核拒绝'
+        when t3.activity_item_status = 4 then '活动失效'
+        when t3.activity_item_status = 5 then '商品下架'
+        else ''
+        end
+        ) as 'activityItemStatus'
         from (select
         from (select
         item_title as 'itemTitle',
         item_title as 'itemTitle',
         item_id as 'itemId',
         item_id as 'itemId',
@@ -100,6 +113,9 @@
         group by item_id) t left join ( select item_id as 'itemId', collect_sample_status as 'status' from
         group by item_id) t left join ( select item_id as 'itemId', collect_sample_status as 'status' from
         kuaishou_item_collect_samples where promoter_id = #{promoterId}) t2
         kuaishou_item_collect_samples where promoter_id = #{promoterId}) t2
         on t.itemId = t2.itemId
         on t.itemId = t2.itemId
+        left join kuaishou_item_list t3
+        on t.itemId = t3.item_id
+
         order by t.orderNum desc
         order by t.orderNum desc
     </select>
     </select>
     <select id="orderStatistics" resultType="com.alibaba.fastjson.JSONObject">
     <select id="orderStatistics" resultType="com.alibaba.fastjson.JSONObject">
@@ -497,7 +513,10 @@
         sum(case when send_status = 1 and order_status != 80 then 1 else 0 end) as 'deliveryNum',
         sum(case when send_status = 1 and order_status != 80 then 1 else 0 end) as 'deliveryNum',
         sum(case when send_status = 0 and order_status != 80 then 1 else 0 end) as 'notDeliveryNum',
         sum(case when send_status = 0 and order_status != 80 then 1 else 0 end) as 'notDeliveryNum',
         round(sum(case when send_status = 1 and order_status != 80 then 1 else 0 end) / sum(case when order_status != 80
         round(sum(case when send_status = 1 and order_status != 80 then 1 else 0 end) / sum(case when order_status != 80
-        then 1 else 0 end) * 100,2) as 'deliveryRadio'
+        then 1 else 0 end) * 100,2) as 'deliveryRadio',
+        round(sum(pay_amount) / 100,2) as 'payAmount',
+        round(sum(case when order_status != 80 then pay_amount else 0 end) / 100 , 2 ) as 'validPayAmount',
+        round(sum(case when order_status != 80 then regimental_promotion_amount else 0 end) / 100, 2) as 'regimentalPromotionAmount'
         from kuaishou_supply_chain
         from kuaishou_supply_chain
         where 1= 1
         where 1= 1
         <if test="start != null and start != ''">
         <if test="start != null and start != ''">

+ 4 - 0
ruixuan-system/src/main/java/com/ruixuan/system/mapper/SysDeptMapper.java

@@ -1,6 +1,8 @@
 package com.ruixuan.system.mapper;
 package com.ruixuan.system.mapper;
 
 
 import java.util.List;
 import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import com.ruixuan.common.core.domain.entity.SysDept;
 import com.ruixuan.common.core.domain.entity.SysDept;
 
 
@@ -119,4 +121,6 @@ public interface SysDeptMapper
     Long getDeptIdByUserId(Long userId);
     Long getDeptIdByUserId(Long userId);
 
 
     List<Long> getDeptUserListByDeptId(Long deptId);
     List<Long> getDeptUserListByDeptId(Long deptId);
+
+    List<JSONObject> getUserListByDeptId(@Param("deptId") Long deptId);
 }
 }

+ 3 - 0
ruixuan-system/src/main/java/com/ruixuan/system/service/ISysDeptService.java

@@ -2,6 +2,7 @@ package com.ruixuan.system.service;
 
 
 import java.util.List;
 import java.util.List;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruixuan.common.core.domain.TreeSelect;
 import com.ruixuan.common.core.domain.TreeSelect;
 import com.ruixuan.common.core.domain.entity.SysDept;
 import com.ruixuan.common.core.domain.entity.SysDept;
 
 
@@ -134,4 +135,6 @@ public interface ISysDeptService {
      * @return 结果
      * @return 结果
      */
      */
     public int deleteDeptById(Long deptId);
     public int deleteDeptById(Long deptId);
+
+    List<JSONObject> getUserListByDeptId(Long deptId);
 }
 }

+ 7 - 0
ruixuan-system/src/main/java/com/ruixuan/system/service/impl/SysDeptServiceImpl.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
+
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import com.ruixuan.common.annotation.DataScope;
 import com.ruixuan.common.annotation.DataScope;
@@ -294,6 +296,11 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.deleteDeptById(deptId);
         return deptMapper.deleteDeptById(deptId);
     }
     }
 
 
+    @Override
+    public List<JSONObject> getUserListByDeptId(Long deptId) {
+        return deptMapper.getUserListByDeptId(deptId);
+    }
+
     /**
     /**
      * 递归列表
      * 递归列表
      */
      */

+ 16 - 0
ruixuan-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -92,6 +92,22 @@
     <select id="getDeptUserListByDeptId" resultType="java.lang.Long" parameterType="java.lang.Long">
     <select id="getDeptUserListByDeptId" resultType="java.lang.Long" parameterType="java.lang.Long">
 		select  user_id from sys_user  where  dept_id = #{deptId}
 		select  user_id from sys_user  where  dept_id = #{deptId}
 	</select>
 	</select>
+    <select id="getUserListByDeptId" resultType="com.alibaba.fastjson.JSONObject"
+            parameterType="java.lang.Long">
+
+        select t3.user_id as 'userId', t3.nick_name as 'userName'
+        from sys_role t1
+                 left join sys_user_role t2 on t1.role_id = t2.role_id
+                 left join sys_user t3 on t2.user_id = t3.user_id
+        where t1.role_key in (
+                              'associationManager',
+                              'association',
+                              'bd',
+                              'bdManager'
+            )
+        group by t3.user_id
+        order by t3.create_time asc
+    </select>
 
 
     <insert id="insertDept" parameterType="SysDept">
     <insert id="insertDept" parameterType="SysDept">
         insert into sys_dept(
         insert into sys_dept(