Quellcode durchsuchen

修改达人结算

yumeng vor 1 Jahr
Ursprung
Commit
8d6d7ea775

+ 31 - 27
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaishouSupplyChainMapper.xml

@@ -87,34 +87,38 @@
 
     </select>
     <select id="getDataList" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
-     select  *  from (
-      select t1.relate_id                      as 'relateId',
-       (case
-            when t2.rule_id is not null
-            then t2.rule_id
-            else 1
-            end
-        )                                as 'ruleId',
-       group_concat(t1.item_id)          as 'itemIds',
-       t1.promoter_id                    as 'promoterId',
-       t1.promoter_name                  as 'promoterName',
-       t1.item_create_id                 as 'itemCreateId',
-       t1.item_create_name               as 'itemCreateName',
-       t1.promoter_create_id             as 'promoterCreateId',
-       t1.promoter_create_name           as 'promoterCreateName',
-       ifnull(sum(t1.order_num),0)                 as 'orderNum',
-       ifnull(sum(t1.valid_order_num),0 )         as 'validOrderNum',
-       ifnull(sum(t1.yesterday_order_num),0 )      as 'yesterdayOrderNum',
-       ifnull(sum(t1.yesterday_valid_order_num),0) as 'yesterdayValidOrderNum',
-       t1.stat_date                      as 'statDate',
-       round(t2.item_price / 100, 2)               as      'itemPrice'
-       from ruixuan.kuaishou_rule_order_data t1
-         left join ruixuan.kuaishou_item_list t2 on t1.item_id = t2.item_id
-      where t1.stat_date = #{statDate}
-      and t1.relate_id is not null
-      group by t1.relate_id, t1.promoter_id ) t
+      select t.*, tt.rule_type
+      from (select *
+      from (select t1.relate_id                                 as 'relateId',
+                   (case
+                        when t2.rule_id is not null
+                            then t2.rule_id
+                        else 1
+                       end
+                       )                                        as 'ruleId',
+                   group_concat(t1.item_id)                     as 'itemIds',
+                   t1.promoter_id                               as 'promoterId',
+                   t1.promoter_name                             as 'promoterName',
+                   t1.item_create_id                            as 'itemCreateId',
+                   t1.item_create_name                          as 'itemCreateName',
+                   t1.promoter_create_id                        as 'promoterCreateId',
+                   t1.promoter_create_name                      as 'promoterCreateName',
+                   ifnull(sum(t1.order_num), 0)                 as 'orderNum',
+                   ifnull(sum(t1.valid_order_num), 0)           as 'validOrderNum',
+                   ifnull(sum(t1.yesterday_order_num), 0)       as 'yesterdayOrderNum',
+                   ifnull(sum(t1.yesterday_valid_order_num), 0) as 'yesterdayValidOrderNum',
+                   t1.stat_date                                 as 'statDate',
+                   round(t2.item_price / 100, 2)                as 'itemPrice'
+            from ruixuan.kuaishou_rule_order_data t1
+                     left join ruixuan.kuaishou_item_list t2 on t1.item_id = t2.item_id
+            where t1.stat_date = #{statDate}
+              and t1.relate_id is not null
+            group by t1.relate_id, t1.promoter_id) t
       where t.itemPrice >= 6
-      order by t.validOrderNum desc
+      order by t.validOrderNum desc) t
+         left join kuaishou_settlement_rules tt
+                   on t.ruleId = tt.id
+
     </select>
 
 </mapper>