Merge remote-tracking branch 'origin/lx_dev' into lx_dev

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java

@@ -44,11 +44,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * @Description: 发货清单已合单控制器
+ * 发货清单已合单控制器
- * @Author: jiang chao
- * @Time: 2022/10/19 16:43
- * @Classname: SaDeliverController
- * @PackageName: com.hzs.sale.order.controller.manager
  */
 @RestController
 @RequestMapping("/manage/deliver-handled")
@@ -282,7 +278,6 @@ public class SaDeliverHandledController extends BaseController {
                             .productName(deliverHandled.getProductName())
                             .specsName(deliverHandled.getSpecsName())
                             .quantity(deliverHandled.getQuantity())
-                            .price(BigDecimal.ZERO)
                             .build();
                     if (!deliverCode.equals(deliverHandled.getDeliverCode())) {
                         deliverCode = deliverHandled.getDeliverCode();

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java

@@ -18,89 +18,53 @@ import java.math.BigDecimal;
 @Data
 public class DeliverWmsVO implements Serializable {
 
-    @Excel(name = "<必填>订单号")
+    @Excel(name = "平台订单号")
     private String deliverCode;
-
+    @Excel(name = "收件人姓名")
-    @Excel(name = "下单时间")
-    private String createTime;
-    @Excel(name = "付款时间")
-    private String payTime;
-
-    @Excel(name = "交易类型")
-    private String payType;
-    @Excel(name = "业务员")
-    private String peopleName;
-    @Excel(name = "备注")
-    private String orderRemark;
-    @Excel(name = "买家留言")
-    private String buyRemark;
-    @Excel(name = "系统备注")
-    private String sysRemark;
-    @Excel(name = "仓库")
-    private String storeName;
-    @Excel(name = "总金额")
-    private BigDecimal totalAmount;
-    @Excel(name = "运费")
-    private String postAmount;
-    @Excel(name = "实付总额")
-    private String realTotalAmount;
-    @Excel(name = "本次收款")
-    private String receiveAmount;
-    @Excel(name = "结算账户")
-    private String settleAccount;
-
-    @Excel(name = "<必填>收货人姓名")
     private String recName;
-
+    @Excel(name = "收件人手机号/电话")
-    @Excel(name = "手机")
     private String recPhone;
-
+    @Excel(name = "收件人地址")
-    @Excel(name = "固话")
-    private String fixedPhone;
-
-    @Excel(name = "<必填>地址")
     private String recAddress;
-
+    @Excel(name = "商家编码")
-    @Excel(name = "邮编")
-    private String postal;
-
-    @Excel(name = "电子邮箱")
-    private String email;
-
-    @Excel(name = "<必填>商品编码")
     private String wmsCode;
-
+    @Excel(name = "货品信息")
-    @Excel(name = "产品名称")
     private String productName;
-
+    @Excel(name = "规格信息")
-    @Excel(name = "规格名称")
     private String specsName;
-
+    @Excel(name = "货品数量")
-    @Excel(name = "<必填>数量")
     private Integer quantity;
 
-    @Excel(name = "单价")
-    private BigDecimal price;
-
-    @Excel(name = "实付")
-    private BigDecimal realPay;
-
-    @Excel(name = "配送方式")
-    private String delivery;
-
-    @Excel(name = "明细备注")
-    private String remark;
-
-    @Excel(name = "批次号")
-    private String batchNo;
-
-    @Excel(name = "生产日期")
-    private String produceDate;
-
-    @Excel(name = "过期日期")
-    private String expireDate;
-
-
 
+    @Excel(name = "货品单价")
+    private String str1;
+    @Excel(name = "金额小计")
+    private String str2;
+    @Excel(name = "邮费收入")
+    private String str3;
+    @Excel(name = "店铺")
+    private String str4;
+    @Excel(name = "买家留言")
+    private String str5;
+    @Excel(name = "客服备注")
+    private String str6;
+    @Excel(name = "买家昵称")
+    private String str7;
+    @Excel(name = "主播ID")
+    private String str8;
+    @Excel(name = "主播名称")
+    private String str9;
+    @Excel(name = "业务员")
+    private String str10;
+    @Excel(name = "付款类型")
+    private String str11;
+    @Excel(name = "下单时间")
+    private String str12;
+    @Excel(name = "付款时间")
+    private String str13;
+    @Excel(name = "仓库")
+    private String str14;
+    @Excel(name = "快递公司")
+    private String str15;
 
 }