diff --git a/app/Controller/v3/WithdrawController.php b/app/Controller/v3/WithdrawController.php index fb5b2b9..3e30968 100644 --- a/app/Controller/v3/WithdrawController.php +++ b/app/Controller/v3/WithdrawController.php @@ -82,15 +82,16 @@ class WithdrawController extends BaseController ); $data['notice'] = [ - [ - 'title' => '用户须知', - 'content' => '
请仔细填写相关信息,如果由于您填写的信息有误导致资金流失,平台概不负责。
注意:因微信限制当前用户账户余额满1元后才可提现
' - ], + // [ + // 'title' => '用户须知', + // 'content' => '请仔细填写相关信息,如果由于您填写的信息有误导致资金流失,平台概不负责。
注意:因微信限制当前用户账户余额满1元后才可提现
' + // ], [ 'title' => '提现须知', - 'content' => '一次提现金额最低为1元
' - .'一次提现金额最高为5000元
' - .'每天可提现10次
' + 'content' => '1、提金额最低为1元,最高为5000元,一天最多可提现10次。
' + .'2、提现到账时间为一个工作日内。
' + .'3、提现成功后,提现款会自动转入您当前登录的微信账号
' + .'4、如果您在提现方面遇到问题,请致电联系我们的服务站。
' ], ]; diff --git a/app/Model/v3/GoodsCategory.php b/app/Model/v3/GoodsCategory.php index e60c54a..462ebbd 100644 --- a/app/Model/v3/GoodsCategory.php +++ b/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'; } \ No newline at end of file diff --git a/app/Model/v3/Market.php b/app/Model/v3/Market.php index c151487..a78e15c 100644 --- a/app/Model/v3/Market.php +++ b/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']); diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php index 862cec6..3900cd8 100644 --- a/app/Service/v3/Implementations/OrderOnlineService.php +++ b/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) { diff --git a/app/Service/v3/Implementations/SearchService.php b/app/Service/v3/Implementations/SearchService.php index d726e4e..f605109 100644 --- a/app/Service/v3/Implementations/SearchService.php +++ b/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']) {