Преглед изворни кода

修改结算数据查询逻辑

yumeng пре 2 година
родитељ
комит
959a868e19

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

@@ -89,7 +89,12 @@
     <select id="getDataList" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.lang.Long">
      select  *  from (
       select t1.relate_id                      as 'relateId',
-       1                        as 'ruleId',
+       (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',
@@ -105,10 +110,8 @@
        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 t2.rule_id is   null
       and t1.relate_id is not null
-      group by t1.relate_id, t1.promoter_id ) t order by t.validOrderNum
-
+      group by t1.relate_id, t1.promoter_id ) t order by t.validOrderNum desc
     </select>
 
 </mapper>