加线下支付

app/admin/controller/coupon/CouponController.php

@@ -157,6 +157,7 @@ class CouponController extends Curd
     {
         $coupons = Coupon::where('coupon_status', 'ACTIVED')
             ->select('coupon_id', 'coupon_name')
+            ->orderBy('coupon_addtimes','DESC')
             ->get()
             ->toArray();
 

app/admin/controller/order/WholeController.php

@@ -245,7 +245,7 @@ class WholeController extends Curd
             } else {
                 $item['payWay'] = null;
             }
-            if (isset($item['payWay']) && $item['order_status_payment'] == 'SUCCESS') {
+            if (!empty($item['payWay']) && $item['order_status_payment'] == 'SUCCESS') {
                 $payWay = explode('-', $item['payWay']);
                 if (!empty($payWay[1]) && $payWay[1] == 'CASH') {
                     $item['payWay'] = '账户余额';
@@ -1787,6 +1787,9 @@ class WholeController extends Curd
             }
 
             if ($params['settlement_now'] == 'Y' && ($params['pay_category'] == 'OFFLINE' || $params['pay_category'] == 'MONEY')) {
+                if ($params['pay_category'] == 'OFFLINE' && !empty($params['pay_category_sub'])){
+                    $params['pay_category'] = $params['pay_category_sub'];
+                }
                 $params['order_status_system'] = $systemStatus;
                 $params['order_status_payment'] = 'SUCCESS';
             } else if ($params['settlement_now'] == 'Y' && $params['pay_category'] == 'CASH') {    // 余额支付
@@ -2895,7 +2898,15 @@ class WholeController extends Curd
                 $payPrepayid = $params['pay_category'];
             } else if ($params['pay_category'] == 'OFFLINE') {
                 $payPrepayid = 'OFFLINE';
+<<<<<<< HEAD
             } else if ($params['pay_category'] == 'MONEY') {
+=======
+            } else if ($params['pay_category'] == 'OFFLINE_ALIPAY') {
+                $payPrepayid = 'OFFLINE_ALIPAY';
+            } else if ($params['pay_category'] == 'OFFLINE_WXPAY') {
+                $payPrepayid = 'OFFLINE_WXPAY';
+            }  else if ($params['pay_category'] == 'MONEY') {
+>>>>>>> 2888cee (加线下支付)
                 $payPrepayid = 'MONEY';
             } else {
                 $payPrepayid = $params['join_order_member_id'] . '-' . $params['pay_category'];