|
|
@@ -139,22 +139,17 @@ class Shop extends BaseController
|
|
|
Db::name('store_order_cart_info')->insertAll($cartInfo);
|
|
|
|
|
|
// 创建支付流水
|
|
|
-// $payTrade = new PayTrade();
|
|
|
-// $payNo = $payTrade->credentials(
|
|
|
-// 'score',
|
|
|
-// $request->user['uid'],
|
|
|
-// 'shop_order',
|
|
|
-// $payMoney,
|
|
|
-// '商城订单支付',
|
|
|
-// $orderId,
|
|
|
-// ['order_id' => $orderId],
|
|
|
-// 0
|
|
|
-// );
|
|
|
-//
|
|
|
-// // 更新支付流水的o_id
|
|
|
-// if ($payNo) {
|
|
|
-// Db::name('pay_trade')->where('pay_no', $payNo)->update(['o_id' => $orderIdDb]);
|
|
|
-// }
|
|
|
+ $payTrade = new PayTrade();
|
|
|
+ $payNo = $payTrade->credentials(
|
|
|
+ 'score',
|
|
|
+ $request->user['uid'],
|
|
|
+ 'shop_order',
|
|
|
+ $payMoney,
|
|
|
+ '商城订单支付',
|
|
|
+ $orderId,
|
|
|
+ ['order_id' => $orderId],
|
|
|
+ 0
|
|
|
+ );
|
|
|
|
|
|
// 清除购物车
|
|
|
Db::name('store_cart')->whereIn('id', $cartIds)->delete();
|
|
|
@@ -327,7 +322,6 @@ class Shop extends BaseController
|
|
|
// 查询支付流水
|
|
|
$payTradeData = Db::name('pay_trade')
|
|
|
->where('o_id', $orderData['id'])
|
|
|
- ->where('code', 'shop_order')
|
|
|
->find();
|
|
|
|
|
|
if (empty($payTradeData)) {
|
