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-09-13 17:30:50 +08:00
parent 61dcb7b25c
commit 9db20efd88
3 changed files with 176 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1713,6 +1713,7 @@ public class OrderController extends BaseController {
&& master.getWorkerId() != null; && master.getWorkerId() != null;
logger.info("是否为监控单{}主单id{}", condition, master); logger.info("是否为监控单{}主单id{}", condition, master);
// 编辑返回属性 // 编辑返回属性
orderListResponse.setWorkerRemark(master.getWorkerRemark());
orderListResponse.setGoods(goods); orderListResponse.setGoods(goods);
orderListResponse.setIsNeedBill(master.getIsNeedBill()); orderListResponse.setIsNeedBill(master.getIsNeedBill());
orderListResponse.setIsMonitoredOrder(master.getIsMonitoredOrder()); orderListResponse.setIsMonitoredOrder(master.getIsMonitoredOrder());
@ -1786,7 +1787,9 @@ public class OrderController extends BaseController {
orderListResponse.setProvinceName(array[0]); orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]); orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]); orderListResponse.setCountryName(array[2]);
if (array.length>3){
orderListResponse.setStreetName(array[3]); 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());
@ -1899,6 +1902,7 @@ public class OrderController extends BaseController {
// List<AfterServiceRecord> afterServiceRecordList =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); // List<AfterServiceRecord> afterServiceRecordList =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord);
// 编辑返回属性 // 编辑返回属性
orderListResponse.setWorkerRemark(detail.getWorkerRemark());
orderListResponse.setGoods(goods); orderListResponse.setGoods(goods);
orderListResponse.setGoodsBrand(orderMaster.getGoodsBrand()); orderListResponse.setGoodsBrand(orderMaster.getGoodsBrand());
orderListResponse.setGoodsSpecification(orderMaster.getGoodsSpecification()); orderListResponse.setGoodsSpecification(orderMaster.getGoodsSpecification());
@ -1960,7 +1964,9 @@ public class OrderController extends BaseController {
orderListResponse.setProvinceName(array[0]); orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]); orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]); orderListResponse.setCountryName(array[2]);
if (array.length>3){
orderListResponse.setStreetName(array[3]); 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());

5
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -589,7 +589,9 @@ public class OrderDetailController extends BaseController {
orderListResponse.setProvinceName(array[0]); orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]); orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]); orderListResponse.setCountryName(array[2]);
if (array.length > 3) {
orderListResponse.setStreetName(array[3]); 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());
@ -1052,7 +1054,9 @@ public class OrderDetailController extends BaseController {
orderListResponse.setProvinceName(array[0]); orderListResponse.setProvinceName(array[0]);
orderListResponse.setCityName(array[1]); orderListResponse.setCityName(array[1]);
orderListResponse.setCountryName(array[2]); orderListResponse.setCountryName(array[2]);
if (array.length > 3) {
orderListResponse.setStreetName(array[3]); 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());
@ -1719,6 +1723,7 @@ public class OrderDetailController extends BaseController {
/** /**
* 计算商家与主单地址之间的距离 * 计算商家与主单地址之间的距离
*
* @param orderMaster 主单信息 * @param orderMaster 主单信息
* @param shop 商家信息 * @param shop 商家信息
* @return 带有距离信息的商家对象 * @return 带有距离信息的商家对象

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

@ -1628,6 +1628,7 @@ public class OrderMasterController extends BaseController {
OrderMaster orderMaster = orderMasterService.selectById(request.getId()); OrderMaster orderMaster = orderMasterService.selectById(request.getId());
List<OrderDetail> orderDetailList = orderDetailService.selectByOrderMasterId(orderMaster.getId()); List<OrderDetail> orderDetailList = orderDetailService.selectByOrderMasterId(orderMaster.getId());
Collections.reverse(orderDetailList);
List<OrderStandardDetail> orderStandardDetails = new ArrayList<>(); List<OrderStandardDetail> orderStandardDetails = new ArrayList<>();
// 财务信息 // 财务信息