Merge branch 'dev' into 'master'

fix: 小程序消息信息修改

See merge request !12

common/src/main/java/com/onsiteservice/common/service/MiniAppMessageService.java

@@ -72,14 +72,16 @@ public class MiniAppMessageService {
     }
 
     @Async
-    public void sendValuator(ServiceOrder order, String remark, WorkUser workUser) {
+    public void sendValuator(ServiceOrder order, String remark) {
         var user = userMapper.selectByPrimaryKey(order.getAccountNo());
+        var valuator = userMapper.selectByPrimaryKey(order.getValuatorId());
+
         List<WxMaSubscribeMessage.MsgData> data =
                 List.of(
                         new WxMaSubscribeMessage.MsgData("character_string1", order.getOrderNo()),
                         new WxMaSubscribeMessage.MsgData("thing7", order.getServiceName()),
-                        new WxMaSubscribeMessage.MsgData("thing11", workUser.getName()),
-                        new WxMaSubscribeMessage.MsgData("phone_number16", StringUtils.defaultString(workUser.getPhone(), "-")),
+                        new WxMaSubscribeMessage.MsgData("thing11", valuator.getUserName()),
+                        new WxMaSubscribeMessage.MsgData("phone_number16", valuator.getPhone()),
                         new WxMaSubscribeMessage.MsgData("thing5", remark));
         sendSubscribeMsg(valuatorTmp, user.getOpenId(), data);
     }

common/src/main/java/com/onsiteservice/service/order/ServiceOrderService.java

@@ -96,7 +96,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
             recordComponent.recordProcess(serviceOrder.getId(), ServiceOrderStatusEnum.VALUATION.getStatus(), description,
                     sourceEnum, valuatorUser.getId(), dto.getRemark(), dto.getExpectArrivalTime());
             // 发送小程序通知
-            miniAppMessageService.sendValuator(serviceOrder, dto.getRemark(), user);
+            miniAppMessageService.sendValuator(serviceOrder, dto.getRemark());
         }
         return result;
     }