郭盛 / community · 提交

转到一个项目

作者 何书鹏
提交 8fbe63d702341a5f4b2962fc2914dca18bd913b5 2 个父辈 56377cc3 7bfa5651
1 个管道 的构建 通过 耗费 0 秒

Merge branch 'master' of http://114.215.101.231:8099/guosheng/community into heshupeng

内嵌 并排对比
正在显示 1 个修改的文件 包含 5 行增加 和 5 行删除
... ... @@ -181,12 +181,12 @@ class Store extends Api
'openid' => Db::name('third')->where('user_id',$this->auth->id)->value('openid'),
];
$order = new Order($attributes);
$order_result = $payment->pay($order);
$order_result = $payment->prepare($order);
if($order_result['return_code'] == 'SUCCESS' && $order_result['result_code'] == 'SUCCESS') {
$prepayId = $order_result->prepay_id;
$pay_data = $payment->configForJSSDKPayment($prepayId);
} else {
$this->error($order_result['return_msg'],[$order_result,$order,ConfigService::load()]);
$this->error($order_result['return_msg']);
}
Db::startTrans();
$result = false;
... ... @@ -210,7 +210,7 @@ class Store extends Api
if(!$result || !$result_invite) {
$this->error('申请提交失败');
}
$this->success('申请提交成功',['id'=>$id,'status'=>$param['status'],'pay_data'=>$pay_data]);
$this->success('申请提交成功',['id'=>$id,'pay_data'=>$pay_data]);
}
/**
... ... @@ -470,7 +470,7 @@ class Store extends Api
'openid' => Db::name('third')->where('user_id',$this->auth->id)->value('openid'),
];
$order = new Order($attributes);
$order_result = $payment->pay($order);
$order_result = $payment->prepare($order);
if($order_result['return_code'] == 'SUCCESS' && $order_result['result_code'] == 'SUCCESS') {
$prepayId = $order_result->prepay_id;
$pay_data = $payment->configForJSSDKPayment($prepayId);
... ... @@ -497,7 +497,7 @@ class Store extends Api
if(!$result || !$result_invite) {
$this->error('提交失败');
}
$this->success('提交成功',['id'=>$id,'status'=>$param['status'],'pay_data'=>$pay_data]);
$this->success('提交成功',['id'=>$id,'pay_data'=>$pay_data]);
}
/**
... ...