确认收货

@@ -178,7 +178,6 @@ class ZjCartController extends HomeBaseController
             } else {
                 $attach = '';
             }
-            print_r($attach);
             return $this->fetch('order_confirm', [
                 'data' => $data,
                 'address' => $address,

@@ -54,7 +54,7 @@ class PayController extends HomeBaseController
                 'remark' => $request->param('remark'),
                 'create_time' => time(),
                 'whole' => $whole,
-                'whole_num' => 0,
+                'whole_num' => $whole_num,
                 'pay_type' => $request->param('pay_type'),
                 'step' => 1
             ];
@@ -155,11 +155,15 @@ class PayController extends HomeBaseController
         $request = request();
         if ($request->isAjax()) {
             $oid = $request->param('oid');
+            $total_fee = Db::name('zj_order')->where(['id' => $oid])->value('whole');
+            if (Db::name('zj_order')->where(['id' => $oid])->value('pay_type') == 2) {
+                $total_fee -= Db::name('zj_order')->where(['id' => $oid])->value('whole_num');
+            }
             $info = [
                 'attach' => $oid,
                 'openid' => session('user.openid'),
                 'body' => '微信支付-天生红商城',
-                'total_fee' => Db::name('zj_order')->where(['id' => $oid])->value('whole')
+                'total_fee' => $total_fee
             ];
             $this->wxPay($info);
         }