From 4388cbb3f6b66bd0f55430a4dad20adb66a61ae2 Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Fri, 10 Oct 2025 09:58:55 +0800 Subject: [PATCH] no message --- .../web/controller/order/OrderController.java | 5 +- .../order/OrderMasterController.java | 55 ++++++++++++++++--- .../ghy/web/pojo/vo/OrderListResponse.java | 1 + 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index f857d54a..a6d4ddf4 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -2354,6 +2354,7 @@ public class OrderController extends BaseController { serviceOrderMaster.setAddressId(accessoryOrderMaster.getAddressId()); serviceOrderMaster.setPayStatus(PayStatus.WAIT_PAY.getCode()); serviceOrderMaster.setCreateTime(new Date()); + serviceOrderMaster.setUpdateTime(new Date()); serviceOrderMaster.setWorkerId(serviceWorker.getWorkerId()); // 使用服务店铺的师傅ID serviceOrderMaster.setServiceShopId(serviceShopId); // 设置服务店铺ID serviceOrderMaster.setRemark("由配件订单[" + accessoryOrderMaster.getCode() @@ -2453,9 +2454,9 @@ public class OrderController extends BaseController { result.put("serviceWorkerName", serviceWorker.getName()); result.put("serviceWorkerPhone", serviceWorker.getPhone()); - logger.info("成功为配件订单[{}]生成服务订单[{}]，服务金额：{}，服务店铺：{}", + logger.info("成功为配件订单[{}]生成服务订单[{}]，服务金额：{}，服务店铺：{},更新时间为{}", accessoryOrderMaster.getCode(), serviceOrderMaster.getCode(), serviceMoney, - serviceShop.getShopName()); + serviceShop.getShopName(), serviceOrderMaster.getUpdateTime()); return AjaxResult.success("服务订单生成成功", result); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 135163d6..cf1245d6 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -1095,6 +1095,11 @@ public class OrderMasterController extends BaseController { // 优化4：使用预查询的商品信息 goods = goodsMap.getOrDefault(master.getGoodsId(), new Goods()); // } + if(master.getGoodsOrderMasterId() != null){ + OrderMaster goodsOrderMaster = orderMasterService.selectById(master.getGoodsOrderMasterId()); + //goods = goodsService.selectById(goodsOrderMaster.getGoodsId()); + orderStandardList=orderGoodsService.selectByOrderMasterId(goodsOrderMaster.getId()); + } // 填充商品三级类目 if (goods.getDeptGoodsCategoryId() != null) { @@ -1200,6 +1205,23 @@ public class OrderMasterController extends BaseController { standardList.add(orderStandard); } + // 获取商品主单信息 + if (master.getGoodsOrderMasterId() != null) { + OrderMaster goodsOrderMaster = orderMasterService.selectById(master.getGoodsOrderMasterId()); + if (goodsOrderMaster != null && goodsOrderMaster.getWorkerId() != null) { + Worker goodsWorker = workerService.selectById(goodsOrderMaster.getWorkerId()); + if (goodsWorker != null) { + // 获取师傅实名认证信息 + WorkerCertification workerCertification = workerCertificationService.selectByWorkerId(goodsWorker.getWorkerId()); + String masterCompanyName = workerCertification == null ? null : workerCertification.getCompanyName(); + String masterWorkerPhone = goodsWorker.getPhone(); + + orderListResponse.setMasterCompanyName(masterCompanyName); + orderListResponse.setMasterWorkerPhone(masterWorkerPhone); + } + } + } + // 编辑返回属性 orderListResponse.setWorkerRemark(master.getWorkerRemark()); orderListResponse.setIsNeedBill(master.getIsNeedBill()); @@ -1701,6 +1723,7 @@ public class OrderMasterController extends BaseController { // 子单商品规格及信息 List orderStandardList = orderGoodsService.selectByOrderDetailId(orderDetail.getId()); + for (OrderGoods orderGoods : orderStandardList) { OrderStandard orderStandard = new OrderStandard(); orderStandard.setStandardName(orderGoods.getGoodsName()); @@ -1836,20 +1859,35 @@ public class OrderMasterController extends BaseController { String masterWorkerName = ""; String masterCompanyName = ""; Worker masterWorker = workerService.selectById(orderMaster.getWorkerId()); - if (masterWorker != null) { - // 大师傅实名信息 - workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); - masterWorkerName = workerRealInfo == null ? masterWorker.getName() - : workerRealInfo.getSurname() + workerRealInfo.getName(); - masterCompanyName = workerRealInfo == null ? null : workerRealInfo.getCompanyName(); - } + Worker goodsWorker =new Worker(); + OrderMaster goodsOrderMaster =null; + WorkerCertification goodsWorkerRealInfo = null; + // 消费者信息 // Customer customer = // customerService.selectByCustomerId(orderMaster.getCustomerId()); // 商品规格及信息 List orderStandardList = orderGoodsService.selectByOrderMasterId(orderMaster.getId()); + if (orderMaster.getGoodsOrderMasterId() != null) { + // 子单商品规格及信息 + goodsOrderMaster = orderMasterService.selectById(orderMaster.getGoodsOrderMasterId()); + goodsWorker = workerService.selectById(goodsOrderMaster.getWorkerId()); + goodsWorkerRealInfo = workerCertificationService.selectByWorkerId(goodsOrderMaster.getWorkerId()); + orderStandardList=orderGoodsService.selectByOrderMasterId(goodsOrderMaster.getId()); + } + if (masterWorker != null) { + // 大师傅实名信息 + workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); + masterWorkerName = workerRealInfo == null ? masterWorker.getName() + : workerRealInfo.getSurname() + workerRealInfo.getName(); + if (orderMaster.getGoodsOrderMasterId() != null) { + workerRealInfo=goodsWorkerRealInfo; + } + masterCompanyName = workerRealInfo == null ? null : workerRealInfo.getCompanyName(); + + } // 商品信息 // GoodsStandard goodsStandard = // goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId()); @@ -1902,7 +1940,7 @@ public class OrderMasterController extends BaseController { sysArea = sysAreaService.selectById(customerAddress.getCountryId()); } String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress(); - + for (OrderGoods orderGoods : orderStandardList) { OrderStandard orderStandard = new OrderStandard(); orderStandard.setStandardName(orderGoods.getGoodsName()); @@ -1936,6 +1974,7 @@ public class OrderMasterController extends BaseController { orderListResponse.setShop(shop); orderListResponse.setServiceShop(serviceShop); + orderListResponse.setGoodsOrderMasterId(orderMaster.getGoodsOrderMasterId()); orderListResponse.setGoods(goods); orderListResponse.setTrackingNumber(orderMaster.getTrackingNumber()); orderListResponse.setWorkerRemark(orderMaster.getWorkerRemark()); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index ca57c9bd..55bf4b10 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -303,4 +303,5 @@ public class OrderListResponse { private Shop shop; private Shop serviceShop; + private Long goodsOrderMasterId; }