From fb2e41422b339e08fdd45d007ae2865b5c2e9719 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Mon, 23 Oct 2023 14:21:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/modules/order/order/entity/dos/Order.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java index a937e12501..329c6a9a91 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java @@ -84,7 +84,7 @@ public class Order extends BaseEntity { private String receivableNo; /** - * @see PaymentMethodEnum + * @see PaymentMethodEnum */ @ApiModelProperty(value = "支付方式") private String paymentMethod; @@ -242,7 +242,7 @@ public class Order extends BaseEntity { this.setRemark(cartVO.getRemark()); this.setFreightPrice(tradeDTO.getPriceDetailDTO().getFreightPrice()); //会员收件信息 - if(DeliveryMethodEnum.LOGISTICS.name().equals(cartVO.getDeliveryMethod())){ + if (tradeDTO.getMemberAddress() != null && DeliveryMethodEnum.LOGISTICS.name().equals(cartVO.getDeliveryMethod())) { this.setConsigneeAddressIdPath(tradeDTO.getMemberAddress().getConsigneeAddressIdPath()); this.setConsigneeAddressPath(tradeDTO.getMemberAddress().getConsigneeAddressPath()); this.setConsigneeDetail(tradeDTO.getMemberAddress().getDetail()); @@ -250,7 +250,7 @@ public class Order extends BaseEntity { this.setConsigneeName(tradeDTO.getMemberAddress().getName()); } //自提点信息 - if(DeliveryMethodEnum.SELF_PICK_UP.name().equals(cartVO.getDeliveryMethod())){ + if (tradeDTO.getStoreAddress() != null && DeliveryMethodEnum.SELF_PICK_UP.name().equals(cartVO.getDeliveryMethod())) { this.setStoreAddressPath(tradeDTO.getStoreAddress().getAddress()); this.setStoreAddressMobile(tradeDTO.getStoreAddress().getMobile()); this.setStoreAddressCenter(tradeDTO.getStoreAddress().getCenter()); -- Gitee