浏览代码

激励结算

yumeng 1 年之前
父节点
当前提交
6425d7245e

+ 5 - 4
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouRuleSettlementDataController.java

@@ -77,7 +77,6 @@ public class KuaishouRuleSettlementDataController extends BaseController {
     }
 
 
-
     @GetMapping("/testData")
     public JSONObject testData(Long relateId, Long promoterId, Long ruleId, Long validOrderNum) {
        /* JSONObject data = kuaishouRuleSettlementDataService.getData();
@@ -85,8 +84,8 @@ public class KuaishouRuleSettlementDataController extends BaseController {
         array.add(data);*/
 
 
-        return  kuaishouRuleSettlementDataService.getPromoterRuleData(null, promoterId,ruleId,validOrderNum);
-       //  return kuaishouRuleSettlementDataService.getOrderRuleData(relateId, promoterId, ruleId, validOrderNum);
+        return kuaishouRuleSettlementDataService.getPromoterRuleData(null, promoterId, ruleId, validOrderNum);
+        //  return kuaishouRuleSettlementDataService.getOrderRuleData(relateId, promoterId, ruleId, validOrderNum);
 
     }
 
@@ -116,8 +115,10 @@ public class KuaishouRuleSettlementDataController extends BaseController {
                 export.add(data.getString("ruleName"));
                 export.add(data.getString("itemIds"));
                 export.add(data.getString("itemName"));
+                export.add(data.getString("itemUserName"));
                 export.add(data.getString("promoterId"));
                 export.add(data.getString("promoterName"));
+                export.add(data.getString("promoterUserName"));
                 export.add(data.getString("orderNum"));
                 export.add(data.getString("validOrderNum"));
                 export.add(data.getString("lastSettlementOrderNum"));
@@ -127,7 +128,7 @@ public class KuaishouRuleSettlementDataController extends BaseController {
                 exportList.add(export);
             }
         }
-        String[] headers = {"规则名称", "商品ID", "商品名称", "达人ID", "达人名称", "订单数", "有效订单数", "上次结算有效单数", "达人激励", "推荐人激励", "结算状态"};
+        String[] headers = {"规则名称", "商品ID", "商品名称", "招商", "达人ID", "达人名称", "渠道", "订单数", "有效订单数", "上次结算有效单数", "达人激励", "推荐人激励", "结算状态"};
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();
         XSSFWorkbook workbook = new XSSFWorkbook();

+ 3 - 1
ruixuan-live/src/main/resources/mapper/isc/KuaishouRuleSettlementDataMapper.xml

@@ -309,7 +309,9 @@
                 </if>
                 group by promoter_id) t order by t.anchorAmount desc-->
 
-        select t.*, t2.item_title as 'itemName'
+        select t.*, t2.item_title as 'itemName',
+         t2.user_name as  'itemUserName',
+        (select  user_name  from  kuaishou_promoter where promoter_id = t.promoterId limit 1) as 'promoterUserName'
         from (select id as 'id',
         rule_name as 'ruleName',
         item_ids as 'itemIds',