change

app/Http/Controllers/QuickApp/WelcomeController.php

@@ -115,11 +115,11 @@ class WelcomeController extends BaseController
 
         // 获取派单信息
         $adPositions = [];
-        if ($sendOrderId) {
-            $sendOrder      = QappSendOrder::getSendOrderById($sendOrderId);
-            $channelAccount = QappChannelAccount::getByAccount(getProp($sendOrder, 'account'));
-            $adPositions    = AdPositionService::getInstance()->getAdPositions($this->uid, getProp($channelAccount, 'id'));
-        }
+//        if ($sendOrderId) {
+//            $sendOrder      = QappSendOrder::getSendOrderById($sendOrderId);
+//            $channelAccount = QappChannelAccount::getByAccount(getProp($sendOrder, 'account'));
+//            $adPositions    = AdPositionService::getInstance()->getAdPositions($this->uid, getProp($channelAccount, 'id'));
+//        }
 
         // 配置
         $data = [

app/Modules/AdPosition/Models/AdPosition.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model;
 class AdPosition extends Model
 {
     protected $table = 'qapp_ad_position';
-    protected $fillable = ['name', 'ident', 'max_num', 'content_type', 'property', 'show_type', 'status'];
+    protected $fillable = ['name', 'ident', 'max_num', 'content_type', 'property', 'show_type', 'status', 'default_img'];
 
     /**
      * 获取所有有效的广告位

app/Modules/AdPosition/Services/AdPositionService.php

@@ -62,7 +62,7 @@ class AdPositionService
             }
 
             // 添加到数据中
-            $result[$ident][] = $this->buildPositionData($validDispatch);
+            $result[$ident][] = $this->buildPositionData($validDispatch, $position);
         }
 
         return $result;
@@ -83,9 +83,12 @@ class AdPositionService
         }
 
         // 判断注册时间
-        $registerFilter = false;
+        $registerFilter = true;
         $registerAtArr  = getProp($filterContent, 'registerAt');
         if ($registerAtArr) {
+            // 默认值
+            $registerFilter = false;
+
             // 获取用户信息
             $user         = QappUser::getUserByUid($uid);
             $registerAt   = getProp($user, 'created_at');
@@ -107,8 +110,11 @@ class AdPositionService
         }
 
         // 判断付费情况
-        $paidFilter = false;
+        $paidFilter = true;
         if (isset($filterContent['isPaid'])) {
+            // 默认值
+            $paidFilter = false;
+
             // 获取用户付费情况
             $order = OrderService::getUserLastestOrder($uid);
 
@@ -123,34 +129,37 @@ class AdPositionService
             }
         }
 
-        // 两者如有一个不满足条件则不展示
-        if (!$registerFilter || !$paidFilter) {
-            return false;
-        }
-
-        return true;
+        // 两者全部满足条件才可展示
+        return $registerFilter && $paidFilter;
     }
 
     /**
      * 返回可显示数据
-     * @param $param
+     * @param $validDispatch
+     * @param $position
      * @return array
      */
-    private function buildPositionData($param): array
+    private function buildPositionData($validDispatch, $position): array
     {
-        if (empty($param)) {
+        if (empty($validDispatch)) {
             return [];
         }
 
         // 链接做特殊处理
-        $url    = getProp($param, 'link_url');
+        $url    = getProp($validDispatch, 'link_url');
         $urlArr = parse_url($url);
         parse_str(getProp($urlArr, 'query'), $queryArr);
 
+        // 广告位图片
+        $image = getProp($validDispatch, 'image_url');
+        if (empty($image)) {
+            $image = getProp($position, 'default_img');
+        }
+
         return [
-            'img'    => getProp($param, 'image_url'),
+            'img'    => $image,
             'url'    => getProp($urlArr, 'path'),
-            'title'  => getProp($param, 'title'),
+            'title'  => getProp($validDispatch, 'title'),
             'params' => $queryArr ?: (object)[]
         ];
     }

config/audit.php

@@ -2,6 +2,6 @@
 return [
     'com.app.kyy.xjxs' => [
         'brand'       => 'huawei',
-        'codeVersion' => '0.0.1'
+        'codeVersion' => '0.0.2'
     ],
 ];