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 09:55:58 +08:00
parent a1d6f90837
commit 3ef7b08c95
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1306,6 +1306,19 @@ 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());
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) {

22
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -176,4 +176,26 @@ public class OrderListResponse {
private Long insuranceId; private Long insuranceId;
private InsuranceManager insuranceManager; private InsuranceManager insuranceManager;
private Long cityId;
/*街道id*/
private Long streetId;
private Long provinceId;
private String name;
private String phone;
private String provinceName;
private String cityName;
private String countryName;
private String streetName;
private Long countryId;
} }