clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

增加主单和子单的师傅备注

This commit is contained in:
cb 2025-08-30 08:54:52 +08:00
parent 356d2beaa5
commit 65ca7bf9aa
11 changed files with 152 additions and 5 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/OrderDetailController.java
View File

@ -1569,4 +1569,31 @@ public class OrderDetailController extends BaseController {
return AjaxResult.error("退回失败: " + e.getMessage());
}
}
/**
* 保存子单师傅备注
*/
@PostMapping("/saveWorkerRemark")
@ResponseBody
public AjaxResult saveDetailWorkerRemark(@RequestBody OrderDetail orderDetail) {
try {
if (orderDetail.getWorkerRemark() == null || orderDetail.getWorkerRemark().trim().isEmpty()) {
return AjaxResult.error("师傅备注不能为空");
}
if (orderDetail.getId() == null) {
return AjaxResult.error("子单ID不能为空");
}
int result = orderDetailService.saveDetailWorkerRemark(orderDetail.getId(), orderDetail.getWorkerRemark());
if (result > 0) {
return AjaxResult.success("子单师傅备注保存成功");
} else {
return AjaxResult.error("子单师傅备注保存失败");
}
} catch (Exception e) {
logger.error("保存子单师傅备注失败", e);
return AjaxResult.error("保存子单师傅备注失败：" + e.getMessage());
}
}
}

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

@ -2255,4 +2255,33 @@ public class OrderMasterController extends BaseController {
return toAjax(orderMasterService.updateOrderMasterAddressById(orderMaster));
}
/**
* 保存主单师傅备注
*/
@PostMapping("/saveMasterWorkerRemark")
@ResponseBody
public AjaxResult saveMasterWorkerRemark(@RequestBody OrderMaster orderMaster) {
try {
if (orderMaster.getWorkerRemark() == null || orderMaster.getWorkerRemark().trim().isEmpty()) {
return AjaxResult.error("师傅备注不能为空");
}
if (orderMaster.getId() == null) {
return AjaxResult.error("主单ID不能为空");
}
int result = orderMasterService.saveMasterWorkerRemark(orderMaster.getId(), orderMaster.getWorkerRemark());
if (result > 0) {
return AjaxResult.success("主单师傅备注保存成功");
} else {
return AjaxResult.error("主单师傅备注保存失败");
}
} catch (Exception e) {
logger.error("保存主单师傅备注失败", e);
return AjaxResult.error("保存主单师傅备注失败：" + e.getMessage());
}
}
}

2
ghy-admin/src/main/resources/templates/order/orderManager.html
View File

@ -85,7 +85,7 @@
/* 表格最小宽度 */
#bootstrap-table {
min-width: 2000px;
min-width: 1000px;
}
</style>
</head>

4
ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
View File

@ -245,4 +245,8 @@ public class OrderDetail extends BaseEntity {
*/
private String returnImages;
/**
* 师傅备注
*/
private String workerRemark;
}

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

@ -318,4 +318,9 @@ public class OrderMaster extends BaseEntity {
* 退单图片
*/
private String returnImages;
/**
* 师傅备注
*/
private String workerRemark;
}

11
ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java
View File

@ -224,4 +224,15 @@ public interface OrderDetailService {
* @return 成功条数
*/
int returnOrder(Long orderDetailId);
int updateOrderDetailAddressById(OrderDetail orderDetail);
/**
* 保存子单师傅备注
*
* @param orderDetailId 子订单ID
* @param workerRemark 师傅备注
* @return 成功条数
*/
int saveDetailWorkerRemark(Long orderDetailId, String workerRemark);
}

12
ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java
View File

@ -7,6 +7,7 @@ import com.ghy.order.pojo.dto.OrderMasterStatisticsDTO;
import com.ghy.order.request.AppOrderRequest;
import com.ghy.order.request.OrderChangePriceReq;
import com.huifu.adapay.core.exception.BaseAdaPayException;
import com.ghy.order.domain.OrderDetail;
import java.util.Collection;
import java.util.List;
@ -192,4 +193,15 @@ public interface OrderMasterService {
int updateOrderMasterAddressById(OrderMaster orderMaster);
int returnOrder(Long orderMasterId, String returnReason, String returnReasonDetail, String returnImages);
/**
* 保存主单师傅备注
*
* @param orderMasterId 主订单ID
* @param workerRemark 师傅备注
* @return 成功条数
*/
int saveMasterWorkerRemark(Long orderMasterId, String workerRemark);
}

20
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -1550,4 +1550,24 @@ public class OrderDetailServiceImpl implements OrderDetailService {
return num;
}
@Override
public int saveDetailWorkerRemark(Long orderDetailId, String workerRemark) {
logger.info("保存子单师傅备注，子单ID：{}，师傅备注：{}", orderDetailId, workerRemark);
OrderDetail orderDetail = new OrderDetail();
orderDetail.setId(orderDetailId);
orderDetail.setWorkerRemark(workerRemark);
int result = orderDetailMapper.updateOrderDetail(orderDetail);
logger.info("更新子单师傅备注，子单ID：{}，结果：{}", orderDetailId, result);
return result;
}
@Override
public int updateOrderDetailAddressById(OrderDetail orderDetail) {
logger.info("更新子单地址信息，子单ID：{}", orderDetail.getId());
return orderDetailMapper.updateOrderDetail(orderDetail);
}
}

