From 839d40d8b315639eaea70027fd9fa0beb81f4a8c Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Wed, 19 Jul 2023 16:35:06 +0800 Subject: [PATCH] 支付完后，在有用通联支付的页面，要避免一直提示支付成功的错误 --- packageA/pages/cart2_ser/cart2_ser.js | 2 +- packageA/pages/details_serviceCard/details_serviceCard.js | 10 ++++++---- packageA/pages/myGift/myGift.js | 5 +---- packageA/pages/myGiftDetails/myGiftDetails.js | 4 +--- packageA/pages/serviceCard_pd/cart/cart.js | 2 +- packageA/pages/serviceCard_pd/cart_wk/cart_wk.js | 3 ++- packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js | 2 +- packageC/pages/presell/cart/cart.js | 2 +- packageC/pages/presell/cart/cart2.js | 2 +- packageC/pages/presell/cart/cart2_pre.js | 2 +- packageD/pages/user/deposit/prepaid/prepaid.js | 2 +- packageD/pages/user/integral/integral.js | 2 +- packageE/pages/cart/cart2/cart2.js | 2 +- packageE/pages/cart/cart2_inte/cart2_inte.js | 2 +- packageE/pages/cart/cart2_pt/cart2_pt.js | 2 +- packageE/pages/user/cardinfo/cardinfo.js | 2 +- packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js | 2 +- packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js | 2 +- pages/cart/cart_wk/cart_wk.js | 2 +- pages/giftpack/buygiftpack/giftpackbuy.js | 2 +- pages/giftpack/giftpacklist/giftpacklist.js | 2 +- pages/user/order_detail/order_detail.js | 4 +--- pages/user/plus/plus.js | 2 +- utils/util.js | 14 +++++++++++--- 24 files changed, 40 insertions(+), 36 deletions(-) diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js index 6bfdb12..5c06bb6 100644 --- a/packageA/pages/cart2_ser/cart2_ser.js +++ b/packageA/pages/cart2_ser/cart2_ser.js @@ -291,7 +291,7 @@ Page({ var back_url="/pages/payment/pay_success/pay_success?card=1&order_id=" + th.data.order_id; //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok(back_url,"/pages/user/order_list/order_list?index=2&tabindex=1",function (){ + ut.is_pay_ok(th.data.order_id,back_url,"/pages/user/order_list/order_list?index=2&tabindex=1",function (){ if(!th.data.order_id) return false; getApp().request.promiseGet("/api/weshop/recharge/user/page", diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js index 8d4b479..eb36139 100644 --- a/packageA/pages/details_serviceCard/details_serviceCard.js +++ b/packageA/pages/details_serviceCard/details_serviceCard.js @@ -62,7 +62,9 @@ Page({ var back_url='/pages/user/order_list/order_list?index=2&tabindex=1'; var err_url='/pages/user/order_list/order_list?index=2&tabindex=1'; - if(th.data.details) { + //判断是不是有调用支付过 + if(th.data.payed) { + th.data.payed=0; //-- 判断一下活动的类型 -- var prom_type = th.data.details.list[0].prom_type > 0 ? th.data.details.list[0].prom_type : 0; var order_id = th.data.details.order_id; @@ -81,10 +83,8 @@ Page({ } //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok(back_url, err_url, function () { - + ut.is_pay_ok(th.data.details,back_url, err_url, function () { if (!th.data.details) return false; - getApp().request.promiseGet(ck_url, {data: req_data}).then(res => { if (ut.ajax_ok(res)) { @@ -770,6 +770,8 @@ Page({ } if (flag) { + + th.data.payed=1; t_pay.set_pay_url("/api/weshop/order/pay/createRechargeOrder"); t_pay.pay({ parentSn: order_sn, diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js index 3f14c5e..9ccc3f3 100644 --- a/packageA/pages/myGift/myGift.js +++ b/packageA/pages/myGift/myGift.js @@ -109,7 +109,7 @@ Page({ t_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - util.is_pay_ok("none","none",function (){ + util.is_pay_ok(th.data.ok_order_sn,"none","none",function (){ if(!th.data.ok_order_sn) return false; var b_url="/api/weshop/libao/libaoFormvip/page"; @@ -137,9 +137,6 @@ Page({ } - - - getApp().check_can_share(); if(app.globalData.userInfo) { if(!this.data.isLogin) { diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js index c68e479..47e27a2 100644 --- a/packageA/pages/myGiftDetails/myGiftDetails.js +++ b/packageA/pages/myGiftDetails/myGiftDetails.js @@ -81,11 +81,9 @@ Page({ t_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("/packageA/pages/libao_payment/payment?type=2","none",function (){ - + ut.is_pay_ok(th.data.ok_order_sn,"/packageA/pages/libao_payment/payment?type=2","none",function (){ console.log('is_pay_ok'); console.log(th.data.ok_order_sn); - if(!th.data.ok_order_sn) return false; var b_url="/api/weshop/libao/libaoFormvip/page"; diff --git a/packageA/pages/serviceCard_pd/cart/cart.js b/packageA/pages/serviceCard_pd/cart/cart.js index 0a7ae0c..7911842 100644 --- a/packageA/pages/serviceCard_pd/cart/cart.js +++ b/packageA/pages/serviceCard_pd/cart/cart.js @@ -258,7 +258,7 @@ Page({ var back_url="/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + th.data.order_sn; //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok(back_url,"/pages/user/order_list/order_list?index=2&tabindex=1",function (){ + ut.is_pay_ok(th.data.order_id,back_url,"/pages/user/order_list/order_list?index=2&tabindex=1",function (){ if(!th.data.order_id) return false; getApp().request.promiseGet("/api/weshop/rechargeServicelist/page",{ data: { store_id: os.stoid, order_id: th.data.order_id} diff --git a/packageA/pages/serviceCard_pd/cart_wk/cart_wk.js b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.js index 8710453..b6ac5bf 100644 --- a/packageA/pages/serviceCard_pd/cart_wk/cart_wk.js +++ b/packageA/pages/serviceCard_pd/cart_wk/cart_wk.js @@ -109,8 +109,9 @@ Page({ var back_url="/pages/payment/pay_success/pay_success?order_id=" + th.data.order.order_id + "&type=1&card=1"; //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok(back_url,"/pages/user/order_list/order_list?index=2&tabindex=1",function (){ + ut.is_pay_ok(th.data.wk_pyed,back_url,"/pages/user/order_list/order_list?index=2&tabindex=1",function (){ if(!th.data.wk_pyed) return false; + getApp().request.promiseGet("/api/weshop/rechargeServicelist/page",{ data: { store_id: os.stoid, order_id: th.data.order.order_id} }).then(res=>{ diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index 00dfb30..f90b71c 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -672,7 +672,7 @@ Page({ "&goods_name=" + th.data.bn_goods.goods_name; //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok(back,'/pages/user/order_list/order_list',function (){ + ut.is_pay_ok(th.data.ok_order_sn,back,'/pages/user/order_list/order_list',function (){ if(!th.data.ok_order_sn) return false; getApp().request.promiseGet("/api/weshop/order/page", {data:{store_id:os.stoid,parent_sn:th.data.ok_order_sn}}).then(res=>{ diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index e9d9457..0af57e2 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -216,7 +216,7 @@ Page({ util_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("back","back",function (){ + ut.is_pay_ok(th.data.ok_order_sn,"back","back",function (){ console.log('onshow-444'); console.log(th.data.ok_order_sn); diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index d3a1268..6249f72 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -213,7 +213,7 @@ Page({ util_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("/pages/payment/pay_success/pay_success?type=2&order_sn=" + this.data.ok_order_sn, + ut.is_pay_ok(th.data.ok_order_sn,"/pages/payment/pay_success/pay_success?type=2&order_sn=" + this.data.ok_order_sn, "/pages/user/order_list/order_list",function (){ if(!th.data.ok_order_sn) return false; getApp().request.promiseGet("/api/weshop/order/page", diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index 0299fb4..677bcab 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -294,7 +294,7 @@ Page({ var ok_url = "/packageC/pages/presell/cart/cart?order_sn=" +this.data.ok_order_sn; var err_url="/pages/user/order_list/order_list"; //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok(ok_url,err_url,function (){ + ut.is_pay_ok(th.data.ok_order_sn,ok_url,err_url,function (){ if(!th.data.ok_order_sn) return false; getApp().request.promiseGet("/api/weshop/order/page", {data:{store_id:os.stoid,parent_sn:th.data.ok_order_sn}}).then(res=>{ diff --git a/packageD/pages/user/deposit/prepaid/prepaid.js b/packageD/pages/user/deposit/prepaid/prepaid.js index 52db824..4aaf90e 100644 --- a/packageD/pages/user/deposit/prepaid/prepaid.js +++ b/packageD/pages/user/deposit/prepaid/prepaid.js @@ -110,7 +110,7 @@ Page({ t_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("/packageD/pages/user/deposit/prepaid/msg/msg","none",function (){ + ut.is_pay_ok(th.data.ok_order_sn,"/packageD/pages/user/deposit/prepaid/msg/msg","none",function (){ if(!th.data.ok_order_sn) return false; var ck_url="/api/weshop/recharge/get/"+os.stoid+"/"+th.data.ok_order_sn; getApp().request.promiseGet(ck_url,{}).then(res=>{ diff --git a/packageD/pages/user/integral/integral.js b/packageD/pages/user/integral/integral.js index 0b9762e..5525f1b 100644 --- a/packageD/pages/user/integral/integral.js +++ b/packageD/pages/user/integral/integral.js @@ -345,7 +345,7 @@ Page({ t_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("/packageD/pages/user/integral/msg/msg",'none',function (){ + ut.is_pay_ok(th.data.ok_order_sn,"/packageD/pages/user/integral/msg/msg",'none',function (){ console.log('show--11') console.log(th.data.ok_order_sn); diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 0ac2553..394ba31 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -285,7 +285,7 @@ Page({ util_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("/pages/payment/pay_success/pay_success?type=2&order_sn=" + this.data.ok_order_sn, + ut.is_pay_ok(th.data.ok_order_sn,"/pages/payment/pay_success/pay_success?type=2&order_sn=" + this.data.ok_order_sn, "/pages/user/order_list/order_list",function (){ //支付信息会先记录着 if(!th.data.ok_order_sn) return false; diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.js b/packageE/pages/cart/cart2_inte/cart2_inte.js index ab59c3c..39296e5 100644 --- a/packageE/pages/cart/cart2_inte/cart2_inte.js +++ b/packageE/pages/cart/cart2_inte/cart2_inte.js @@ -225,7 +225,7 @@ Page({ util_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("/pages/payment/pay_success/pay_success?type=2&order_sn=" + th.data.ok_order_sn, + ut.is_pay_ok(th.data.ok_order_sn,"/pages/payment/pay_success/pay_success?type=2&order_sn=" + th.data.ok_order_sn, "/pages/user/order_list/order_list",function (){ if(!th.data.ok_order_sn) return false; getApp().request.promiseGet("/api/weshop/order/page", diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js index 00af434..94d3cc8 100644 --- a/packageE/pages/cart/cart2_pt/cart2_pt.js +++ b/packageE/pages/cart/cart2_pt/cart2_pt.js @@ -585,7 +585,7 @@ Page({ if(fy) return false; util_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn, + ut.is_pay_ok(th.data.ok_order_sn,"/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn, "/pages/user/order_list/order_list",function (){ if(!th.data.ok_order_sn) return false; getApp().request.promiseGet("/api/weshop/order/page", diff --git a/packageE/pages/user/cardinfo/cardinfo.js b/packageE/pages/user/cardinfo/cardinfo.js index 6be8a96..46534e3 100644 --- a/packageE/pages/user/cardinfo/cardinfo.js +++ b/packageE/pages/user/cardinfo/cardinfo.js @@ -696,7 +696,7 @@ Page({ t_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("func",'none',function (){ + ut.is_pay_ok(th.data.ok_order_sn,"func",'none',function (){ console.log('1111'); console.log(th.data.ok_order_sn); diff --git a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js index 6e62b14..519ee16 100644 --- a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js +++ b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js @@ -196,7 +196,7 @@ Page({ var money = th.data.payMoney; var bk_url = "/packageE/pages/user/monthgiftbag/payment/payment?money=" + money + "&order_sn=" + th.data.back_ord; //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok(bk_url, "none", function () { + ut.is_pay_ok(th.data.back_ord,bk_url, "none", function () { if (!th.data.back_ord) return false; //订单查询的接口 getApp().request.promiseGet("/api/weshop/marketing/marketingMonthgiftbagRecord/page", diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js index c31c72f..d847d98 100644 --- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js +++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js @@ -460,7 +460,7 @@ Page({ var money=th.data.payMoney; var bk_url = "/packageE/pages/user/monthgiftbag/payment/payment?money=" + money + "&order_sn=" + th.data.back_ord; //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok(bk_url,"none",function (){ + ut.is_pay_ok(th.data.back_ord,bk_url,"none",function (){ if(!th.data.back_ord) return false; getApp().request.promiseGet("/api/weshop/marketing/marketingMonthgiftbagRecord/page", {data:{store_id:os.stoid,order_sn:th.data.back_ord,user_id:getApp().globalData.user_id}}).then(res=>{ diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index c98f8e3..a8ed543 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -108,7 +108,7 @@ Page({ util_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("/pages/payment/pay_success/pay_success?type=1&order_sn=" + this.data.ok_order_sn,'back',function (){ + ut.is_pay_ok(th.data.ok_order_sn,"/pages/payment/pay_success/pay_success?type=1&order_sn=" + this.data.ok_order_sn,'back',function (){ if(!th.data.ok_order_sn) return false; getApp().request.promiseGet("/api/weshop/order/page", {data:{store_id:os.stoid,parent_sn:th.data.ok_order_sn}}).then(res=>{ diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index 7a78f95..a6105eb 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -163,7 +163,7 @@ Page({ var money=th.data.payMoney; var back_url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + th.data.ok_order_sn; - ut.is_pay_ok(back_url,'none',function (){ + ut.is_pay_ok(th.data.ok_order_sn,back_url,'none',function (){ if(!th.data.ok_order_sn) return false; getApp().request.promiseGet("/api/weshop/marketing/my/giftbag/detail/get", {data:{storeId:os.stoid,orderSn:th.data.ok_order_sn,userId:getApp().globalData.user_id}}).then(res=>{ diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 287d476..f86d8ed 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -187,7 +187,7 @@ Page({ //-- 通联的第三方支付的返回优化 -- var money=th.data.payMoney; var back_url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + th.data.ok_order_sn; - ut.is_pay_ok(back_url,'none',function (){ + ut.is_pay_ok(th.data.ok_order_sn,back_url,'none',function (){ if(!th.data.ok_order_sn) return false; getApp().request.promiseGet("/api/weshop/marketing/my/giftbag/detail/get", {data:{storeId:os.stoid,orderSn:th.data.ok_order_sn,userId:getApp().globalData.user_id}}).then(res=>{ diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 0e6044a..b47b72d 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -81,8 +81,7 @@ Page({ //通联第三方 //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("back","none",function (){ - if(!th.data.ok_order_sn) return false; + ut.is_pay_ok(th.data.ok_order_sn,"back","none",function (){ getApp().request.promiseGet("/api/weshop/order/page", {data:{store_id:os.stoid,order_sn:th.data.ok_order_sn}}).then(res=>{ if(ut.ajax_ok(res)){ @@ -583,7 +582,6 @@ Page({ }) if (presellList) { - if (good.goods_num > presellList.presell_sumqty - presellList.buy_goodnum) { var content = good.goods_name + '购买数量超出商品库存,请取消订单'; th.toast(content); diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js index 436a976..976697a 100644 --- a/pages/user/plus/plus.js +++ b/pages/user/plus/plus.js @@ -144,7 +144,7 @@ Page({ ut.fy_back('',0); t_pay.set_fir(); //-- 通联的第三方支付的返回优化 -- - ut.is_pay_ok("func","func",function (){ + ut.is_pay_ok(th.data.ok_order_sn,"func","func",function (){ if(!th.data.ok_order_sn) return false; var ck_url="/api/weshop/recharge/get/"+os.stoid+"/"+th.data.ok_order_sn; diff --git a/utils/util.js b/utils/util.js index f6fcb6c..1a9bd6f 100644 --- a/utils/util.js +++ b/utils/util.js @@ -885,7 +885,7 @@ module.exports = { }, //-- 支付的结果判断是不是完成了,通联支付pos收银的返回 -- /** - * + * @param ok_order_sn 判断是不是有支付过 * @param back_url 如果是地址，就跳转，如果是back，就返回。如果是func，就是要回调 * @param err_url 如果是地址，就跳转，如果是back，就返回。如果是func，就是要回调，如果是none，就没有反应，提示而已 * @param func 因为是物理键的返回，所以要调用结果，查询结果 @@ -893,12 +893,20 @@ module.exports = { * @param fail //失败的回调函数， 当err_url是func * @param is_navigateTo //跳转的页面是不是要is_re_to */ - is_pay_ok(back_url,err_url,func,success,fail,is_navigateTo){ + is_pay_ok(ok_order_sn,back_url,err_url,func,success,fail,is_navigateTo){ + + if(!ok_order_sn) { + return false; + } if(!err_url){ err_url="/pages/index/index/index"; } - + //-- getEnterOptionsSync的信息会一直存在，很恶心 -- let options = wx.getEnterOptionsSync(); + + console.log("is_pay_ok"); + console.log(options); + if (options.scene == '1038' && options.referrerInfo.appId=='wxef277996acc166c3') { let extraData = options.referrerInfo.extraData; if (!extraData) { -- libgit2 0.21.4