Merge branch 'phoenix' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into phoenix

app/Controller/v3/WithdrawController.php

@@ -82,15 +82,16 @@ class WithdrawController extends BaseController
         );
 
         $data['notice'] = [
-            [
-                'title' => '用户须知',
-                'content' => '<p>请仔细填写相关信息，如果由于您填写的信息有误导致资金流失，平台概不负责。</p><p>注意：因微信限制当前用户账户余额满<span style="color:red;">1</span>元后才可提现</p>'
-            ],
+            // [
+            //     'title' => '用户须知',
+            //     'content' => '<p>请仔细填写相关信息，如果由于您填写的信息有误导致资金流失，平台概不负责。</p><p>注意：因微信限制当前用户账户余额满<span style="color:red;">1</span>元后才可提现</p>'
+            // ],
             [
                 'title' => '提现须知',
-                'content' => '<p>一次提现金额最低为<span style="color:red;">1</span>元</p>'
-                    .'<p>一次提现金额最高为<span style="color:red;">5000</span>元</p>'
-                    .'<p>每天可提现<span style="color:red;">10</span>次</p>'
+                'content' => '<p>1、提金额最低为<span style="color:red;">1</span>元，最高为<span style="color:red;">5000</span>元，一天最多可提现<span style="color:red;">10</span>次。</p>'
+                    .'<p>2、提现到账时间为一个工作日内。</p>'
+                    .'<p>3、提现成功后，提现款会自动转入您当前登录的微信账号</p>'
+                    .'<p>4、如果您在提现方面遇到问题，请致电联系我们的服务站。</p>'
             ],
         ];
 

app/Model/v3/GoodsCategory.php

@@ -3,8 +3,10 @@
 namespace App\Model\v3;
 
 use App\Model\Model;
+use Hyperf\Database\Model\SoftDeletes;
 
 class GoodsCategory extends Model
 {
+    use SoftDeletes;
     protected $table = 'lanzu_goods_category';
 }

app/Model/v3/Market.php

@@ -3,6 +3,7 @@
 namespace App\Model\v3;
 
 use App\Model\Model;
+use Hyperf\Database\Model\Builder;
 
 class Market extends Model
 {
@@ -14,6 +15,14 @@ class Market extends Model
         'region_name'
     ];
 
+    protected function boot(): void
+    {
+        parent::boot();
+        self::addGlobalScope('normal', function (Builder $builder) {
+            $builder->where([$this->getTable().'.status' => 1]);
+        });
+    }
+
     public function getProvinceNameAttribute()
     {
         $area = Area::query()->find($this->attributes['province_id']);

app/Service/v3/Implementations/OrderOnlineService.php

@@ -679,6 +679,7 @@ class OrderOnlineService implements OrderOnlineServiceInterface
             $orderMains = OrderMain::query()
                 ->where(['state' => OrderState::UNPAID])
                 ->where('created_at', '<', time()-900)
+                ->limit(100)
                 ->get();
 
             foreach ($orderMains as $key => &$orderMain) {

app/Service/v3/Implementations/SearchService.php

@@ -56,7 +56,10 @@ class SearchService implements SearchServiceInterface
 
         if (isset($params['goods_category_ids']) && $params['goods_category_ids']) {
             $typeIds = explode(',', $params['goods_category_ids']);
-            $builder->whereIn(''.$goodsTable.'.goods_category_id', $typeIds);
+            $builder->where(function ($query) use ($goodsTable, $typeIds) {
+                $query->whereIn(''.$goodsTable.'.goods_category_id', $typeIds)
+                    ->orWhere(''.$goodsTable.'.goods_category_id', 0);
+            });
         }
 
         if (isset($params['keyword']) && $params['keyword']) {