完善功能

app/admin/controller/member/BenefitController.php

@@ -216,7 +216,7 @@ class BenefitController extends Curd
             $writeOffData = OrderService::generateWriteOffData($params);
 
             $appointments = Appointment::where('join_appointment_member_benefit_id', $paramsData['benefit_id'])
-                ->where('appointment_status', 'INIT')
+                ->whereIn('appointment_status', ['INIT','WAITING','PENDING','DOING'])
                 ->limit($paramsData['nbr'])
                 ->get();
             foreach ($appointments as $appointment) {

app/admin/controller/order/PayDetailController.php

@@ -34,13 +34,18 @@ class PayDetailController extends Curd
             $where['pay_status'] = 'SUCCESS';
             $where['pay_category'] = ['<>', 'RECHARGE'];
         }
+        // else if ($where['pay_category'] == 'RECHARGE') {
+        //     $where['pay_status'] = 'SUCCESS';
+        //     $where['pay_category'] = 'RECHARGE';
+        //     $where['pay_prepayid'] = ['in','WXPAY,ALIPAY'];
+        // }
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }
 
     protected function doSelect(array $where, string $field = null, string $order = 'desc')
     {
-        $model = $this->model->with(['member', 'cert']);
+        $model = $this->model->with(['member', 'cert','memberAccount']);
         foreach ($where as $column => $value) {
             if (is_array($value)) {
                 if ($value[0] === 'like' || $value[0] === 'not like') {
@@ -76,6 +81,18 @@ class PayDetailController extends Curd
         return $model;
     }
 
+    public function afterQuery($items) 
+    {
+        foreach($items as $item){
+            $prepayId = explode('-',$item['pay_prepayid']);
+            if (count($prepayId) > 1){
+                $item['pay_prepayid'] = $prepayId[1];
+            }
+        }
+
+        return $items;
+    }
+
     /**
      * @Desc 产品订单
      * @Author Gorden
@@ -124,6 +141,8 @@ class PayDetailController extends Curd
         Db::beginTransaction();
         try {
             $data = $this->insertRechargeInput($request);
+            $data['pay_prepayid'] = $data['join_pay_member_id'].'-CASH';
+
             $payDetailId = $this->doInsert($data);
             (new RechargeController)->disposePaySuccess($payDetailId);
 
@@ -157,7 +176,7 @@ class PayDetailController extends Curd
         Db::beginTransaction();
         try {
             $data = $this->insertRechargeInput($request,'WELFARE');
-            $data['pay_prepayid'] = 'WELFARE';
+            $data['pay_prepayid'] = $data['join_pay_member_id'].'-WELFARE';
             
             $this->doInsert($data);
 

app/model/PayDetail.php

@@ -33,4 +33,10 @@ class PayDetail extends Model
         return $this->hasOne(MemberCert::class, 'join_cert_member_id', 'join_pay_member_id')
             ->select('join_cert_member_id', 'member_cert_name');
     }
+
+    public function memberAccount()
+    {
+        return $this->hasMany(MemberAccount::class, 'join_account_member_id', 'join_pay_member_id')
+            ->select('join_account_member_id','member_account_surplus','member_account_added');
+    }
 }