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

no message

This commit is contained in:
cb 2025-05-07 11:24:39 +08:00
parent 0a86d01406
commit f385aaabf3
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -885,6 +885,36 @@ public class OrderMasterController extends BaseController {
orderListResponse.setAfterServiceRecordList(afterServiceRecords); orderListResponse.setAfterServiceRecordList(afterServiceRecords);
orderListResponse.setServerMoney(master.getServerMoney()); orderListResponse.setServerMoney(master.getServerMoney());
orderListResponse.setIsCall(master.getIsCall()); orderListResponse.setIsCall(master.getIsCall());
if (StringUtils.isNotEmpty(master.getProvinceName())){
orderListResponse.setProvinceId(master.getProvinceId());
orderListResponse.setCityId(master.getCityId());
orderListResponse.setCountryId(master.getCountryId());
orderListResponse.setPhone(master.getPhone());
orderListResponse.setName(master.getName());
orderListResponse.setProvinceName(master.getProvinceName());
orderListResponse.setCityName(master.getCityName());
orderListResponse.setCountryName(master.getCountryName());
orderListResponse.setStreetId(master.getStreetId());
orderListResponse.setStreetName(master.getStreetName());
orderListResponse.setAddress(master.getAddress());
}else{
if (!StringUtils.isEmpty(customerAddress.getStreetId()+"")){
String addressSysArea=sysArea.getMergerName();
String[] array = addressSysArea.split(",");
orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]);
orderListResponse.setStreetName(array[3]);
}
orderListResponse.setProvinceId(customerAddress.getProvinceId());
orderListResponse.setCityId(customerAddress.getCityId());
orderListResponse.setCountryId(customerAddress.getCountryId());
orderListResponse.setStreetId(orderMaster.getStreetId());
orderListResponse.setAddress(customerAddress.getAddress());
orderListResponse.setPhone(customerAddress.getPhone());
orderListResponse.setName(customerAddress.getName());
}
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
}); });