Wesmiler OTC 提交更新 0729

app/Http/Controllers/Api/AdvertController.php

@@ -47,6 +47,7 @@ class AdvertController extends webApp
         $pageSize = request()->post('pageSize', 15);
         $params = request()->all();
         $params['user_id'] = $this->userId;
+        $params['status'] = 1;
         $params['advert_type'] = 2;
         $list = AdvertService::make()->getDataList($params, $pageSize);
         return message(1010, true,  $list);

app/Services/Api/AdvertService.php

@@ -59,7 +59,7 @@ class AdvertService extends BaseService
     public function getDataList($params, $pageSize = 15)
     {
         $where = ['a.mark' => 1];
-        $type = isset($params['type'])? $params['type'] : 1;
+        $type = isset($params['type'])? $params['type'] : 0;
         $status = isset($params['status'])? $params['status'] : 0;
         $advertType = isset($params['advert_type'])? $params['advert_type'] : 0;
         $userId = isset($params['user_id'])? $params['user_id'] : 0;
@@ -70,11 +70,12 @@ class AdvertService extends BaseService
             $where['a.status'] = $status;
         }
         if($advertType>0){
-            $where['a.type'] = $advertType;
+            $where['a.advert_type'] = $advertType;
         }
         if($userId>0){
             $where['a.user_id'] = $userId;
         }
+
         $list = $this->model->from('advert as a')
             ->leftJoin('member as m', 'm.id', '=', 'a.user_id')
             ->where($where)
@@ -98,6 +99,7 @@ class AdvertService extends BaseService
                $item['username_hidden'] = $item['username']? format_account($item['username']):'';
                $item['limit_min'] = moneyFormat($item['limit_min'], 2);
                $item['limit_max'] = moneyFormat($item['limit_max'], 2);
+//               $item['pay_type'] = $item['pay_type']? explode($item['pay_type'], ',') : [];
                $priceType = isset($item['price_type'])? intval($item['price_type']) : 0;
                $item['price'] = $priceType==2? moneyFormat($item['price']+$marketPrice, 2) : $item['price'];
             }
@@ -137,7 +139,7 @@ class AdvertService extends BaseService
             'limit_max'=> isset($params['limit_max'])? floatval($params['limit_max']) : 0.00,
             'price'=> isset($params['price'])? floatval($params['price']) : 0.00,
             'price_type'=> isset($params['price_type'])? intval($params['price_type']) : 1,
-            'pay_type'=> isset($params['pay_type'])? intval($params['pay_type']) : 1,
+            'pay_type'=> isset($params['pay_type'])&&$params['pay_type']? implode($params['pay_type'],',') : 1,
             'expired_at'=> isset($params['expired_at']) && $params['expired_at']? $params['expired_at'] : date('Y-m-d H:i:s'),
         ];
 

app/Services/Api/MemberPaymentService.php

@@ -75,7 +75,7 @@ class MemberPaymentService extends BaseService
                 $item['status'] = $item['status'] ==1? true : false;
                 $item['bank_card_text'] = $item['bank_card'] ? format_bank_card($item['bank_card']) : '';
                 if ($item['type'] == 1) {
-                    $item['show_text'] = $item['bank_name'] . ' ' . $item['realname_text'] . ' ' . $item['bank_card_text'];
+                    $item['show_text'] = $item['bank_name'] . ' ' . $item['realname_text'] . ' ' . format_account($item['bank_card']);
                 } else {
                     $item['show_text'] = $item['realname_text'] . ' ' . $item['account_text'];
                 }