调整

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/universalSend/UniversalSendManagerImpl.java

         addRequest.setSendTime(LocalDateTime.now());
         addRequest.setTitle(request.getTitle());
         addRequest.setSendResult(MessageResult.WAIT);
-        addRequest.setRequestDataJson(request.toJson());
+        addRequest.setRequestDataJson((String) request.getDataObject());
         addRequest.setOrderNo(request.getOrderNo());
         addRequest.setOrderType(request.getOrderType());
         addRequest.setSendOrderType(request.getSendOrderType());
         addRequest.setSendTime(LocalDateTime.now());
         addRequest.setTitle(request.getTitle());
         addRequest.setSendResult(MessageResult.WAIT);
-        addRequest.setRequestDataJson(request.toJson());
+        addRequest.setRequestDataJson((String) request.getData());
         addRequest.setOrderNo(request.getOrderNo());
         addRequest.setOrderType(request.getOrderType());
         addRequest.setSendOrderType(request.getSendOrderType());

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/deviceResume/DeviceResumeManager.java

             mpSendRequest.setData("{" +
                     "\"first\":{\"value\":" +
                     "订单处理通知" +
-                    "}\"keyword1\":{\"value\":\"" +
+                    "},\"keyword1\":{\"value\":\"" +
                     orderInfo.getOrderNo() +
                     "\"},\"keyword2\":{\"value\":\"" +
                     orderInfo.getOrderType().getDesc() +
             mpSendRequest.setData("{" +
                     "\"first\":{\"value\":" +
                     "订单处理通知" +
-                    "}\"keyword1\":{\"value\":\"" +
+                    "},\"keyword1\":{\"value\":\"" +
                     orderInfo.getOrderNo() +
                     "\"},\"keyword2\":{\"value\":\"" +
                     orderInfo.getOrderType().getDesc() +
         mpSendRequest.setClientId("bfc4040bda90473d8ceab246555361a3");
         mpSendRequest.setTitle("订单状态变更");
         mpSendRequest.setMpOpenId(accountInfo.getMpOpenid());
-        mpSendRequest.setTemplateName("Wn_--Fg98Okqydw8YWLVSp2gxESXZ5DhJF60hKae-FM");
+        mpSendRequest.setTemplateId("Wn_--Fg98Okqydw8YWLVSp2gxESXZ5DhJF60hKae-FM");
         mpSendRequest.setSendOrderType(orderInfo.getOrderType());
         mpSendRequest.setOrderType(OrderType.AFTERSALE);
         mpSendRequest.setOrderNo(orderInfo.getOrderNo());