From 5211181e310d46839be83fa01711943023f47492 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 13 Aug 2025 17:52:26 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8F=91=E8=B4=A7=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=BB=93=E5=82=A8=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/SaDeliverHandledController.java | 1 - .../com/hzs/sale/deliver/vo/DeliverWmsVO.java | 113 ++++++------------ 2 files changed, 38 insertions(+), 76 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java index 3cd39037..a93d8cff 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java @@ -203,7 +203,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(); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java index 0d66a917..11333499 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverWmsVO.java @@ -7,7 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.math.BigDecimal; /** * 发货单WMS导出VO @@ -18,89 +17,53 @@ import java.math.BigDecimal; @Data public class DeliverWmsVO implements Serializable { - @Excel(name = "<必填>订单号") + @Excel(name = "平台订单号") private String deliverCode; - - @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 = "<必填>收货人姓名") + @Excel(name = "收件人姓名") private String recName; - - @Excel(name = "手机") + @Excel(name = "收件人手机号/电话") private String recPhone; - - @Excel(name = "固话") - private String fixedPhone; - - @Excel(name = "<必填>地址") + @Excel(name = "收件人地址") private String recAddress; - - @Excel(name = "邮编") - private String postal; - - @Excel(name = "电子邮箱") - private String email; - - @Excel(name = "<必填>商品编码") + @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; }