clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
cb 2025-04-30 17:14:35 +08:00
parent ff67462b73 d6028c3e1e
commit 2e7bcaba70
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -1593,7 +1593,7 @@ public class OrderController extends BaseController {
} }
String addressSysArea = sysArea.getMergerName(); String addressSysArea = sysArea.getMergerName();
String[] array = addressSysArea.split(","); String[] array = addressSysArea.split(",");
logger.info("所有的地址列表{}", array);
orderListResponse.setProvinceName(array[0]); orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]); orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]); orderListResponse.setCountryName(array[2]);
@ -1601,11 +1601,10 @@ public class OrderController extends BaseController {
orderListResponse.setProvinceId(customerAddress.getProvinceId()); orderListResponse.setProvinceId(customerAddress.getProvinceId());
orderListResponse.setCityId(customerAddress.getCityId()); orderListResponse.setCityId(customerAddress.getCityId());
orderListResponse.setCountryId(customerAddress.getCountryId()); orderListResponse.setCountryId(customerAddress.getCountryId());
orderListResponse.setStreetId(orderMaster.getStreetId()); orderListResponse.setStreetId(customerAddress.getStreetId());
orderListResponse.setAddress(customerAddress.getAddress());
orderListResponse.setPhone(customerAddress.getPhone()); orderListResponse.setPhone(customerAddress.getPhone());
orderListResponse.setName(customerAddress.getName()); orderListResponse.setName(customerAddress.getName());
logger.info("所有的列表信息{}", orderListResponse);
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
} }