caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 优化虚拟订单收货地址校验

Browse Source
This commit is contained in:
misworga831 2023-10-23 14:21:33 +08:00
parent 6bc2c0adf1
commit fb2e41422b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
View File

@ -84,7 +84,7 @@ public class Order extends BaseEntity {
private String receivableNo; private String receivableNo;
/** /**
* @see PaymentMethodEnum * @see PaymentMethodEnum
*/ */
@ApiModelProperty(value = "支付方式") @ApiModelProperty(value = "支付方式")
private String paymentMethod; private String paymentMethod;
@ -242,7 +242,7 @@ public class Order extends BaseEntity {
this.setRemark(cartVO.getRemark()); this.setRemark(cartVO.getRemark());
this.setFreightPrice(tradeDTO.getPriceDetailDTO().getFreightPrice()); 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.setConsigneeAddressIdPath(tradeDTO.getMemberAddress().getConsigneeAddressIdPath());
this.setConsigneeAddressPath(tradeDTO.getMemberAddress().getConsigneeAddressPath()); this.setConsigneeAddressPath(tradeDTO.getMemberAddress().getConsigneeAddressPath());
this.setConsigneeDetail(tradeDTO.getMemberAddress().getDetail()); this.setConsigneeDetail(tradeDTO.getMemberAddress().getDetail());
@ -250,7 +250,7 @@ public class Order extends BaseEntity {
this.setConsigneeName(tradeDTO.getMemberAddress().getName()); 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.setStoreAddressPath(tradeDTO.getStoreAddress().getAddress());
this.setStoreAddressMobile(tradeDTO.getStoreAddress().getMobile()); this.setStoreAddressMobile(tradeDTO.getStoreAddress().getMobile());
this.setStoreAddressCenter(tradeDTO.getStoreAddress().getCenter()); this.setStoreAddressCenter(tradeDTO.getStoreAddress().getCenter());