sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

支付处理

feat/task1-c-wallet
devil_gong 2019-07-28 16:59:46 +08:00
parent bf7980e570
commit 5247bf926b
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/service/OrderService.php
View File

@ -172,8 +172,8 @@ class OrderService
// 支付信息返回 // 支付信息返回
$ret['data'] = [ $ret['data'] = [
// 是否为线下支付类型 // 是否为在线支付类型
'is_under_line' => in_array($payment[0]['payment'], config('shopxo.under_line_list')) ? 1 : 0, 'is_online_pay' => ($payment[0]['payment'] == 'WalletPay' || in_array($payment[0]['payment'], config('shopxo.under_line_list'))) ? 0 : 1,
// 支付模块处理数据 // 支付模块处理数据
'data' => $ret['data'], 'data' => $ret['data'],

2
public/appmini/old/alipay/pages/user-order/user-order.js
View File

@ -240,7 +240,7 @@ Page({
my.hideLoading(); my.hideLoading();
if (res.data.code == 0) { if (res.data.code == 0) {
// 线下支付成功 // 线下支付成功
if (res.data.data.is_under_line == 1) { if (res.data.data.is_online_pay == 0) {
var temp_data_list = this.data.data_list; var temp_data_list = this.data.data_list;
temp_data_list[index]['status'] = 2; temp_data_list[index]['status'] = 2;
temp_data_list[index]['status_name'] = '待发货'; temp_data_list[index]['status_name'] = '待发货';

3
public/appmini/old/baidu/pages/user-order/user-order.js
View File

@ -214,7 +214,7 @@ Page({
swan.hideLoading(); swan.hideLoading();
if (res.data.code == 0) { if (res.data.code == 0) {
// 线下支付成功 // 线下支付成功
if (res.data.data.is_under_line == 1) { if (res.data.data.is_online_pay == 0) {
var temp_data_list = this.data.data_list; var temp_data_list = this.data.data_list;
temp_data_list[index]['status'] = 2; temp_data_list[index]['status'] = 2;
temp_data_list[index]['status_name'] = '待发货'; temp_data_list[index]['status_name'] = '待发货';
@ -222,7 +222,6 @@ Page({
app.showToast("支付成功", "success"); app.showToast("支付成功", "success");
} else { } else {
console.log(res.data.data.data)
swan.requestPolymerPayment({ swan.requestPolymerPayment({
orderInfo: res.data.data.data, orderInfo: res.data.data.data,
success: function (res) { success: function (res) {

3
public/appmini/old/weixin/pages/user-order/user-order.js
View File

@ -226,7 +226,7 @@ Page({
wx.hideLoading(); wx.hideLoading();
if (res.data.code == 0) { if (res.data.code == 0) {
// 线下支付成功 // 线下支付成功
if (res.data.data.is_under_line == 1) { if (res.data.data.is_online_pay == 0) {
var temp_data_list = this.data.data_list; var temp_data_list = this.data.data_list;
temp_data_list[index]['status'] = 2; temp_data_list[index]['status'] = 2;
temp_data_list[index]['status_name'] = '待发货'; temp_data_list[index]['status_name'] = '待发货';
@ -234,7 +234,6 @@ Page({
app.showToast("支付成功", "success"); app.showToast("支付成功", "success");
} else { } else {
console.log(res.data.data.data)
wx.requestPayment({ wx.requestPayment({
timeStamp: res.data.data.data.timeStamp, timeStamp: res.data.data.data.timeStamp,
nonceStr: res.data.data.data.nonceStr, nonceStr: res.data.data.data.nonceStr,