Merge branch 'dev' into 'master'

fix: 小程序消息bug修改

See merge request !13

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

@@ -5,6 +5,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
 import com.onsiteservice.core.exception.ServiceException;
 import com.onsiteservice.dao.mapper.user.UserMapper;
 import com.onsiteservice.entity.order.ServiceOrder;
+import com.onsiteservice.entity.user.User;
 import com.onsiteservice.service.order.WorkUser;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -72,16 +73,15 @@ public class MiniAppMessageService {
     }
 
     @Async
-    public void sendValuator(ServiceOrder order, String remark) {
+    public void sendValuator(ServiceOrder order, String remark, User valuatorUser) {
         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", valuator.getUserName()),
-                        new WxMaSubscribeMessage.MsgData("phone_number16", valuator.getPhone()),
+                        new WxMaSubscribeMessage.MsgData("thing11", valuatorUser.getUserName()),
+                        new WxMaSubscribeMessage.MsgData("phone_number16", valuatorUser.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());
+            miniAppMessageService.sendValuator(serviceOrder, dto.getRemark(), valuatorUser);
         }
         return result;
     }