Merge pull request lilishop#102

pg
shukedonghu · Oct 23, 2023 · b708272 · b708272
2 parents d7f7c43 + fb2e414
commit b708272
Showing 1 changed file with 3 additions and 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
@@ -84,7 +84,7 @@ public class Order extends BaseEntity {
     private String receivableNo;
 
     /**
-     * @see  PaymentMethodEnum
+     * @see PaymentMethodEnum
      */
     @ApiModelProperty(value = "支付方式")
     private String paymentMethod;
@@ -242,15 +242,15 @@ public Order(CartVO cartVO, TradeDTO tradeDTO) {
         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());
             this.setConsigneeMobile(tradeDTO.getMemberAddress().getMobile());
             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());