From 7d0047dff9283d4a5beb96c1eef2bdc553c01453 Mon Sep 17 00:00:00 2001
From: lihan <3398341942@qq.com>
Date: Fri, 19 Oct 2018 20:13:09 +0800
Subject: [PATCH] 确认收货

---
 app/pay/controller/PayController.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/pay/controller/PayController.php b/app/pay/controller/PayController.php
index 526c1b6..f4d456d 100644
--- a/app/pay/controller/PayController.php
+++ b/app/pay/controller/PayController.php
@@ -116,15 +116,15 @@ class PayController extends HomeBaseController
                         }
                     } //组合支付
                     elseif ($order['pay_type'] == 2) {
-                        $pay_cash = (int)($request->param('pay_cash'));    //支付的金额
-                        $pay_num = (int)($request->param('pay_num'));      //支付的积分
-                        $balance = Db::name('user')->where(['id' => session('user.id')])->value('balance');
-                        if ($balance < $pay_num) {
+//                        $pay_cash = (int)($request->param('pay_cash'));    //支付的金额
+//                        $pay_num = (int)($request->param('pay_num'));      //支付的积分
+//                        $balance = Db::name('user')->where(['id' => session('user.id')])->value('balance');
+                        if (1 > 2) {
                             $this->success('您的积分不足', '', false);
                         } else {
                             //先减余额
-                            $balance -= $pay_num;
-                            Db::name('user')->update(['id' => session('user.id'), 'balance' => $balance]);
+                            //$balance -= $pay_num;
+                            //Db::name('user')->update(['id' => session('user.id'), 'balance' => $balance]);
                             Db::commit();
                             //session('goods.id', null);
                             Db::name('zj_cart')->where(['id' => ['in', session('cart.id')]])->delete();
--
libgit2 0.24.0