commit

app/api/controller/auction/AuctionController.php

@@ -205,17 +205,26 @@ class AuctionController
                 // 微信收款方式
                 if (!$data['payment'])  return app('json')->fail('账号不能为空');
                 if (!$data['image'])  return app('json')->fail('二维码不能为空');
+                $pay['payment'] = $data['payment'];
+                $pay['image'] = $data['image'];
             }elseif ($data['type'] == 2){
                 // 支付宝收款方式
                 if (!$data['payment'])  return app('json')->fail('支付宝账号不能为空');
                 if (!$data['name'])  return app('json')->fail('姓名不能为空');
                 if (!$data['phone'])  return app('json')->fail('请填写手机号');
+                $pay['payment'] = $data['payment'];
+                $pay['name'] = $data['name'];
+                $pay['phone'] = $data['phone'];
             }elseif ($data['type'] == 3){
                 // 银行卡收款方式
                 if (!$data['payment'])  return app('json')->fail('银行卡号不能为空');
                 if (!$data['name'])  return app('json')->fail('姓名不能为空');
                 if (!$data['bank'])  return app('json')->fail('开户行');
                 if (!$data['phone'])  return app('json')->fail('请填写手机号');
+                $pay['payment'] = $data['payment'];
+                $pay['name'] = $data['name'];
+                $pay['bank'] = $data['bank'];
+                $pay['phone'] = $data['phone'];
 
             }
             $res = $pay->save();

app/models/user/UserBill.php

@@ -153,13 +153,13 @@ class UserBill extends BaseModel
     }
 
     /*
-     * 获取用户账单明细
-     * @param int $uid 用户uid
-     * @param int $page 页码
-     * @param int $limit 展示多少条
-     * @param int $type 展示类型
-     * @return array
-     * */
+      * 获取用户账单明细
+      * @param int $uid 用户uid
+      * @param int $page 页码
+      * @param int $limit 展示多少条
+      * @param int $type 展示类型
+      * @return array
+      * */
     public static function getUserBillList($uid, $page, $limit, $type)
     {
         if (!$limit) $limit = 0; $page = 0;
@@ -167,19 +167,19 @@ class UserBill extends BaseModel
             ->field('FROM_UNIXTIME(add_time,"%Y-%m") as time,group_concat(id SEPARATOR ",") ids')->group('time');
         switch ((int)$type) {
             case 0:
-                $model = $model->where('type', 'in', 'recharge,brokerage,pay_product,system_add,pay_product_refund,system_sub,sub_money,add_money');
+                $where = $model->where('type', 'in', 'recharge,brokerage,pay_product,system_add,pay_product_refund,system_sub,sub_money,add_money');
                 break;
             case 1:
-                $model = $model->where('type', 'in','pay_product,sub_money,sub_now_money');
+                $where = $model->where('pm', 0);
                 break;
             case 2:
-                $model = $model->where('type', 'in', 'recharge,system_add,add_money,add_now_money');
+                $where = $model->where('pm', 1);
                 break;
             case 3:
-                $model = $model->where('type', 'brokerage')->whereOr('type', 'recharge');
+                $where = $model->where('type', 'brokerage')->whereOr('type', 'recharge');
                 break;
             case 4:
-                $model = $model->where('type', 'extract')->whereOr('type', 'recharge');
+                $where = $model->where('type', 'extract')->whereOr('type', 'recharge');
                 break;
         }
         if ($page) $model = $model->page((int)$page, (int)$limit);
@@ -187,7 +187,7 @@ class UserBill extends BaseModel
         $data = [];
         foreach ($list as $item) {
             $value['time'] = $item['time'];
-            $value['list'] = self::where('id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm')->order('add_time DESC')->select();
+            $value['list'] = self::where($where)->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm,id')->order('add_time DESC')->select();
             array_push($data, $value);
         }
         return $data;