liude преди 11 месеца
родител
ревизия
0788a3c6a1
променени са 1 файла, в които са добавени 9 реда и са изтрити 7 реда
  1. 9 7
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

+ 9 - 7
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -228,13 +228,15 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         order.setOrderType(0);
         //收货人信息:姓名、电话、邮编、地址
         UserReceiveAddressDTO address = this.userReceiveAddressService.queryById(orderParam.getUserReceiveAddressId());
-        order.setReceiverName(address.getReceiveName());
-        order.setReceiverPhone(address.getPhone());
-        order.setReceiverPostCode(address.getPostCode());
-        order.setReceiverProvince(address.getProvince());
-        order.setReceiverCity(address.getCity());
-        order.setReceiverRegion(address.getRegion());
-        order.setReceiverDetailAddress(address.getDetailAddress());
+        if (null != address){
+            order.setReceiverName(address.getReceiveName());
+            order.setReceiverPhone(address.getPhone());
+            order.setReceiverPostCode(address.getPostCode());
+            order.setReceiverProvince(address.getProvince());
+            order.setReceiverCity(address.getCity());
+            order.setReceiverRegion(address.getRegion());
+            order.setReceiverDetailAddress(address.getDetailAddress());
+        }
         //0->未确认;1->已确认
         order.setConfirmStatus(0);
         order.setDeleteStatus(0);