27
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -118,6 +118,20 @@ public class OrderMasterServiceImpl implements OrderMasterService {
return orderMasterMapper.updateOrderMaster(orderMaster);
}
@Override
public int saveMasterWorkerRemark(Long orderMasterId, String workerRemark) {
logger.info("保存主单师傅备注，主单ID：{}，师傅备注：{}", orderMasterId, workerRemark);
OrderMaster orderMaster = new OrderMaster();
orderMaster.setId(orderMasterId);
orderMaster.setWorkerRemark(workerRemark);
int result = orderMasterMapper.updateOrderMaster(orderMaster);
logger.info("更新主单师傅备注，主单ID：{}，结果：{}", orderMasterId, result);
return result;
}
@Override
public List<OrderMaster> selectOrderMasterList(OrderMaster orderMaster) {
return orderMasterMapper.selectOrderMasterList(orderMaster);
@ -775,5 +789,18 @@ public class OrderMasterServiceImpl implements OrderMasterService {
return orderMasterMapper.updateOrderMasterAddressById(orderMaster);
}
@Override
public int returnOrder(Long orderMasterId, String returnReason, String returnReasonDetail, String returnImages) {
logger.info("主单退单，订单ID：{}，退单原因：{}，退单原因详情：{}，退单图片：{}",
orderMasterId, returnReason, returnReasonDetail, returnImages);
OrderMaster orderMaster = new OrderMaster();
orderMaster.setId(orderMasterId);
orderMaster.setReturnReason(returnReason);
orderMaster.setReturnReasonDetail(returnReasonDetail);
orderMaster.setReturnImages(returnImages);
return orderMasterMapper.updateOrderMaster(orderMaster);
}
}

10
ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
View File

@ -40,6 +40,7 @@
<result property="returnReason" column="return_reason"/>
<result property="returnReasonDetail" column="return_reason_detail"/>
<result property="returnImages" column="return_images"/>
<result property="workerRemark" column="worker_remark"/>
</resultMap>
<sql id="selectOrderDetail">
@ -76,7 +77,8 @@
delay_count,
return_reason,
return_reason_detail,
return_images
return_images,
worker_remark
FROM order_detail
</sql>
@ -115,7 +117,8 @@
od.delay_count,
od.return_reason,
od.return_reason_detail,
od.return_images
od.return_images,
od.worker_remark
FROM order_detail od
LEFT JOIN order_master om ON om.id = od.order_master_id
LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
@ -385,6 +388,7 @@
<if test="returnReason != null">return_reason = #{returnReason},</if>
<if test="returnReasonDetail != null">return_reason_detail = #{returnReasonDetail},</if>
<if test="returnImages != null">return_images = #{returnImages},</if>
<if test="workerRemark != null">worker_remark = #{workerRemark},</if>
update_time = SYSDATE()
</set>
WHERE id = #{id}
@ -447,6 +451,7 @@
<if test="returnReason != null">return_reason,</if>
<if test="returnReasonDetail != null">return_reason_detail,</if>
<if test="returnImages != null">return_images,</if>
<if test="workerRemark != null">worker_remark,</if>
<if test="expectTimeStart != null">expect_time_start,</if>
<if test="expectTimeEnd != null">expect_time_end,</if>
<if test="workBeginTime != null">work_begin_time,</if>
@ -470,6 +475,7 @@
<if test="returnReason != null">#{returnReason},</if>
<if test="returnReasonDetail != null">#{returnReasonDetail},</if>
<if test="returnImages != null">#{returnImages},</if>
<if test="workerRemark != null">#{workerRemark},</if>
<if test="expectTimeStart != null">#{expectTimeStart},</if>
<if test="expectTimeEnd != null">#{expectTimeEnd},</if>
<if test="workBeginTime != null">#{workBeginTime},</if>

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

@ -68,6 +68,7 @@
<result property="returnReason" column="return_reason"/>
<result property="returnReasonDetail" column="return_reason_detail"/>
<result property="returnImages" column="return_images"/>
<result property="workerRemark" column="worker_remark"/>
</resultMap>
@ -133,7 +134,8 @@
original_worker_id,
return_reason,
return_reason_detail,
return_images
return_images,
worker_remark
FROM order_master
</sql>
@ -199,7 +201,8 @@
om.original_worker_id,
om.return_reason,
om.return_reason_detail,
om.return_images
om.return_images,
om.worker_remark
FROM order_master om
LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
LEFT JOIN goods g ON g.goods_id = om.goods_id
@ -508,6 +511,7 @@
<if test="returnReason != null">return_reason = #{returnReason},</if>
<if test="returnReasonDetail != null">return_reason_detail = #{returnReasonDetail},</if>
<if test="returnImages != null">return_images = #{returnImages},</if>
<if test="workerRemark != null">worker_remark = #{workerRemark},</if>
update_time = SYSDATE()
</set>
WHERE id = #{id}
@ -579,6 +583,7 @@
<if test="returnReason != null">return_reason,</if>
<if test="returnReasonDetail != null">return_reason_detail,</if>
<if test="returnImages != null">return_images,</if>
<if test="workerRemark != null">worker_remark,</if>
create_time
)VALUES(
<if test="deptId != null and deptId != 0">#{deptId},</if>
@ -631,6 +636,7 @@
<if test="returnReason != null">#{returnReason},</if>
<if test="returnReasonDetail != null">#{returnReasonDetail},</if>
<if test="returnImages != null">#{returnImages},</if>
<if test="workerRemark != null">#{workerRemark},</if>
SYSDATE()
)
</insert>