添加订阅消息模板

backend/application/common/service/SubscribeMessageService.php

@@ -6,16 +6,16 @@ use think\Log;
 
 class SubscribeMessageService
 {
-    const MSG_TEMP_DEMAND_RECEIVE = 'Ozqp33NFV4qgJQWMYnWUygx0V63cvyL02BiVflkP67o'; //接单成功
-    const MSG_TEMP_DEMAND_MATCH_SUCCESS = 'zj8oNEXLfLyJxPA-wal9rpSkubnf1nXRRt-hX_rl98U'; //工单匹配成功
-    const MSG_TEMP_DEMAND_SETTLE = 'NVTH7KEGZxVaXQaojmbXX8A_FP3RI8u56rgm9q_v37M'; //工单结算
-    const MSG_TEMP_WORK_START = 'GWtWOOPsbpwocaOfvWy-pR5gbO3gI_5vxR_jmA6HJa0'; //项目开工
-    const MSG_TEMP_WORK_ACCEPT = 'n6OCDU8zwI-JTNLDlXcXpKnKEgdDi-6ZnJaj-WAMou8'; //工单验收
-    const MSG_TEMP_WORK_ACCEPT_RESULT = 'yaqaf5lGihxb8hf9qaV1_Ip2MgMg94DcutVXmBzZ3cg'; //验收结果
-    const MSG_TEMP_CONTRACT_PAY = 'QRBIPCZUjMhBWkQDYkHCRVBRshXAv0fuzKbFUs2k5Og'; //合同付款
-    const MSG_TEMP_CONTRACT_SIGN = 'mksLFWxPCFZmORvWof-4QWjHBbo0i274SAoY1XgmkCU'; //合同签约
-    const MSG_TEMP_ORDER_SHIPPED = 'OzA14wCKihBZBrZUiaE-WpSVoFFSecun-vlDWUtEEEE'; //订单发货
-    const MSG_TEMP_DEVELOPER_JOIN = 'ctqgNLWaHJ7RRnu9LwWTxu_g21lKil5v5Gv-Pg7XOE8'; //申请入驻
+    const MSG_TEMP_DEMAND_RECEIVE = 'JGQJ3a-enop3Jfrcb7av4e5bX8p0Cah_5txloDHhBNw'; //接单成功
+    const MSG_TEMP_DEMAND_MATCH_SUCCESS = 'dhLlEFPxhLkhrqKcDzvMA3tngRiyzDBy9nwxvqIAASg'; //工单匹配成功
+    const MSG_TEMP_DEMAND_SETTLE = 'Xpqqk4si-Jh6HqfD-1VS9IH2AtlgVgGJLzgVS7RRMFk'; //工单结算
+    const MSG_TEMP_WORK_START = 'fuSe71gltzwYTjNrc6N2bWg4cuO4qlhYjgo-09D3Gg8'; //项目开工
+    const MSG_TEMP_WORK_ACCEPT = 'Gl_t3R5a_NoAvmVaDLeERCfFmTLiHURv9eIixtnOKYI'; //工单验收
+    const MSG_TEMP_WORK_ACCEPT_RESULT = '0H4GVHXI9G8RtZ1FuS_BuWN8yzOiBQ0-47ym6f08X_I'; //验收结果
+    const MSG_TEMP_CONTRACT_PAY = 'RxZ1VlzI5cFl_q8fF-WfQlkUqMKp1HGhDCGzAYcmRtk'; //合同付款
+    const MSG_TEMP_CONTRACT_SIGN = '1Yz9jAXFaySOQyeUfM1V2utomImvVKBRx7m-9FvQ3xo'; //合同签约
+    const MSG_TEMP_ORDER_SHIPPED = 'jGxNQ11on1yD0d5tGwk4S8jP_CEdddfAkrp9-xVeeZY'; //订单发货
+    const MSG_TEMP_DEVELOPER_JOIN = '0LRwQET1LgJohEok6EbcfMTnikuICe6-NZ7pc0WSbOY'; //申请入驻
     const PAGE_DEMAND_LIST = 'pages/demand/list/index';
     const PAGE_ORDER_LIST = 'pages/order/order-list/index';
     const PAGE_HOME = 'pages/home/home';

frontend/miniapp/pages/demand/detail/index.js

@@ -123,7 +123,7 @@ Page({
         if (res.code == 1) {
           wx.setStorageSync('bidDemandId', this.data.id);
           wx.requestSubscribeMessage({
-            tmplIds: ['Ozqp33NFV4qgJQWMYnWUygx0V63cvyL02BiVflkP67o', 'GWtWOOPsbpwocaOfvWy-pR5gbO3gI_5vxR_jmA6HJa0'],
+            tmplIds: ['JGQJ3a-enop3Jfrcb7av4e5bX8p0Cah_5txloDHhBNw', 'fuSe71gltzwYTjNrc6N2bWg4cuO4qlhYjgo-09D3Gg8'],
             complete(re) {
               wx.showModal({
                 title: '提示',
@@ -282,7 +282,7 @@ Page({
   signContractCustomer(e) {
     // 处理签约合同逻辑
     wx.requestSubscribeMessage({
-      tmplIds: ['n6OCDU8zwI-JTNLDlXcXpKnKEgdDi-6ZnJaj-WAMou8'],
+      tmplIds: ['Gl_t3R5a_NoAvmVaDLeERCfFmTLiHURv9eIixtnOKYI'],
       complete: (re) => {
         this.signContractDev(e);
       }
@@ -310,7 +310,7 @@ Page({
               console.log(res);
               if (res.code == 1) {
                 wx.requestSubscribeMessage({
-                  tmplIds: ['yaqaf5lGihxb8hf9qaV1_Ip2MgMg94DcutVXmBzZ3cg', 'NVTH7KEGZxVaXQaojmbXX8A_FP3RI8u56rgm9q_v37M'],
+                  tmplIds: ['0H4GVHXI9G8RtZ1FuS_BuWN8yzOiBQ0-47ym6f08X_I', 'Xpqqk4si-Jh6HqfD-1VS9IH2AtlgVgGJLzgVS7RRMFk'],
                   complete(re) {
                     wx.showModal({
                       title: '提示',
@@ -368,7 +368,7 @@ Page({
               console.log(res);
               if (res.code == 1) {
                 wx.requestSubscribeMessage({
-                  tmplIds: ['QRBIPCZUjMhBWkQDYkHCRVBRshXAv0fuzKbFUs2k5Og'],
+                  tmplIds: ['RxZ1VlzI5cFl_q8fF-WfQlkUqMKp1HGhDCGzAYcmRtk'],
                   complete: (re) => {
                     wx.showModal({
                       title: '提示',
@@ -421,7 +421,7 @@ Page({
                     console.log(res);
                     if (res.code == 1) {
                       wx.requestSubscribeMessage({
-                        tmplIds: ['n6OCDU8zwI-JTNLDlXcXpKnKEgdDi-6ZnJaj-WAMou8'],
+                        tmplIds: ['Gl_t3R5a_NoAvmVaDLeERCfFmTLiHURv9eIixtnOKYI'],
                         complete: (re) => {
                           wx.showModal({
                             title: '提示',

frontend/miniapp/pages/demand/publish/index.js

@@ -141,7 +141,7 @@ Page({
     }, 'POST').then(res => {
       if (res.code === 1) {
         wx.requestSubscribeMessage({
-          tmplIds: ['zj8oNEXLfLyJxPA-wal9rpSkubnf1nXRRt-hX_rl98U', 'mksLFWxPCFZmORvWof-4QWjHBbo0i274SAoY1XgmkCU'],
+          tmplIds: ['dhLlEFPxhLkhrqKcDzvMA3tngRiyzDBy9nwxvqIAASg', '1Yz9jAXFaySOQyeUfM1V2utomImvVKBRx7m-9FvQ3xo'],
           complete(re) {
             wx.showModal({
               title: '提示',

frontend/miniapp/pages/developer/join/index.js

@@ -100,7 +100,7 @@ Page({
       }
     }
     wx.requestSubscribeMessage({
-      tmplIds: ['ctqgNLWaHJ7RRnu9LwWTxu_g21lKil5v5Gv-Pg7XOE8'],
+      tmplIds: ['0LRwQET1LgJohEok6EbcfMTnikuICe6-NZ7pc0WSbOY'],
       complete: (re) => {
         wx.$util.request(wx.$api.DeveloperSubmit, {
           backendSelected: backendSelected,

frontend/miniapp/pages/order/order-confirm/index.js

@@ -432,7 +432,7 @@ Page({
           //订阅发货通知
           if (data.order_type == 0) {
             wx.requestSubscribeMessage({
-              tmplIds: ['OzA14wCKihBZBrZUiaE-WpSVoFFSecun-vlDWUtEEEE'],
+              tmplIds: ['jGxNQ11on1yD0d5tGwk4S8jP_CEdddfAkrp9-xVeeZY'],
               complete: (re) => {
                 this.handlePay(data, settleDetailData);
               }

frontend/miniapp/pages/order/order-confirm/pay.js

@@ -94,9 +94,8 @@ export const payFail = (payOrderInfo, resultMsg) => {
 export const wechatPayOrder = (payOrderInfo) => {
   const payInfo = payOrderInfo.payInfo;
   const { timeStamp, nonceStr, signType, paySign } = payInfo;
-  paySuccess(payOrderInfo);
   return new Promise((resolve) => {
-    // resolve();
+    // 只有 wx.requestPayment 回调 success 才认为是支付成功,不能提前跳转支付结果页
     wx.requestPayment({
       timeStamp,
       nonceStr,