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 18:01:22 +08:00
parent f9080bb812 4c8a00d081
commit 37471713b7
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1591,6 +1591,17 @@ public class OrderController extends BaseController {
orderListResponse.setInsuranceManager(manager); orderListResponse.setInsuranceManager(manager);
} }
} }
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());
String addressSysArea = sysArea.getMergerName(); String addressSysArea = sysArea.getMergerName();
String[] array = addressSysArea.split(","); String[] array = addressSysArea.split(",");
if (StringUtils.isEmpty(master.getProvinceName())){ if (StringUtils.isEmpty(master.getProvinceName())){
@ -1604,21 +1615,10 @@ 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,master);
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
} }