Browse Source

完善功能

gorden 8 months ago
parent
commit
23daaee09e

+ 1 - 0
app/admin/controller/order/WholeController.php

@@ -981,6 +981,7 @@ class WholeController extends Curd
             Order::where('order_id', $return->join_return_order_id)->update(['order_is_complete' => 'R']);
             // return 表
             $return->order_return_status = 'DONE';
+            $return->order_return_recharge_json = json_encode(['amount'=>$amount]);
             $return->save();
             $res = '[]';
             $data = '[]';

+ 2 - 2
app/admin/service/order/AppointmentService.php

@@ -283,7 +283,7 @@ class AppointmentService
                     'pay_amount' => $sheet['order_sheet_pay'],
                     'pay_remark' => '预约单',
                     'pay_addtimes' => time(),
-                    'pay_prepayid' => 0,
+                    'pay_prepayid' => $params['join_appointment_member_id'].'-'.$params['settlement_mode'],
                     'pay_paytimes' => date('Y-m-d H:i:s'),
                     'join_pay_object_json'=>json_encode(['appointment_id' => $appointmentId]),
                     'pay_category'=>"APPOINTMENT"
@@ -454,7 +454,7 @@ class AppointmentService
                     'pay_amount' => $sheet['order_sheet_pay'],
                     'pay_remark' => '预约单',
                     'pay_addtimes' => time(),
-                    'pay_prepayid' => 0,
+                    'pay_prepayid' => $params['join_appointment_member_id'].'-'.$params['settlement_mode'],
                     'pay_paytimes' => date('Y-m-d H:i:s')
                 ];
                 // 现金余额结算