yumeng 2 年之前
父節點
當前提交
402d9b84ef

+ 25 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemListController.java

@@ -375,6 +375,31 @@ public class KuaishouItemListController extends BaseController {
     }
 
 
+    @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();

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

@@ -89,14 +89,21 @@ public class KuaishouRuleSettlementDataController extends BaseController {
             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", "达人名称", "达人激励", "推荐人激励"};
+        String[] headers = {"规则名称", "商品ID", "商品名称", "达人ID", "达人名称", "订单数", "有效订单数", "上次结算有效单数", "达人激励", "推荐人激励", "结算状态"};
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();
         XSSFWorkbook workbook = new XSSFWorkbook();
@@ -134,10 +141,10 @@ public class KuaishouRuleSettlementDataController extends BaseController {
 
 
     @GetMapping("/getPromoterSettlementDetail")
-    public TableDataInfo getPromoterSettlementDetail(String statDate, Long promoterId,Integer settlementStatus) {
+    public TableDataInfo getPromoterSettlementDetail(String statDate, Long promoterId, Integer settlementStatus) {
         Long date = Long.valueOf(statDate.replace("-", ""));
         startPage();
-        List<JSONObject> list = kuaishouRuleSettlementDataService.getPromoterSettlementDetail(date, promoterId,settlementStatus);
+        List<JSONObject> list = kuaishouRuleSettlementDataService.getPromoterSettlementDetail(date, promoterId, settlementStatus);
         return getDataTable(list);
     }
 
@@ -147,7 +154,7 @@ public class KuaishouRuleSettlementDataController extends BaseController {
         Long date = Long.valueOf(requestJson.getString("statDate").replace("-", ""));
         Long promoterId = requestJson.getLong("promoterId");
 
-        List<JSONObject> list = kuaishouRuleSettlementDataService.getPromoterSettlementDetail(date, promoterId,null);
+        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++) {

+ 47 - 10
ruixuan-live/src/main/resources/mapper/isc/KuaishouRuleSettlementDataMapper.xml

@@ -261,22 +261,59 @@
 
     </select>
     <select id="getSettlementDate" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
-        select t.* from (
-        select
+        <!--        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',
-        sum(anchor_amount) as 'anchorAmount',
-        sum(reference_amount) as 'referenceAmount'
-        from kuaishou_rule_settlement_data
-        where stat_date = #{statDate}
-        and settlement_status != 3
+        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 promoter_id = #{promoterId}
+            and t1.promoter_id = #{promoterId}
         </if>
         <if test="promoterName != null and promoterName != '' ">
-            AND promoter_name LIKE CONCAT('%', #{promoterName}, '%')
+            AND t1.promoter_name LIKE CONCAT('%', #{promoterName}, '%')
         </if>
-        group by promoter_id) t order by t.anchorAmount desc
+
+        order by t1.anchor_amount, promoter_id) t
+        left join kuaishou_item_list t2 on t.itemId = t2.item_id
+
+
     </select>
     <select id="getPromoterSettlementDetail" resultType="com.alibaba.fastjson.JSONObject">
         select