yumeng hai 1 ano
pai
achega
f6036303be

+ 7 - 6
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -1064,18 +1064,19 @@ public class SupplyChainController extends BaseController {
                 List<Object> export = new ArrayList();
                 String promoterNickName = date.getString("promoterNickName");
                 Long promoterId = date.getLong("promoterId");
+                Long itemId = date.getLong("itemId");
+                String itemTitle = date.getString("itemTitle");
                 if ("miaogousi".equals(ownershipId)) {
                     export.add(promoterId);
                     export.add(promoterNickName);
+                    export.add(itemId);
+                    export.add(itemTitle);
                 } else {
                     String promoter = promoterNickName + "(" + promoterId + ")";
                     export.add(promoter);
+                    String item = itemTitle + "(" + itemId + ")";
+                    export.add(item);
                 }
-
-                Long itemId = date.getLong("itemId");
-                String itemTitle = date.getString("itemTitle");
-                String item = itemTitle + "(" + itemId + ")";
-                export.add(item);
                 export.add(date.getString("imageUrl"));
                 export.add(date.getInteger("orderNum"));
                 export.add(date.getInteger("validOrderNUm"));
@@ -1091,7 +1092,7 @@ public class SupplyChainController extends BaseController {
             headers = new String[]{"达人", "商品", "商品封面", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "商品状态"};
 
         } else {
-            headers = new String[]{"达人id", "达人名称", "商品", "商品封面", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "商品状态"};
+            headers = new String[]{"达人id", "达人名称", "商品id", "商品名称", "商品封面", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "商品状态"};
         }
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();