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

!313 fix & improve

Browse Source 
Merge pull request !313 from OceansDeep/pg
This commit is contained in:
OceansDeep 2023-10-23 06:22:27 +00:00 committed by Gitee
commit b8e8db0e36
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
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;
/**
* @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());