yumeng 2 år sedan
förälder
incheckning
0f00ba7359

+ 1 - 3
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -757,8 +757,6 @@ public class SupplyChainController extends BaseController {
                 export.add(date.getString("itemTitle"));
                 export.add(date.getString("imageUrl"));
                 export.add(date.getString("itemCommissionRate"));
-                export.add(date.getLong("promoterId"));
-                export.add(date.getString("promoterNickName"));
                 export.add(date.getInteger("orderNum"));
                 export.add(date.getInteger("validOrderNUm"));
                 export.add(date.getString("validRadio"));
@@ -768,7 +766,7 @@ public class SupplyChainController extends BaseController {
                 exportList.add(export);
             }
         }
-        String[] headers = {"所属人", "商品ID", "商品名称", "商品封面", "佣金率", "达人ID", "达人名称", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数"};
+        String[] headers = {"所属人", "商品ID", "商品名称", "商品封面", "佣金率", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数"};
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();
         XSSFWorkbook workbook = new XSSFWorkbook();

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

@@ -554,8 +554,6 @@
         t1.item_id as 'itemId',
         t1.item_title as 'itemTitle',
         t1.image_url as 'imageUrl',
-        t1.promoter_id as 'promoterId',
-        t1.promoter_nick_name as 'promoterNickName',
         count(t1.oid) as 'orderNum',
         sum(case when t1.order_status != 80 then 1 else 0 end) as 'validOrderNUm',
         round(sum(case when t1.order_status != 80 then 1 else 0 end) / count(t1.oid) * 100, 2) as 'validRadio',
@@ -586,12 +584,12 @@
         <if test="itemTitle != null and itemTitle != ''">
             and t1.item_title like concat(concat('%',#{itemTitle}),'%')
         </if>
-        group by t1.item_id, t1.promoter_id) t
+        group by t1.item_id) t
         where 1 = 1
         <if test="userId != null and userId != ''">
             and t.userId = #{userId}
         </if>
-        order by t.itemId, t.orderNum desc
+        order by t.orderNum desc
     </select>
     <select id="bindUserItemList" resultType="com.alibaba.fastjson.JSONObject">
         select *