|
@@ -625,9 +625,9 @@ class OrderController extends Controller
|
625
|
625
|
|
626
|
626
|
//充值卡验证余额
|
627
|
627
|
if($order['payment_type'] == 4){
|
628
|
|
- $deposit_phone = $request->input('deposit_phone');
|
|
628
|
+ $deposit_phone = $order['receiverMobile'];//$request->input('deposit_phone'); //暂且只能使用自己充值卡
|
629
|
629
|
$customerInfo = CustomerInfo::where('phone', $deposit_phone)->first();
|
630
|
|
- $balance = $customerInfo->balance;
|
|
630
|
+ $balance = isset($customerInfo->balance) ? $customerInfo->balance : 0;
|
631
|
631
|
if($balance < $order['receivedAmount']){
|
632
|
632
|
//余额不足
|
633
|
633
|
return redirect('/admin/order/index')->with('info', '充值卡余额不足');
|
|
@@ -756,6 +756,8 @@ class OrderController extends Controller
|
756
|
756
|
$adminList = json_decode(json_encode($adminList), true);
|
757
|
757
|
$order = Order::findOrFail($id);
|
758
|
758
|
$order = json_decode(json_encode($order), true);
|
|
759
|
+ // 临时处理,只能用自己充值卡
|
|
760
|
+ $order['deposit_phone'] = $order['receiverMobile'];
|
759
|
761
|
$order['receiverMobile'] = substr($order['receiverMobile'], 0, 3).'****'.substr($order['receiverMobile'], 7);
|
760
|
762
|
$order['goods'] = '';
|
761
|
763
|
$order_skus = DB::table('order_goods_skus')->where('is_del', 0)->where('order_id', $id)->lists('num','sku_id');
|