Wesmiler

app/Services/Api/AccountService.php

@@ -105,7 +105,7 @@ class AccountService extends BaseService
         $list = PayOrdersModel::from('pay_orders as a')
             ->where(function($query){
                 $query->where('a.status','>',1)->orWhere(function($query){
-                    $query->where('a.status',1)->orWhere('a.create_time','>=', time() - 600);
+                    $query->where('a.status',1)->orWhere('a.create_time','>=', time() - 300);
                 });
             })
             ->where(['user_id'=> $userId,'mark'=>1])
@@ -116,9 +116,9 @@ class AccountService extends BaseService
         $list = $list? $list->toArray() :[];
         if($list){
             $types = [1=>'话费充值',2=>'电费充值',3=>'燃气充值'];
+            $statusArr = [1=>'未支付',2=>'已支付',3=>'充值中',4=>'充值成功',5=>'充值失败资金原路退回',6=>'充值成功部分其他原路退回'];
             foreach($list['data'] as &$item){
-                $item['create_time'] = $item['create_time']? datetime($item['create_time'],'Y-m-d H:i:s') : '';
-                $item['time_text'] = $item['create_time']? dateFormat($item['create_time'],'Y年m月d日') : '';
+                $item['time_text'] = $item['create_time']? datetime($item['create_time'],'Y/m/d H:i:s') : '';
                 $type = isset($item['type'])? intval($item['type']) : 0;
                 $item['type_text'] = isset($types[$type])? $types[$type] : '充值';
             }

app/Services/PaymentService.php

@@ -630,13 +630,13 @@ class PaymentService extends BaseService
         }
         //部分成功，退部分
         else if($state == 3) {
-            $status = 7;
+            $status = 6;
             $refundAmount = moneyFormat($total - $amount,2);
             $this->error = '充值成功部分退款';
         }
         //失败，退全款
         else if(in_array($state,[-1,2])){
-            $status = 6;
+            $status = 5;
             $refundAmount = $total;
             $this->error = '充值失败退款';
         }