diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index f1a43b65..9c461f97 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -560,7 +560,10 @@ public class OrderController extends BaseController {
 
         //处理新增订单的地址
         CustomerAddress customerAddress=customerAddressService.selectByCustomerAddressId(appOrderRequest.getAddressId());
-        logger.info("下单后的地址信息{}",customerAddress);
+        SysArea sysArea=sysAreaService.selectById(customerAddress.getStreetId());
+        String addressSysArea=sysArea.getMergerName();
+        String[] array = addressSysArea.split(",");
+        logger.info("下单后的地址信息{}",array);
         orderMaster.setProvinceId(customerAddress.getProvinceId());
         orderMaster.setCityId(customerAddress.getCityId());
         orderMaster.setCountryId(customerAddress.getCountryId());
@@ -568,11 +571,11 @@ public class OrderController extends BaseController {
         orderMaster.setAddress(customerAddress.getAddress());
         orderMaster.setName(customerAddress.getName());
         orderMaster.setPhone(customerAddress.getPhone());
-        orderMaster.setProvinceName(customerAddress.getProvinceName());
-        orderMaster.setCityName(customerAddress.getCityName());
-        orderMaster.setCountryName(customerAddress.getCountryName());
+        orderMaster.setProvinceName(array[0]);
+        orderMaster.setCityName(array[1]);
+        orderMaster.setCountryName(array[2]);
         orderMaster.setStreetId(customerAddress.getStreetId());
-        orderMaster.setStreetName(customerAddress.getStreetName());
+        orderMaster.setStreetName(array[3]);
 
 
         // TODO 优惠金额不知道咋算 暂时先给0