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 14:50:13 +08:00
parent c92ea38c60 ab7e7eaca7
commit 2655d8ffdb
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1308,8 +1308,7 @@ public class OrderMasterController extends BaseController {
orderListResponse.setGoodsAreaList(goods.getGoodsAreaList()); orderListResponse.setGoodsAreaList(goods.getGoodsAreaList());
orderListResponse.setOrderMode(orderMaster.getOrderMode()); orderListResponse.setOrderMode(orderMaster.getOrderMode());
orderListResponse.setIsCall(orderMaster.getIsCall()); orderListResponse.setIsCall(orderMaster.getIsCall());
orderListResponse.setAddress(orderMaster.getAddress()); logger.info("主单id{}，主单数据{},省名字{},街道id{}",request.getId(),orderMaster,orderMaster.getProvinceName(),customerAddress.getStreetId());
logger.info("主单id{}，主单数据{}",request.getId(),orderMaster);
if (!StringUtils.isEmpty(orderMaster.getProvinceName())){ if (!StringUtils.isEmpty(orderMaster.getProvinceName())){
orderListResponse.setProvinceId(orderMaster.getProvinceId()); orderListResponse.setProvinceId(orderMaster.getProvinceId());
orderListResponse.setCityId(orderMaster.getCityId()); orderListResponse.setCityId(orderMaster.getCityId());
@ -1323,17 +1322,23 @@ public class OrderMasterController extends BaseController {
orderListResponse.setStreetId(orderMaster.getStreetId()); orderListResponse.setStreetId(orderMaster.getStreetId());
orderListResponse.setStreetName(orderMaster.getStreetName()); orderListResponse.setStreetName(orderMaster.getStreetName());
}else{ }else{
if (!StringUtils.isEmpty(customerAddress.getStreetId()+"")){
String addressSysArea=sysArea.getMergerName();
String[] array = addressSysArea.split(",");
logger.info("单个订单查询到的地址{}",array);
orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]);
orderListResponse.setStreetName(array[3]);
}
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.setAddress(customerAddress.getAddress()); orderListResponse.setAddress(customerAddress.getAddress());
orderListResponse.setPhone(customerAddress.getPhone()); orderListResponse.setPhone(customerAddress.getPhone());
orderListResponse.setName(customerAddress.getName()); orderListResponse.setName(customerAddress.getName());
orderListResponse.setProvinceName(customerAddress.getProvinceName());
orderListResponse.setCityName(customerAddress.getCityName());
orderListResponse.setCountryName(customerAddress.getCountryName());
orderListResponse.setStreetId(customerAddress.getStreetId());
orderListResponse.setStreetName(customerAddress.getStreetName());
} }
logger.info("主单id{}，主单数据1{}",request.getId(),orderMaster); logger.info("主单id{}，主单数据1{}",request.getId(),orderMaster);