From 3dc68ceaf8d7de1418a5945398688c67e67d6616 Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Wed, 9 Jul 2025 17:41:24 +0800 Subject: [PATCH] no message --- .../web/controller/order/OrderController.java | 27 +++++++++++++--- .../order/OrderDetailController.java | 14 +++++++++ .../order/OrderMasterController.java | 18 +++++++---- .../ghy/web/pojo/vo/OrderListResponse.java | 31 +++++++++++++++++++ .../com/ghy/order/domain/OrderMaster.java | 18 +++++++++++ .../mapper/order/OrderMasterMapper.xml | 18 +++++++++++ 6 files changed, 115 insertions(+), 11 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 2acd17a9..334bafb0 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 @@ -543,7 +543,8 @@ public class OrderController extends BaseController { if (goods.getType() != null && goods.getType() == 2) { // 配件商品，需要获取对应的服务商品 logger.info("当前商品是配件商品，需要获取对应的服务商品"); - + orderMaster.setOrderType(1); + // 通过商品的类目ID获取类目信息 DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(goods.getDeptGoodsCategoryId()); if (deptGoodsCategory != null && deptGoodsCategory.getServiceCategoryId() != null) { @@ -554,12 +555,10 @@ public class OrderController extends BaseController { serviceGoodsQuery.setDeptGoodsCategoryId(deptGoodsCategory.getServiceCategoryId()); serviceGoodsQuery.setType(1); // 服务商品类型 serviceGoodsQuery.setStatus(0); // 上架状态 - List serviceGoodsList = goodsService.selectGoodsList(serviceGoodsQuery); if (CollectionUtils.isNotEmpty(serviceGoodsList)) { Goods serviceGoods = serviceGoodsList.get(0); // 取第一个服务商品 logger.info("找到对应的服务商品: {}", serviceGoods); - orderMaster.setOrderType(1); orderMaster.setServerGoodsId(serviceGoods.getGoodsId()); } else { logger.warn("未找到服务类目ID为 {} 的服务商品", deptGoodsCategory.getServiceCategoryId()); @@ -576,6 +575,7 @@ public class OrderController extends BaseController { // 生成主单 orderMaster.setDeptId(deptId); + orderMaster.setIsNeedBill(appOrderRequest.getIsNeedBill()); orderMaster.setCode(orderMasterService.createOrderCode()); orderMaster.setPayType(appOrderRequest.getPayType()); orderMaster.setOrderStatus(OrderStatus.RECEIVE.code()); @@ -1345,6 +1345,15 @@ public class OrderController extends BaseController { } // 编辑返回属性 + orderListResponse.setIsNeedBill(master.getIsNeedBill()); + orderListResponse.setIsMonitoredOrder(master.getIsMonitoredOrder()); + orderListResponse.setOrderImages(master.getOrderImages()); + orderListResponse.setIsInvoiced(master.getIsInvoiced()); + orderListResponse.setOriginalWorkerId(master.getOriginalWorkerId()); + + orderListResponse.setOrderType(master.getOrderType()); + orderListResponse.setHasServiceOrder(master.getHasServiceOrder()); + orderListResponse.setGoodsBrand(master.getGoodsBrand()); orderListResponse.setGoodsSpecification(master.getGoodsSpecification()); orderListResponse.setOrderMasterId(master.getId()); @@ -1633,6 +1642,12 @@ public class OrderController extends BaseController { && master.getWorkerId() != null; logger.info("是否为监控单{}主单id{}", condition,master); // 编辑返回属性 + orderListResponse.setIsNeedBill(master.getIsNeedBill()); + orderListResponse.setIsMonitoredOrder(master.getIsMonitoredOrder()); + orderListResponse.setOrderImages(master.getOrderImages()); + orderListResponse.setIsInvoiced(master.getIsInvoiced()); + orderListResponse.setOriginalWorkerId(master.getOriginalWorkerId()); + orderListResponse.setOrderType(master.getOrderType()); orderListResponse.setHasServiceOrder(master.getHasServiceOrder()); orderListResponse.setIsMonitoredOrder(condition); @@ -1960,7 +1975,9 @@ public class OrderController extends BaseController { if (accessoryOrderMaster.getHasServiceOrder() != null && accessoryOrderMaster.getHasServiceOrder() == 1) { return AjaxResult.error("该配件订单已经派发过服务订单，不能重复操作"); } - + if (accessoryOrderMaster.getServerGoodsId() == null) { + return AjaxResult.error("未关联服务商品"); + } // 获取服务商品信息 Goods serverGoods = goodsService.selectById(accessoryOrderMaster.getServerGoodsId()); if (serverGoods == null) { @@ -1984,7 +2001,7 @@ public class OrderController extends BaseController { serviceOrderMaster.setAddressId(accessoryOrderMaster.getAddressId()); serviceOrderMaster.setPayStatus(PayStatus.WAIT_PAY.getCode()); serviceOrderMaster.setCreateTime(new Date()); - serviceOrderMaster.setWorkerId(serverWorker.getWorkerId()); // 使用服务商品的师傅 + serviceOrderMaster.setWorkerId(request.getWorkerId()); // 使用服务商品的师傅 serviceOrderMaster.setGoodsId(serverGoods.getGoodsId()); // 使用服务商品ID serviceOrderMaster.setRemark("由配件订单[" + accessoryOrderMaster.getCode() + "]自动生成的服务订单，服务金额：" + serviceMoney); serviceOrderMaster.setExpectTimeStart(accessoryOrderMaster.getExpectTimeStart()); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 7706350e..34d21d3f 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -761,7 +761,14 @@ public class OrderDetailController extends BaseController { orderListResponse.setIsOnlyServ(Boolean.FALSE); } + orderListResponse.setIsNeedBill(orderMaster.getIsNeedBill()); + orderListResponse.setIsMonitoredOrder(orderMaster.getIsMonitoredOrder()); + orderListResponse.setOrderImages(orderMaster.getOrderImages()); + orderListResponse.setIsInvoiced(orderMaster.getIsInvoiced()); + orderListResponse.setOriginalWorkerId(orderMaster.getOriginalWorkerId()); + orderListResponse.setOrderType(orderMaster.getOrderType()); + orderListResponse.setHasServiceOrder(orderMaster.getHasServiceOrder()); // 编辑返回属性 orderListResponse.setOrderDetailId(detail.getId()); orderListResponse.setOrderDetailCode(detail.getCode()); @@ -945,7 +952,14 @@ public class OrderDetailController extends BaseController { orderListResponse.setIsOnlyServ(Boolean.FALSE); } + orderListResponse.setIsNeedBill(orderMaster.getIsNeedBill()); + orderListResponse.setIsMonitoredOrder(orderMaster.getIsMonitoredOrder()); + orderListResponse.setOrderImages(orderMaster.getOrderImages()); + orderListResponse.setIsInvoiced(orderMaster.getIsInvoiced()); + orderListResponse.setOriginalWorkerId(orderMaster.getOriginalWorkerId()); + orderListResponse.setOrderType(orderMaster.getOrderType()); + orderListResponse.setHasServiceOrder(orderMaster.getHasServiceOrder()); // 编辑返回属性 orderListResponse.setOrderDetailId(detail.getId()); orderListResponse.setOrderDetailCode(detail.getCode()); 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 9f9ae7f8..8e0c46c2 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 @@ -188,11 +188,11 @@ public class OrderMasterController extends BaseController { OrderMaster updateOrder = new OrderMaster(); updateOrder.setId(orderMaster.getId()); updateOrder.setIsInvoiced(orderMaster.getIsInvoiced()); - updateOrder.setUpdateBy(getLoginName()); + // updateOrder.setUpdateBy(getLoginName()); int result = orderMasterService.updateOrderMaster(updateOrder); if (result > 0) { - String statusDesc = orderMaster.getIsInvoiced() == 0 ? "已开票" : "未开票"; + String statusDesc = orderMaster.getIsInvoiced() == 1 ? "已开票" : "未开票"; return AjaxResult.success("订单开票状态已更新为：" + statusDesc); } else { return AjaxResult.error("更新失败，请检查订单是否存在"); @@ -266,10 +266,10 @@ public class OrderMasterController extends BaseController { return AjaxResult.error("订单不存在"); } - // 检查订单状态是否允许转单 - if (originalOrder.getOrderStatus() == null || originalOrder.getOrderStatus() > OrderStatus.SERVING.code()) { - return AjaxResult.error("订单状态不允许转单，只有待接单、已接单、待上门、进行中状态的订单可以转单"); - } +// // 检查订单状态是否允许转单 +// if (originalOrder.getOrderStatus() == null || originalOrder.getOrderStatus() > OrderStatus.RECEIVE.code()) { +// return AjaxResult.error("订单状态不允许转单，只有待接单、已接单、待上门、进行中状态的订单可以转单"); +// } // 检查新师傅是否存在 Worker newWorker = workerService.selectById(orderMaster.getWorkerId()); @@ -1036,6 +1036,12 @@ public class OrderMasterController extends BaseController { } // 编辑返回属性 + orderListResponse.setIsNeedBill(master.getIsNeedBill()); + orderListResponse.setIsMonitoredOrder(master.getIsMonitoredOrder()); + orderListResponse.setOrderImages(master.getOrderImages()); + orderListResponse.setIsInvoiced(master.getIsInvoiced()); + orderListResponse.setOriginalWorkerId(master.getOriginalWorkerId()); + orderListResponse.setOrderType(master.getOrderType()); orderListResponse.setHasServiceOrder(master.getHasServiceOrder()); orderListResponse.setPaymentMoney(paymentMoney); 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 2ca44508..a89aa075 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 @@ -2,6 +2,7 @@ package com.ghy.web.pojo.vo; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ghy.common.annotation.Excel; import com.ghy.goods.domain.Goods; import com.ghy.goods.domain.GoodsArea; import com.ghy.goods.domain.InsuranceManager; @@ -213,4 +214,34 @@ public class OrderListResponse { * 是否已派发服务订单：0=未派发，1=已派发 */ private Integer hasServiceOrder; + + /** + * 下单图片 + */ + @Excel(name = "下单图片", cellType = Excel.ColumnType.STRING) + private String orderImages; + + /** + * 是否发货到服务店：0=否，1=是 + */ + @Excel(name = "是否发货到服务店", cellType = Excel.ColumnType.NUMERIC) + private Integer isDeliveryToStore; + + /** + * 是否已开票：0=是，1=否 + */ + @Excel(name = "是否已开票", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=是,1=否") + private Integer isInvoiced; + + /** + * 是否需要开票：0=不需要，1=需要 + */ + @Excel(name = "是否需要开票", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=不需要,1=需要") + private Integer isNeedBill; + + /** + * 原师傅id（转单前的师傅） + */ + @Excel(name = "原师傅id", cellType = Excel.ColumnType.NUMERIC) + private Long originalWorkerId; } diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index bf859a3f..9758c030 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -263,6 +263,24 @@ public class OrderMaster extends BaseEntity { @Excel(name = "是否发货到服务店", cellType = Excel.ColumnType.NUMERIC) private Integer isDeliveryToStore; + /** + * 发货类型：1=发快递/物流，2=送货上门，3=自提 + */ + @Excel(name = "发货类型", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "1=发快递/物流,2=送货上门,3=自提") + private Integer deliveryType; + + /** + * 发货备注 + */ + @Excel(name = "发货备注", cellType = Excel.ColumnType.STRING) + private String deliveryRemark; + + /** + * 发货图片 + */ + @Excel(name = "发货图片", cellType = Excel.ColumnType.STRING) + private String deliveryImages; + /** * 是否已开票：0=是，1=否 */ diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 7dc3b55d..d9a8174d 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -58,6 +58,9 @@ + + + @@ -117,6 +120,9 @@ has_service_order, order_images, is_delivery_to_store, + delivery_type, + delivery_remark, + delivery_images, is_invoiced, is_need_bill, original_worker_id @@ -176,6 +182,9 @@ om.has_service_order, om.order_images, om.is_delivery_to_store, + om.delivery_type, + om.delivery_remark, + om.delivery_images, om.is_invoiced, om.is_need_bill, om.original_worker_id @@ -477,6 +486,9 @@ has_service_order = #{hasServiceOrder}, order_images = #{orderImages}, is_delivery_to_store = #{isDeliveryToStore}, + delivery_type = #{deliveryType}, + delivery_remark = #{deliveryRemark}, + delivery_images = #{deliveryImages}, is_invoiced = #{isInvoiced}, is_need_bill = #{isNeedBill}, original_worker_id = #{originalWorkerId}, @@ -541,6 +553,9 @@ has_service_order, order_images, is_delivery_to_store, + delivery_type, + delivery_remark, + delivery_images, is_invoiced, is_need_bill, original_worker_id, @@ -586,6 +601,9 @@ #{hasServiceOrder}, #{orderImages}, #{isDeliveryToStore}, + #{deliveryType}, + #{deliveryRemark}, + #{deliveryImages}, #{isInvoiced}, #{isNeedBill}, #{originalWorkerId},