yumeng 6 months ago
parent
commit
92ac677ad1

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

@@ -3952,7 +3952,7 @@
     </select>
     </select>
     <select id="shopList" resultType="com.alibaba.fastjson.JSONObject">
     <select id="shopList" resultType="com.alibaba.fastjson.JSONObject">
         select t1.seller_id as 'sellerId',
         select t1.seller_id as 'sellerId',
-        MAX(t2.shop_title) as 'sellerName',
+        t2.shop_title as 'sellerName',
         sum(case when t1.order_status = 60 then 1 else 0 end) as 'settledOrderNUm',
         sum(case when t1.order_status = 60 then 1 else 0 end) as 'settledOrderNUm',
         round(sum(case when t1.order_status = 60 then 1 else 0 end) / count(t1.oid) * 100,
         round(sum(case when t1.order_status = 60 then 1 else 0 end) / count(t1.oid) * 100,
         2) as 'settledOrderRate',
         2) as 'settledOrderRate',
@@ -3981,7 +3981,7 @@
         else 0 end) / 100, 2 )as 'regimentalPromotionAmount',
         else 0 end) / 100, 2 )as 'regimentalPromotionAmount',
         round(sum(case when t1.order_status != 80 then t1.total_regimental_settle_amount else 0 end) / 100 , 2) as
         round(sum(case when t1.order_status != 80 then t1.total_regimental_settle_amount else 0 end) / 100 , 2) as
         'totalRegimentalSettleAmount'
         'totalRegimentalSettleAmount'
-        from kuaishou_supply_chain t1 LEFT JOIN kuaishou_activity_open_item_list t2 on t1.item_id = t2.item_id
+        from kuaishou_supply_chain t1 LEFT JOIN ruixuan.kuaishou_activity_shop_info t2 on t1.item_id = t2.item_id
         where 1 = 1
         where 1 = 1
         <if test="start != null and start != ''">
         <if test="start != null and start != ''">
             and t1.stat_date &gt;= #{start}
             and t1.stat_date &gt;= #{start}