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-04-24 11:46:06 +08:00
parent 368f943211
commit 700b261e36
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -560,6 +560,7 @@ public class OrderController extends BaseController {
//处理新增订单的地址 //处理新增订单的地址
CustomerAddress customerAddress=customerAddressService.selectByCustomerAddressId(appOrderRequest.getAddressId()); CustomerAddress customerAddress=customerAddressService.selectByCustomerAddressId(appOrderRequest.getAddressId());
logger.info("下单后的地址信息{}",customerAddress);
orderMaster.setProvinceId(customerAddress.getProvinceId()); orderMaster.setProvinceId(customerAddress.getProvinceId());
orderMaster.setCityId(customerAddress.getCityId()); orderMaster.setCityId(customerAddress.getCityId());
orderMaster.setCountryId(customerAddress.getCountryId()); orderMaster.setCountryId(customerAddress.getCountryId());

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

@ -1308,6 +1308,7 @@ public class OrderMasterController extends BaseController {
orderListResponse.setIsCall(orderMaster.getIsCall()); orderListResponse.setIsCall(orderMaster.getIsCall());
orderListResponse.setAddress(orderMaster.getAddress()); orderListResponse.setAddress(orderMaster.getAddress());
if (!StringUtils.isEmpty(orderMaster.getProvinceName())){
orderListResponse.setProvinceId(orderMaster.getProvinceId()); orderListResponse.setProvinceId(orderMaster.getProvinceId());
orderListResponse.setCityId(orderMaster.getCityId()); orderListResponse.setCityId(orderMaster.getCityId());
orderListResponse.setCountryId(orderMaster.getCountryId()); orderListResponse.setCountryId(orderMaster.getCountryId());
@ -1319,6 +1320,20 @@ public class OrderMasterController extends BaseController {
orderListResponse.setCountryName(orderMaster.getCountryName()); orderListResponse.setCountryName(orderMaster.getCountryName());
orderListResponse.setStreetId(orderMaster.getStreetId()); orderListResponse.setStreetId(orderMaster.getStreetId());
orderListResponse.setStreetName(orderMaster.getStreetName()); orderListResponse.setStreetName(orderMaster.getStreetName());
}else{
orderListResponse.setProvinceId(customerAddress.getProvinceId());
orderListResponse.setCityId(customerAddress.getCityId());
orderListResponse.setCountryId(customerAddress.getCountryId());
orderListResponse.setAddress(customerAddress.getAddress());
orderListResponse.setPhone(customerAddress.getPhone());
orderListResponse.setName(customerAddress.getName());
orderListResponse.setProvinceName(customerAddress.getProvinceName());
orderListResponse.setCityName(customerAddress.getCityName());
orderListResponse.setCountryName(customerAddress.getCountryName());
orderListResponse.setStreetId(customerAddress.getStreetId());
orderListResponse.setStreetName(customerAddress.getStreetName());
}
return AjaxResult.success(orderListResponse); return AjaxResult.success(orderListResponse);
} catch (Exception e) { } catch (Exception e) {