Commit 821da32e authored by shangtx's avatar shangtx

fix: 小程序消息信息修改

parent 95e57d98
...@@ -72,14 +72,16 @@ public class MiniAppMessageService { ...@@ -72,14 +72,16 @@ public class MiniAppMessageService {
} }
@Async @Async
public void sendValuator(ServiceOrder order, String remark, WorkUser workUser) { public void sendValuator(ServiceOrder order, String remark) {
var user = userMapper.selectByPrimaryKey(order.getAccountNo()); var user = userMapper.selectByPrimaryKey(order.getAccountNo());
var valuator = userMapper.selectByPrimaryKey(order.getValuatorId());
List<WxMaSubscribeMessage.MsgData> data = List<WxMaSubscribeMessage.MsgData> data =
List.of( List.of(
new WxMaSubscribeMessage.MsgData("character_string1", order.getOrderNo()), new WxMaSubscribeMessage.MsgData("character_string1", order.getOrderNo()),
new WxMaSubscribeMessage.MsgData("thing7", order.getServiceName()), new WxMaSubscribeMessage.MsgData("thing7", order.getServiceName()),
new WxMaSubscribeMessage.MsgData("thing11", workUser.getName()), new WxMaSubscribeMessage.MsgData("thing11", valuator.getUserName()),
new WxMaSubscribeMessage.MsgData("phone_number16", StringUtils.defaultString(workUser.getPhone(), "-")), new WxMaSubscribeMessage.MsgData("phone_number16", valuator.getPhone()),
new WxMaSubscribeMessage.MsgData("thing5", remark)); new WxMaSubscribeMessage.MsgData("thing5", remark));
sendSubscribeMsg(valuatorTmp, user.getOpenId(), data); sendSubscribeMsg(valuatorTmp, user.getOpenId(), data);
} }
......
...@@ -96,7 +96,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> { ...@@ -96,7 +96,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.VALUATION.getStatus(), description, recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.VALUATION.getStatus(), description,
sourceEnum, valuatorUser.getId(), dto.getRemark(), dto.getExpectArrivalTime()); sourceEnum, valuatorUser.getId(), dto.getRemark(), dto.getExpectArrivalTime());
// 发送小程序通知 // 发送小程序通知
miniAppMessageService.sendValuator(serviceOrder, dto.getRemark(), user); miniAppMessageService.sendValuator(serviceOrder, dto.getRemark());
} }
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment