|
|
@@ -319,19 +319,6 @@ class Shop extends BaseController
|
|
|
return app('json')->fail('订单已支付');
|
|
|
}
|
|
|
|
|
|
- // 查询支付流水
|
|
|
- $payTradeData = Db::name('pay_trade')
|
|
|
- ->where('o_id', $orderData['id'])
|
|
|
- ->find();
|
|
|
-
|
|
|
- if (empty($payTradeData)) {
|
|
|
- return app('json')->fail('支付流水不存在');
|
|
|
- }
|
|
|
-
|
|
|
- if ($payTradeData['status'] == 1) {
|
|
|
- return app('json')->fail('订单已支付');
|
|
|
- }
|
|
|
-
|
|
|
// 检查用户积分
|
|
|
$userData = (new UserModel)->where('uid', $request->user['uid'])->find();
|
|
|
if (empty($userData)) {
|
|
|
@@ -361,19 +348,6 @@ class Shop extends BaseController
|
|
|
return app('json')->fail('积分扣除失败');
|
|
|
}
|
|
|
|
|
|
- // 更新支付流水
|
|
|
- $pay_json = json_encode([
|
|
|
- 'pay_type' => 'score',
|
|
|
- 'score' => $orderData['pay_price'],
|
|
|
- 'pay_time' => time()
|
|
|
- ], JSON_UNESCAPED_UNICODE);
|
|
|
-
|
|
|
- Db::name('pay_trade')->where('id', $payTradeData['id'])->update([
|
|
|
- 'status' => 1,
|
|
|
- 'pay_time' => time(),
|
|
|
- 'pay_json' => $pay_json
|
|
|
- ]);
|
|
|
-
|
|
|
// 更新订单状态
|
|
|
Db::name('store_order')->where('id', $orderData['id'])->update([
|
|
|
'paid' => 1,
|