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:36:37 +08:00
parent 2e7bcaba70 930a9e3de8
commit 1be8d59c6f
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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(",");
if (StringUtils.isEmpty(master.getProvinceName())){
orderListResponse.setProvinceName(array[0]); orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]); orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]); orderListResponse.setCountryName(array[2]);
@ -1604,6 +1604,20 @@ public class OrderController extends BaseController {
orderListResponse.setStreetId(customerAddress.getStreetId()); orderListResponse.setStreetId(customerAddress.getStreetId());
orderListResponse.setPhone(customerAddress.getPhone()); orderListResponse.setPhone(customerAddress.getPhone());
orderListResponse.setName(customerAddress.getName()); orderListResponse.setName(customerAddress.getName());
}else{
orderListResponse.setProvinceName(master.getProvinceName());
orderListResponse.setCityName(master.getCityName());
orderListResponse.setCountryName(master.getCountryName());
orderListResponse.setStreetName(master.getStreetName());
orderListResponse.setProvinceId(master.getProvinceId());
orderListResponse.setCityId(master.getCityId());
orderListResponse.setCountryId(master.getCountryId());
orderListResponse.setStreetId(master.getStreetId());
orderListResponse.setPhone(master.getPhone());
orderListResponse.setName(master.getName());
}
logger.info("所有的列表信息{}", orderListResponse); logger.info("所有的列表信息{}", orderListResponse);
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);