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-16 12:27:51 +08:00
parent 0433165ae2
commit 76323f4bbc
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1206,6 +1206,9 @@ public class OrderDetailController extends BaseController {
// 拒单
//TODO:待完善拒单人员
logger.info("师傅资料{}",masterWorker);
WorkerCertification workerRealInfo = workerCertificationService.selectByWorkerId(om.getWorkerId());
logger.info("认证师傅资料{}",workerRealInfo);
try {
// 推送公众号通知数据。
// 消息组装。
@ -1215,12 +1218,13 @@ public class OrderDetailController extends BaseController {
// 名称
paramsNew.put("thing12", "请进入【我的订单--未约未排】查看");
CustomerAddress address = addressService.selectByCustomerAddressId(om.getAddressId());
//拒单人员
paramsNew.put("thing12", orderDetail.getWorkerName());
paramsNew.put("thing13", workerRealInfo.getName());
paramsNew.put("thing7", address.getName());
// 预约时间
paramsNew.put("time5", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date()));
WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.REJECT_ORDER, paramsNew);
WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), masterWorker.getWxOpenId(), WxMsgEnum.REJECT_ORDER, paramsNew);
} catch (Exception e) {
logger.error(e.getMessage(), e);

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

@ -182,9 +182,9 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
boolean drawCash = orderDetail.getDrawCashTime() != null;
// 更新为售后未超时
orderDetailService.updateAfterTimeout(afterServiceRecord.getOrderDetailId(), 0, 0);
log.info("客户是否同意{},师傅是否同意{}",one.equals(param.getCustomerFinalCheck()),one.equals(afterServiceRecord.getWorkerFeedbackResult()));
log.info("客户是否同意{}",param.getCustomerFinalCheck()!=null);
log.info("修改后的售后订单{}",orderDetail);
if (one.equals(param.getCustomerFinalCheck()) && one.equals(afterServiceRecord.getWorkerFeedbackResult())) {
if (param.getCustomerFinalCheck()!=null ) {
// 师傅同意 且 客户同意退款
afterServiceRecord.setCustomerFinalCheck(1L);
afterServiceRecord.setRefundApplyTime(new Date());