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-04-15 18:02:16 +08:00
parent db05137f27
commit 0433165ae2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1215,6 +1215,8 @@ public class OrderDetailController extends BaseController {
// 名称 // 名称
paramsNew.put("thing12", "请进入【我的订单--未约未排】查看"); paramsNew.put("thing12", "请进入【我的订单--未约未排】查看");
CustomerAddress address = addressService.selectByCustomerAddressId(om.getAddressId()); CustomerAddress address = addressService.selectByCustomerAddressId(om.getAddressId());
//拒单人员
paramsNew.put("thing12", orderDetail.getWorkerName());
paramsNew.put("thing7", address.getName()); paramsNew.put("thing7", address.getName());
// 预约时间 // 预约时间
paramsNew.put("time5", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); paramsNew.put("time5", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date()));

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

@ -182,6 +182,8 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
boolean drawCash = orderDetail.getDrawCashTime() != null; boolean drawCash = orderDetail.getDrawCashTime() != null;
// 更新为售后未超时 // 更新为售后未超时
orderDetailService.updateAfterTimeout(afterServiceRecord.getOrderDetailId(), 0, 0); orderDetailService.updateAfterTimeout(afterServiceRecord.getOrderDetailId(), 0, 0);
log.info("客户是否同意{},师傅是否同意{}",one.equals(param.getCustomerFinalCheck()),one.equals(afterServiceRecord.getWorkerFeedbackResult()));
log.info("修改后的售后订单{}",orderDetail);
if (one.equals(param.getCustomerFinalCheck()) && one.equals(afterServiceRecord.getWorkerFeedbackResult())) { if (one.equals(param.getCustomerFinalCheck()) && one.equals(afterServiceRecord.getWorkerFeedbackResult())) {
// 师傅同意 且 客户同意退款 // 师傅同意 且 客户同意退款
afterServiceRecord.setCustomerFinalCheck(1L); afterServiceRecord.setCustomerFinalCheck(1L);
@ -202,7 +204,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
paramsNew.put("thing10", address.getName()); paramsNew.put("thing10", address.getName());
// 预约时间 // 预约时间
paramsNew.put("time13", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); paramsNew.put("time13", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date()));
WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.DEFAULT_ORDER, paramsNew); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.AFTER_SALES_ORDER, paramsNew);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }