费用提醒

device-api-service/src/main/java/com/xy/job/DeviceChargingJob.java

@@ -86,12 +86,10 @@ public class DeviceChargingJob {
         //发送消息
         JMap<String, Object> officialParams = new JHashMap<String, Object>()
                 .set("content", String.format("尊敬的客户，您有设备管理费即将到期，为避免设备停机，请及时续费，客服电话%s", tel));
-        JMap<String, Object> miniParams = new JHashMap<String, Object>()
-                .set("content", "您有设备管理费即将到期")
-                .set("phone", tel);
+        JMap<String, Object> mxrParams = officialParams;
         MsgUtils.sendMsg(17L, mercIds)
                 .official(userInfo -> new MsgUtils.MsgInfo(userInfo.getMpOpenid(), officialParams))
-                .mini(userInfo -> new MsgUtils.MsgInfo(userInfo.getWechatOpenid(), miniParams))
+                .mxr(userInfo -> new MsgUtils.MsgInfo(String.valueOf(userInfo.getAuthorizeUserId()), mxrParams))
                 .builder();
         //写入记录
         mercMsgInfoService.save(new MercMsgInfoDto.Save()
@@ -124,14 +122,10 @@ public class DeviceChargingJob {
         //发送消息
         JMap<String, Object> officialParams = new JHashMap<String, Object>()
                 .set("content", String.format("尊敬的客户，截止%s您的%s已欠费，如您在%s前未完成续费，您的设备将停止交易，客服电话%s", thisTime, "设备管理费", time1, tel));
-        JMap<String, Object> miniParams = new JHashMap<String, Object>()
-                .set("time0", thisTime)
-                .set("type", "设备管理费")
-                .set("time1", time1)
-                .set("phone", tel);
+        JMap<String, Object> mxrParams = officialParams;
         MsgUtils.sendMsg(17L, mercIds)
                 .official(userInfo -> new MsgUtils.MsgInfo(userInfo.getMpOpenid(), officialParams))
-                .mini(userInfo -> new MsgUtils.MsgInfo(userInfo.getWechatOpenid(), miniParams))
+                .mxr(userInfo -> new MsgUtils.MsgInfo(String.valueOf(userInfo.getAuthorizeUserId()), mxrParams))
                 .builder();
         //写入记录
         mercMsgInfoService.save(new MercMsgInfoDto.Save()

device-api-service/src/main/java/com/xy/job/DeviceSimJob.java

@@ -87,12 +87,10 @@ public class DeviceSimJob {
         //发送消息
         JMap<String, Object> officialParams = new JHashMap<String, Object>()
                 .set("content", String.format("尊敬的客户，您有设备流量卡即将到期，为避免设备停机，请及时续费，客服电话%s", tel));
-        JMap<String, Object> miniParams = new JHashMap<String, Object>()
-                .set("content", "您有设备流量卡即将到期")
-                .set("phone", tel);
+        JMap<String, Object> mxrParams = officialParams;
         MsgUtils.sendMsg(17L, mercIds)
                 .official(userInfo -> new MsgUtils.MsgInfo(userInfo.getMpOpenid(), officialParams))
-                .mini(userInfo -> new MsgUtils.MsgInfo(userInfo.getWechatOpenid(), miniParams))
+                .mxr(userInfo -> new MsgUtils.MsgInfo(String.valueOf(userInfo.getAuthorizeUserId()), mxrParams))
                 .builder();
         //写入记录
         mercMsgInfoService.save(new MercMsgInfoDto.Save()
@@ -124,14 +122,10 @@ public class DeviceSimJob {
         //发送消息
         JMap<String, Object> officialParams = new JHashMap<String, Object>()
                 .set("content", String.format("尊敬的客户，截止%s您的%s已欠费，如您在%s前未完成续费，您的设备将停止交易，客服电话%s", thisTime, "设备流量卡", time1, tel));
-        JMap<String, Object> miniParams = new JHashMap<String, Object>()
-                .set("time0", thisTime)
-                .set("type", "设备流量卡")
-                .set("time1", time1)
-                .set("phone", tel);
+        JMap<String, Object> mxrParams = officialParams;
         MsgUtils.sendMsg(17L, mercIds)
                 .official(userInfo -> new MsgUtils.MsgInfo(userInfo.getMpOpenid(), officialParams))
-                .mini(userInfo -> new MsgUtils.MsgInfo(userInfo.getWechatOpenid(), miniParams))
+                .mxr(userInfo -> new MsgUtils.MsgInfo(String.valueOf(userInfo.getAuthorizeUserId()), mxrParams))
                 .builder();
         //写入记录
         mercMsgInfoService.save(new MercMsgInfoDto.Save()