!63 【新增】订阅消息：订单发货、充值退款消息订阅

Merge pull request !63 from puhui999/master

pages/order/confirm.vue

@@ -166,6 +166,7 @@
   import OrderApi from '@/sheep/api/trade/order';
   import CouponApi from '@/sheep/api/promotion/coupon';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import { SubscribeTemplate } from '@/sheep/util/const';
 
   const state = reactive({
     orderPayload: {},
@@ -231,6 +232,11 @@
     if (state.orderPayload.items[0].cartId > 0) {
       sheep.$store('cart').getList();
     }
+
+    // #ifdef MP
+    sheep.$platform.useProvider('wechat').subscribeMessage(SubscribeTemplate.DELIVERY_ORDER);
+    // #endif
+
     // 跳转到支付页面
     sheep.$router.redirect('/pages/pay/index', {
       id: data.payOrderId,

pages/pay/recharge.vue

@@ -74,20 +74,20 @@
 
   // 发起支付
   async function onConfirm() {
-		// const { code, data } = await PayWalletApi.createWalletRecharge({
+    const { code, data } = await PayWalletApi.createWalletRecharge({
-		// 	packageId: state.packageList.find((item) => fen2yuan(item.payPrice) === state.recharge_money)?.id,
+      packageId: state.packageList.find((item) => fen2yuan(item.payPrice) === state.recharge_money)?.id,
-		// 	payPrice: state.recharge_money * 100
+      payPrice: state.recharge_money * 100,
-		// });
+    });
-		// if (code !== 0) {
+    if (code !== 0) {
-		// 	return;
+      return;
-		// }
+    }
     // #ifdef MP
-    sheep.$platform.useProvider('wechat').subscribeMessage(SubscribeTemplate.MONEY_CHANGE);
+    sheep.$platform.useProvider('wechat').subscribeMessage([SubscribeTemplate.WALLET_RECHARGER_PAID, SubscribeTemplate.WALLET_RECHARGE_REFUNDED]);
     // #endif
-    // sheep.$router.go('/pages/pay/index', {
+    sheep.$router.go('/pages/pay/index', {
-    //   id: data.payOrderId,
+      id: data.payOrderId,
-    //   orderType: 'recharge'
+      orderType: 'recharge',
-    // });
+    });
   }
 
   onLoad(() => {

sheep/api/migration/third.js

@@ -4,9 +4,9 @@ export default {
   // 微信相关
   wechat: {
     // 小程序订阅消息
-    subscribeTemplate: () =>
+    getSubscribeTemplateList: () =>
       request({
-        url: '/member/social-user/get-subscribe-template',
+        url: '/member/social-user/get-subscribe-template-list',
         method: 'GET',
         custom: {
           showError: false,

sheep/platform/provider/wechat/miniProgram.js

@@ -164,7 +164,7 @@ const checkUpdate = async (silence = true) => {
 
 // 获取订阅消息模板
 async function getSubscribeTemplate() {
-  const { code, data } = await third.wechat.subscribeTemplate();
+  const { code, data } = await third.wechat.getSubscribeTemplateList();
   if (code === 0) {
     subscribeEventList = data;
   }
@@ -176,14 +176,14 @@ function subscribeMessage(event) {
   if (typeof event === 'string') {
     const temp = subscribeEventList.find(item => item.title.includes(event));
     if (temp) {
-      tmplIds.push(temp.priTmplId);
+      tmplIds.push(temp.id);
     }
   }
   if (typeof event === 'object') {
     event.forEach((e) => {
       const temp = subscribeEventList.find(item => item.title.includes(e));
       if (temp) {
-        tmplIds.push(temp.priTmplId);
+        tmplIds.push(temp.id);
       }
     });
   }

sheep/util/const.js

@@ -59,7 +59,9 @@ export const TimeStatusEnum = {
 // TODO 订阅模版枚举
 export const SubscribeTemplate = {
   ORDER_AFTERSALE_CHANGE: "售后进度通知",
-  MONEY_CHANGE: "充值成功通知"
+  WALLET_RECHARGER_PAID: "充值成功通知",
+  WALLET_RECHARGE_REFUNDED: "退款申请通知",
+  DELIVERY_ORDER: "订单发货通知",
 }