fix some bug

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -497,9 +497,12 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
                             storeOrderInfo.getSku(),
                             storeOrderInfo.getPayNum(),
                             
-                            vo.getRealName(),
-                            vo.getUserPhone(),
-                            vo.getUserAddress(),
+                            (orderAddressVO == null || StringUtils.isBlank(orderAddressVO.getRealName())) ? "" : orderAddressVO.getRealName(),
+                            (orderAddressVO == null || StringUtils.isBlank(orderAddressVO.getPhone())) ? "" : orderAddressVO.getPhone(),
+                            (orderAddressVO == null || StringUtils.isBlank(orderAddressVO.getDetail())) ? "" : orderAddressVO.getProvince()+orderAddressVO.getCity() + orderAddressVO.getDistrict()+orderAddressVO.getDetail(),
+                            // vo.getRealName(),
+                            // vo.getUserPhone(),
+                            // vo.getUserAddress(),
                             (orderAddressVO == null || StringUtils.isBlank(orderAddressVO.getPostCode())) ? "" : orderAddressVO.getPostCode(),
                             vo.getDeliveryName(),
                             vo.getDeliveryId()
@@ -2138,6 +2141,12 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
                     continue;
                 }
                 
+                if (StrUtil.isBlank(po.getUserAddress()) || StrUtil.isBlank(po.getPhone()) || StrUtil.isBlank(po.getRealName())) {
+                    po.setErrorMsg("地址未填写");
+                    errors.add(po);
+                    continue;
+                }
+                
                 storeOrder.setId(po.getId());
                 storeOrder.setDeliveryId(po.getDeliveryId());
                 storeOrder.setDeliveryName(po.getDeliveryName());