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-07-09 17:41:24 +08:00
parent ad6473f446
commit 3dc68ceaf8
6 changed files with 115 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<Goods> 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());

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

@ -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());

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

@ -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);

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

@ -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;
}

18
ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
View File

@ -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=否
*/

18
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -58,6 +58,9 @@
<result property="hasServiceOrder" column="has_service_order"/>
<result property="orderImages" column="order_images"/>
<result property="isDeliveryToStore" column="is_delivery_to_store"/>
<result property="deliveryType" column="delivery_type"/>
<result property="deliveryRemark" column="delivery_remark"/>
<result property="deliveryImages" column="delivery_images"/>
<result property="isInvoiced" column="is_invoiced"/>
<result property="isNeedBill" column="is_need_bill"/>
<result property="originalWorkerId" column="original_worker_id"/>
@ -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 @@
<if test="hasServiceOrder != null">has_service_order = #{hasServiceOrder},</if>
<if test="orderImages != null">order_images = #{orderImages},</if>
<if test="isDeliveryToStore != null">is_delivery_to_store = #{isDeliveryToStore},</if>
<if test="deliveryType != null">delivery_type = #{deliveryType},</if>
<if test="deliveryRemark != null">delivery_remark = #{deliveryRemark},</if>
<if test="deliveryImages != null">delivery_images = #{deliveryImages},</if>
<if test="isInvoiced != null">is_invoiced = #{isInvoiced},</if>
<if test="isNeedBill != null">is_need_bill = #{isNeedBill},</if>
<if test="originalWorkerId != null">original_worker_id = #{originalWorkerId},</if>
@ -541,6 +553,9 @@
<if test="hasServiceOrder != null">has_service_order,</if>
<if test="orderImages != null">order_images,</if>
<if test="isDeliveryToStore != null">is_delivery_to_store,</if>
<if test="deliveryType != null">delivery_type,</if>
<if test="deliveryRemark != null">delivery_remark,</if>
<if test="deliveryImages != null">delivery_images,</if>
<if test="isInvoiced != null">is_invoiced,</if>
<if test="isNeedBill != null">is_need_bill,</if>
<if test="originalWorkerId != null">original_worker_id,</if>
@ -586,6 +601,9 @@
<if test="hasServiceOrder != null">#{hasServiceOrder},</if>
<if test="orderImages != null">#{orderImages},</if>
<if test="isDeliveryToStore != null">#{isDeliveryToStore},</if>
<if test="deliveryType != null">#{deliveryType},</if>
<if test="deliveryRemark != null">#{deliveryRemark},</if>
<if test="deliveryImages != null">#{deliveryImages},</if>
<if test="isInvoiced != null">#{isInvoiced},</if>
<if test="isNeedBill != null">#{isNeedBill},</if>
<if test="originalWorkerId != null">#{originalWorkerId},</if>