积分订单导出&合并订单导出发货单修复

fs-admin/src/main/java/com/fs/his/controller/FsIntegralOrderController.java

@@ -174,6 +174,9 @@ public class FsIntegralOrderController extends BaseController
                             if (goods != null && goods.getString("goodsName") != null) {
                                 vo.setGoodsName(goods.getString("goodsName"));
                             }
+                            if (goods != null && goods.getString("barCode") != null) {
+                                vo.setBarCode(goods.getString("barCode"));
+                            }
                         }
                     } else if (vo.getItemJson().startsWith("{")) {
                         // 对象格式
@@ -181,6 +184,9 @@ public class FsIntegralOrderController extends BaseController
                         if (goods != null && goods.getString("goodsName") != null) {
                             vo.setGoodsName(goods.getString("goodsName"));
                         }
+                        if (goods != null && goods.getString("barCode") != null) {
+                            vo.setGoodsName(goods.getString("barCode"));
+                        }
                     }
                 } catch (Exception e) {
                     // 解析失败时保持goodsName为空，避免导出出错

fs-service/src/main/java/com/fs/his/vo/FsIntegralOrderListVO.java

@@ -36,6 +36,12 @@ public class FsIntegralOrderListVO {
     /** 商品信息 */
     @Excel(name = "商品信息")
     private String itemJson;
+    @Excel(name = "商品名称")
+    private String goodsName;
+
+    /** 商品条码 */
+    @Excel(name = "商品编码")
+    private String barCode;
 
     /** 支付积分 */
     @Excel(name = "支付积分")
@@ -84,5 +90,5 @@ public class FsIntegralOrderListVO {
     private String erpPhone;
 
     private String loginAccount;
-    private String goodsName;
+
 }

fs-service/src/main/java/com/fs/live/vo/MergedOrderVO.java

@@ -20,40 +20,39 @@ import java.util.List;
 public class MergedOrderVO implements Serializable
 {
     private static final long serialVersionUID = 1L;
-
+    @Excel(name = "订单ID")
     /** 订单ID */
     private Long id;
-
+    @Excel(name = "订单ID（直播订单使用）")
     /** 订单ID（直播订单使用） */
     private Long orderId;
-
+    @Excel(name = "直播ID")
     /** 直播ID（直播订单使用） */
     private Long liveId;
-
+    @Excel(name = "售后ID")
     /** 售后ID（直播订单使用） */
     private Long afterSalesId;
-
+    @Excel(name = "订单号")
     /** 订单号 */
     private String orderCode;
-
+    @Excel(name = "实际支付金额")
     /** 实际支付金额 */
     private BigDecimal payPrice;
-
     /** 会员等级 */
     private Integer userLevel;
-
+    @Excel(name = "实付金额")
     /** 实付金额 */
     private BigDecimal payMoney;
-
+    @Excel(name = "优惠金额")
     /** 优惠金额（直播订单使用） */
     private Integer discountMoney;
-
+    @Excel(name = "运费")
     /** 运费 */
     private BigDecimal payDelivery;
 
     /** 运费 */
     private BigDecimal payPostage;
-
+    @Excel(name = "成本价")
     /** 成本价 */
     private BigDecimal cost;
 
@@ -61,7 +60,7 @@ public class MergedOrderVO implements Serializable
     /** 订单状态 */
     @Excel(name = "订单状态",dictType="sys_live_order_status")
     private Integer status;
-
+    @Excel(name = "订单状态")
     /** 订单总价 */
     private BigDecimal totalPrice;
 
@@ -73,13 +72,13 @@ public class MergedOrderVO implements Serializable
 
     /** 商品JSON */
     private String itemJson;
-
+    @Excel(name = "物流单号")
     /** 物流单号 */
     private String deliveryId;
-
+    @Excel(name = "物流公司编码")
     /** 物流公司编码 */
     private String deliveryCode;
-
+    @Excel(name = "物流公司名称")
     /** 物流公司名称 */
     private String deliveryName;
 
@@ -97,7 +96,7 @@ public class MergedOrderVO implements Serializable
     /** 支付时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date payTime;
-
+    @Excel(name = "发货时间")
     /** 发货时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date deliverySendTime;
@@ -111,13 +110,13 @@ public class MergedOrderVO implements Serializable
     private Integer orderType;
 //    汇付商户订单号
     private String hfshh;
-
+    @Excel(name = "订单类型名称")
     /** 订单类型名称 */
     private String orderTypeName;
-
+    @Excel(name = "公司名称")
     /** 公司名称 */
     private String companyName;
-
+    @Excel(name = "销售名称")
     /** 销售名称（company_user表的user_name） */
     private String salesName;
 
@@ -167,6 +166,7 @@ public class MergedOrderVO implements Serializable
     private String productSpec;
 
     /** 商品编码 */
+    @Excel(name = "商品编码")
     private String barCode;
 
     /** 商品分类 */