From 766829c40666d21d2b7db9263a8987f10300ede4 Mon Sep 17 00:00:00 2001
From: wangxinglong <2371974647@qq.com>
Date: Wed, 22 Dec 2021 15:45:48 +0800
Subject: [PATCH] settter

---
 app/controller/manager/Coupon.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/controller/manager/Coupon.php b/app/controller/manager/Coupon.php
index 8ee8781..ca5f3ef 100644
--- a/app/controller/manager/Coupon.php
+++ b/app/controller/manager/Coupon.php
@@ -5,8 +5,8 @@ namespace app\controller\manager;
 use app\exception\RepositoryException;
 
 use app\model\CouponMain;
-use app\model\Member;
 use app\model\Business as BusinessModel;
+use app\model\Member as MemberModel;
 use app\repository\BusinessRepository;
 use app\repository\CouponRepository;
 use app\validate\CouponRelease;
@@ -71,31 +71,32 @@ class Coupon extends Base
                     return $q::hasWhere('business', function ($q) use ($keyword) {
                         $q->where('business_name', 'like', "%" . $keyword . "%")
                             //如果是渠道商或者工作人员  只查看自己的下级商家
-                            ->when(Member::is_agency($this->auth['roles']), function ($q) {
+                            ->when(MemberModel::is_agency($this->auth['roles']), function ($q) {
                                 $q->where('agency_code', '=', $this->auth['business_code']);
                             })
-                            ->field("code,business_name,business_subtitle,type");
+                            ->field("code,business_name,business_subtitle,type,agency_code");
                         //->with('category');
                     });
                 }
 
-                if (Member::is_agency($this->auth['roles'])) {
+                if (MemberModel::is_agency($this->auth['roles'])) {
 
                     return $q::hasWhere('business', function ($q) {
                         $q//如果是渠道商或者工作人员  只查看自己的下级商家
                         ->where('agency_code', '=', $this->auth['business_code'])
-                            ->field("code,business_name,business_subtitle,type");
+                            ->field("code,business_name,business_subtitle,type,agency_code");
                         //->with('category');
                     });
                 } else {
                     return $q->with(["business" => function ($query) {
-                        $query->field("code,business_name,business_subtitle,type");
+                        $query->field("code,business_name,business_subtitle,type,agency_code");
                         //->with('category');
                     }]);
                 }
 
             }, $orders);
             $time = time();
+
             $list['list']->each(function ($item) use ($time) {
                 if (strtotime($item->start_time) > $time) {
                     $item->state_text = '<span >未开始</span>';
@@ -105,8 +106,10 @@ class Coupon extends Base
                     $item->state_text = '<span  class="f_red">已过期</span>';
                 }
                 //渠道商名称
+
                 if(isset($item->business) && $item->business && !empty($item->business->agency_code)){
-                    $item->agency_text = BusinessModel::where("code",$time->item->business->agency_code)->value("business_name",'');
+                    $item->agency_text = MemberModel::whereRaw("FIND_IN_SET('".MemberModel::ANENT_ROLE_ID."',roles)"  )
+                        ->where("business_code",$item->business->agency_code)->value("nickname","");
                 }else{
                     $item->agency_text = '';
                 }