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-10-29 11:17:34 +08:00
parent f66ee72314
commit 77008d11da
3 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1455,7 +1455,10 @@ public class OrderController extends BaseController {
return o2.getCreateTime().compareTo(o1.getCreateTime()); // 都没有超时时间，按创建时间倒序 return o2.getCreateTime().compareTo(o1.getCreateTime()); // 都没有超时时间，按创建时间倒序
} }
} else { } else {
return o2.getUpdateTime().compareTo(o1.getUpdateTime()); // 如果updateTime为null，则使用createTime代替
Date o1Time = o1.getUpdateTime() != null ? o1.getUpdateTime() : o1.getCreateTime();
Date o2Time = o2.getUpdateTime() != null ? o2.getUpdateTime() : o2.getCreateTime();
return o2Time.compareTo(o1Time);
} }
} }
}); });

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

@ -855,9 +855,16 @@ public class OrderDetailController extends BaseController {
orderListResponse.setConfirmStartTime(detail.getConfirmStartTime()); orderListResponse.setConfirmStartTime(detail.getConfirmStartTime());
orderListResponse.setDeliveryType(orderMaster.getDeliveryType()); orderListResponse.setDeliveryType(orderMaster.getDeliveryType());
orderListResponse.setWorkerRemark(detail.getWorkerRemark()); orderListResponse.setWorkerRemark(detail.getWorkerRemark());
orderListResponse.setServiceCancelled(orderMaster.getServiceCancelled());
orderListResponse.setOrderType(orderMaster.getOrderType()); orderListResponse.setOrderType(orderMaster.getOrderType());
orderListResponse.setHasServiceOrder(orderMaster.getHasServiceOrder()); // 判断子单和主单的师傅id是否一致且主单的hasServiceOrder字段为1
if (detail.getWorkerId() != null && orderMaster.getWorkerId() != null
&& detail.getWorkerId().equals(orderMaster.getWorkerId())
&& orderMaster.getHasServiceOrder() != null && orderMaster.getHasServiceOrder() == 1) {
orderListResponse.setHasServiceOrder(1);
} else {
orderListResponse.setHasServiceOrder(0);
}
Shop shop = shopService.getShop(goods.getShopId()); Shop shop = shopService.getShop(goods.getShopId());

37
ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
View File

@ -621,6 +621,37 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
return AjaxResult.success("重做/补做完成状态已更新"); return AjaxResult.success("重做/补做完成状态已更新");
} }
// 新增：处理师傅反馈结果为0或1时，设置redoCompleteTime为当前时间+36小时
// if (param.getWorkerFeedbackResult() != null && (param.getWorkerFeedbackResult().equals(0L) || param.getWorkerFeedbackResult().equals(1L))) {
// afterServiceRecord.setWorkerFeedbackResult(param.getWorkerFeedbackResult());
// // 设置当前时间推后36小时
// Calendar calendar = Calendar.getInstance();
// calendar.setTime(new Date());
// calendar.add(Calendar.HOUR_OF_DAY, 36);
// afterServiceRecord.setRedoCompleteTime(calendar.getTime());
// // 处理师傅反馈相关字段
// if (param.getWorkerFeedbackReasonType() != null) {
// afterServiceRecord.setWorkerFeedbackReasonType(param.getWorkerFeedbackReasonType());
// }
// if (param.getWorkerFeedbackReason() != null) {
// afterServiceRecord.setWorkerFeedbackReason(param.getWorkerFeedbackReason());
// }
// if (param.getWorkerFeedbackImages() != null) {
// afterServiceRecord.setWorkerFeedbackImages(param.getWorkerFeedbackImages());
// }
// if (param.getAgreedRefund() != null) {
// afterServiceRecord.setAgreedRefund(param.getAgreedRefund());
// }
// if (param.getUpdateBy() != null) {
// afterServiceRecord.setUpdateBy(param.getUpdateBy());
// }
// afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
// log.info("商品售后-师傅反馈结果为{}，记录ID：{}，redoCompleteTime设置为：{}", param.getWorkerFeedbackResult(), param.getId(), afterServiceRecord.getRedoCompleteTime());
// return AjaxResult.success("师傅反馈结果已更新");
// }
// 新增：处理师傅重发/补发方案 // 新增：处理师傅重发/补发方案
if (param.getWorkerResendPlan() != null) { if (param.getWorkerResendPlan() != null) {
// 验证快递/物流方式必须提供单号 // 验证快递/物流方式必须提供单号
@ -659,7 +690,10 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
if (param.getWorkerReceiveStatus() != null && param.getWorkerAgreeType() != null) { if (param.getWorkerReceiveStatus() != null && param.getWorkerAgreeType() != null) {
afterServiceRecord.setWorkerReceiveStatus(param.getWorkerReceiveStatus()); afterServiceRecord.setWorkerReceiveStatus(param.getWorkerReceiveStatus());
afterServiceRecord.setWorkerAgreeType(param.getWorkerAgreeType()); afterServiceRecord.setWorkerAgreeType(param.getWorkerAgreeType());
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
calendar.add(Calendar.HOUR_OF_DAY, 36);
afterServiceRecord.setRedoCompleteTime(calendar.getTime());
// 处理师傅反馈相关字段 // 处理师傅反馈相关字段
if (param.getWorkerFeedbackReasonType() != null) { if (param.getWorkerFeedbackReasonType() != null) {
afterServiceRecord.setWorkerFeedbackReasonType(param.getWorkerFeedbackReasonType()); afterServiceRecord.setWorkerFeedbackReasonType(param.getWorkerFeedbackReasonType());
@ -1498,6 +1532,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
// 设置师傅收货确认 // 设置师傅收货确认
afterServiceRecord.setWorkerReceiveConfirm(1); // 1-已收货 afterServiceRecord.setWorkerReceiveConfirm(1); // 1-已收货
afterServiceRecord.setWorkerReceiveStatus(3); // 3-已确认收货
afterServiceRecord.setUpdateTime(new Date()); afterServiceRecord.setUpdateTime(new Date());
// 根据师傅同意处理方式决定是否执行退款 // 根据师傅同意处理方式决定是否执行退款