1.销售订单导出增加订单产品展示

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -274,6 +274,22 @@ public class FsStoreOrderScrmController extends BaseController {
                 if (vo.getUserAddress()!=null){
                     vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
                 }
+                if(vo.getItemJson() != null){
+                    try {
+                        StringBuffer stringBuffer = new StringBuffer();
+                        List<FsStoreOrderItemVO> itemList = JSONObject.parseArray(vo.getItemJson(),FsStoreOrderItemVO.class);
+                        if(itemList !=  null && !itemList.isEmpty()){
+                            for (FsStoreOrderItemVO itemVO : itemList) {
+                                JSONObject jsonObject = JSONObject.parseObject(itemVO.getJsonInfo());
+                                String productName = jsonObject.getString("productName");
+                                stringBuffer.append(productName).append("x").append(itemVO.getNum());
+                            }
+                        }
+                        vo.setProductName(stringBuffer.toString());
+                    } catch (Exception e) {
+
+                    }
+                }
             }
         }
         ExcelUtil<FsStoreOrderExportVO> util = new ExcelUtil<FsStoreOrderExportVO>(FsStoreOrderExportVO.class);

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderExportVO.java

@@ -123,6 +123,9 @@ public class FsStoreOrderExportVO implements Serializable
     private String payType;
 
 
+    @Excel(name = "产品名称")
+    private String productName;
+
     /** 订单状态（-1 : 申请退款 -2 : 退货成功 0：待发货；1：待收货；2：已收货；3：已完成；-1：已退款） */
     @Excel(name = "订单状态", dictType = "store_order_status")
     private String status;
@@ -253,4 +256,7 @@ public class FsStoreOrderExportVO implements Serializable
 
     @Excel(name = "归属档期")
     private String scheduleName;
+
+    private String itemJson;
+
 }