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 16:53:49 +08:00
parent 2655d8ffdb fab703b7af
commit ff67462b73
1 changed files with 72 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,8 +120,7 @@ public class OrderController extends BaseController {
@PostMapping("/imgs/list") @PostMapping("/imgs/list")
@ResponseBody @ResponseBody
public TableDataInfo list(GoodsImgs goodsImgs) public TableDataInfo list(GoodsImgs goodsImgs) {
{
List<OrderDetail> details = orderDetailService.selectByOrderMasterId(Long.valueOf(goodsImgs.getRemark())); List<OrderDetail> details = orderDetailService.selectByOrderMasterId(Long.valueOf(goodsImgs.getRemark()));
List<Long> ids = details.stream().map(OrderDetail::getId).collect(Collectors.toList()); List<Long> ids = details.stream().map(OrderDetail::getId).collect(Collectors.toList());
goodsImgs.setRemark(null); goodsImgs.setRemark(null);
@ -1592,6 +1591,21 @@ public class OrderController extends BaseController {
orderListResponse.setInsuranceManager(manager); orderListResponse.setInsuranceManager(manager);
} }
} }
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.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);
} }