Merge branch 'master' of http://gitlab.bluearp.com/ldj/yhwx

app/Services/Business/WashOrderService.php

@@ -8010,12 +8010,13 @@ class WashOrderService extends Service
                 ->where('mem_id', $find_order_data->ord_client_id)
                 ->select('mem_arrears')
                 ->first();
+            if(!empty($find_mem)) {
                 $new_ord_banlance = 0;
                 if ($request['ord_payment_way'] == 6 || $request['ord_payment_way'] == 7) {
                     $new_ord_banlance = $ord_edit_data['ord_banlance'];
                 }
                 if ($find_order_data->ord_type == 1) {
-                $update_data_mem['mem_arrears'] = ($find_mem->mem_arrears - $find_order_data->ord_order_price) + $all_price - $request['ord_actual_amout']*100 - $new_ord_banlance;
+                    $update_data_mem['mem_arrears'] = ($find_mem->mem_arrears - $find_order_data->ord_order_price) + $all_price - $request['ord_actual_amout'] * 100 - $new_ord_banlance;
                     if ($request['ord_payment_way'] == 5) {
                         $update_data_mem['mem_arrears'] = $find_mem->mem_arrears - $find_order_data->ord_order_price;
                     }
@@ -8023,20 +8024,23 @@ class WashOrderService extends Service
                     $update_data_mem['mem_update_time'] = date('Y-m-d H:i:s');
                     $update_data_mem_res = DB::table('member')->where('mem_id', $find_order_data->ord_client_id)->update($update_data_mem);
                 }
+            }
         } elseif ($find_order_data->ord_type == 2) {//企业会员欠款
             $find_mem = DB::table('business_account')
                 ->leftJoin('business_client', 'bucl_id', '=', 'buac_bucl_id')
                 ->where('buac_id', $find_order_data->ord_client_id)
                 ->select('buac_arrears', 'buac_bucl_id', 'bucl_arrears')
                 ->first();
-            $update_data_mem['buac_arrears'] = $find_mem->buac_arrears - $request['ord_actual_amout']*100;
+            if(!empty($find_mem)) {
+                $update_data_mem['buac_arrears'] = $find_mem->buac_arrears - $request['ord_actual_amout'] * 100;
                 $update_data_mem['buac_update_time'] = date('Y-m-d H:i:s');
                 $update_data_mem_res = DB::table('business_account')->where('buac_id', $find_order_data->ord_client_id)->update($update_data_mem);
 
-            $update_bucl['bucl_arrears'] = $find_mem->bucl_arrears - $request['ord_actual_amout']*100;
+                $update_bucl['bucl_arrears'] = $find_mem->bucl_arrears - $request['ord_actual_amout'] * 100;
                 $update_bucl['bucl_update_time'] = date('Y-m-d H:i:s');
                 $update_bucl_res = DB::table('business_client')->where('bucl_id', $find_mem->buac_bucl_id)->update($update_bucl);
             }
+        }
         // if ($ord_edit_data['ord_actual_price'] > $ord_edit_data['ord_order_price']) {
         //     return ['code'=>500, 'msg'=>'超出结算金额', 'data'=>'超出结算金额'];
         // }