feats

src/main/java/com/huiju/estateagents/common/WxUtils.java

@@ -101,9 +101,12 @@ public class WxUtils {
         return service;
     }
 
-    public static String sendTemplateMessage(WxMpService mpService, String toUser, String templateId, String url, List<WxMpTemplateData> datas) throws WxErrorException {
+    public static String sendTemplateMessage(WxMpService mpService, String toUser, String templateId, String miniAppId, String miniPage, String url, List<WxMpTemplateData> datas) throws WxErrorException {
+        WxMpTemplateMessage.MiniProgram miniProgram = new WxMpTemplateMessage.MiniProgram(miniAppId, miniPage, true);
+
         WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
                 .toUser(toUser)
+                .miniProgram(miniProgram)
                 .templateId(templateId)
                 .url(url)
                 .build();

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -120,7 +120,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     WxUtils wxUtils;
 
     @Value("${wx.miniapp.ticket}")
-    String miniAppTicket;
+    String miniAppTicketPage;
 
     @Autowired
     private TaMpMiniappMapper taMpMiniappMapper;
@@ -394,52 +394,33 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
         // 对应表数据
         TaMpInfo mpInfo = iTaMpInfoService.getByOrgId(ticket.getOrgId());
-
         TaMiniapp taMiniapp = iMiniAppService.getAppByOrg(mpInfo.getOrgId());
-
-        WxMpKefuMessage kefuMessage = WxMpKefuMessage.MINIPROGRAMPAGE().appId(taMiniapp.getMiniappId())
-                .toUser(person.getMpOpenid())
-                .title("您有一个新的工单待处理")
-                .pagePath(miniAppTicket + ticket.getId())
-                .thumbMediaId(mpInfo.getMiniappMedia())
-                .build();
+        TaMpTemplate mpTemplate = iTaMpTemplateService.getByCode(ticket.getOrgId(), CommConstant.TP_MESSAGE_TICKET);
+        if (null == mpTemplate) {
+            return;
+        }
 
         try {
-            mpService.getKefuService().sendKefuMessage(kefuMessage);
-        } catch (WxErrorException e) {
-            e.printStackTrace();
-
-            // 如果客服消息发送失败, 则发送普通模板消息
-//            List<TaMpTemplate> mpTemplateList = iTaMpTemplateService.getAvailableList(ticket.getOrgId(), CommConstant.TP_MESSAGE_TICKET);
-//            if (null == mpTemplateList || mpTemplateList.size() < 1) {
-//                return;
-//            }
-            TaMpTemplate mpTemplate = iTaMpTemplateService.getByCode(ticket.getOrgId(), CommConstant.TP_MESSAGE_TICKET);
-            if (null == mpTemplate) {
-                return;
-            }
-
-            try {
-                TaPerson propOwner = iTaPersonService.getById(ticket.getPersonId());
-                String message = String.format("业主电话: %s ; 报修内容: %s", propOwner.getPhone(), ticket.getTicketTitle());
-                String remark = String.format("请及时进入【%s】小程序进行处理", taMiniapp.getName());
-
-                WxUtils.sendTemplateMessage(mpService,
-                        person.getMpOpenid(),
-                        mpTemplate.getTemplateCode(),
-                        null,
-                        new ArrayList<WxMpTemplateData>(){{
-                            add(new WxMpTemplateData("first", "工单提醒"));
-                            add(new WxMpTemplateData("keyword1", "您有一个新的工单"));
-                            add(new WxMpTemplateData("keyword2", DateUtils.today()));
-                            add(new WxMpTemplateData("keyword3", message));
-                            add(new WxMpTemplateData("remark", remark));
-                        }}
-                );
-            } catch (Exception e2) {
-                e2.printStackTrace();
-            }
-
+            TaPerson propOwner = iTaPersonService.getById(ticket.getPersonId());
+            String message = String.format("业主电话: %s ; 报修内容: %s", propOwner.getPhone(), ticket.getTicketTitle());
+            String remark = String.format("请及时进入【%s】小程序进行处理", taMiniapp.getName());
+
+            WxUtils.sendTemplateMessage(mpService,
+                    person.getMpOpenid(),
+                    mpTemplate.getTemplateCode(),
+                    taMiniapp.getMiniappId(),
+                    miniAppTicketPage + ticket.getId(),
+                    null,
+                    new ArrayList<WxMpTemplateData>(){{
+                        add(new WxMpTemplateData("first", "工单提醒"));
+                        add(new WxMpTemplateData("keyword1", "您有一个新的工单"));
+                        add(new WxMpTemplateData("keyword2", DateUtils.today()));
+                        add(new WxMpTemplateData("keyword3", message));
+                        add(new WxMpTemplateData("remark", remark));
+                    }}
+            );
+        } catch (Exception e2) {
+            e2.printStackTrace();
         }
     }