ad

app/txx/controller/Act.php

@@ -3,7 +3,7 @@ declare (strict_types = 1);
 
 namespace app\txx\controller;
 
-use think\facade\Validate;
+use app\txx\model\ActGood;use think\facade\Validate;
 use app\txx\model\Act as Actm;
 use think\App;
 
@@ -12,6 +12,7 @@ class Act extends Base
 	protected $uid=0;
 	protected $uname='';
 	protected $model;
+	protected static $ActStatusCn=["无状态",'活动未开始','活动进行中',"活动已结束"];
     public function __construct(App $app) {
 		parent::__construct($app);
 		if($this->request->isCx==1){
@@ -40,7 +41,7 @@ class Act extends Base
         "status"=>'',
         'act_status'=>'',
       	],"post",'trim');
-      $condition=[["is_del","=",0]];
+      $condition=[["is_del","=",0],["version","=","2.0"]];
       if($param['act_name']!='') $condition[]=["act_name","like","%{$param['act_name']}%"];
       if($param['actCode']!='') $condition[]=["actCode","like","%{$param['actCode']}%"];
       if($param['company_name']!='') $condition[]=["company_name","like","%{$param['company_name']}%"];
@@ -64,6 +65,7 @@ class Act extends Base
       ->paginate(["list_rows"=>$param['size'],"page"=>$param['page']])
       ->each(function(&$item){
         $item['act_status']=time()< strtotime($item['startTime'])?1:(time()> strtotime($item['endTime'])?3:2);
+        $item['act_status_cn'] = self::$ActStatusCn[$item['act_status']];
       });
       $this->success("获取成功",["list"=>$list->items(),"count"=>$list->total()]);
     }
@@ -105,6 +107,7 @@ class Act extends Base
         	"endTime"=>$param['end']==''?null : $param['end'],
         	"web_url"=>$param['web_url']??"",
         	"status"=>0,
+        	"version"=>"2.0",
         	"apply_id"=>$this->uid,
         	"apply_name"=>$this->uname,
         	"addtime"=>date("Y-m-d H:i:s"),
@@ -176,6 +179,15 @@ class Act extends Base
       if($validate->check($param)==false)$this->error($validate->getError());
       
       $info = $this->model->with(["goodInfo"])->where(["actCode"=>$param['actCode'],"is_del"=>0])->findOrEmpty();
+      if($info->isEmpty()) $this->error("活动不存在");
+      $info['act_status']=time()< strtotime($info['startTime'])?1:(time()> strtotime($info['endTime'])?3:2);
+      $info['goodInfo']->each(function(&$item){
+          $item['status_cn']=ActGood::$statusCn[$item['status']]??'';
+      });
+      $info['statusCn'] = \app\txx\model\Act::$statusCn[$info['status']]??'';
+      $info['act_status_cn']=self::$ActStatusCn[$info['act_status']];
+      $info['goodInfo']->visible(['id','actCode','yz_good_code','stock_num','status','addtime','updatetime',
+        'final_price','good_name','unit_name','cat_name','brand_name','fetch_url','roundId','status_cn']);;
       $this->success("获取成功",$info);
     }
 

app/txx/controller/Activity.php

@@ -101,7 +101,7 @@ class Activity extends Base{
 
     public function list(){
         $param=$this->request->param(["actCode"=>"","status"=>"","skuCode"=>"","roundId"=>"","page"=>1,"size"=>15],"post","trim");
-        $where=[["is_del","=",0]];
+        $where=[["is_del","=",0],['version',"=","2.0"]];
         if($param['actCode']!==""){
             $where[]=["actCode","like","%".$param['actCode']."%"];
         }

app/txx/middleware.php

@@ -2,7 +2,7 @@
 // 全局中间件定义文件
 return [
     // 全局请求缓存
-//    app\txx\middleware\CheckAuth::class
+    app\txx\middleware\CheckAuth::class
     // 多语言加载
     // \think\middleware\LoadLangPack::class,
     // Session初始化

app/txx/model/Act.php

@@ -15,6 +15,8 @@ class Act extends Model
      public static $statusCn=['待选择商品','待同步创建优惠券码','待同步优惠券码','待确认上传至活动主办方','已确认上传至活动主办方','券码创建失败','券码同步失败'];
 
     public function goodInfo(){
-        return $this->hasMany(ActGood::class,'actCode','actCode')->where(['is_del'=>0])->with(['platformYz'=>["good","platform"]]);
+        return $this->hasMany(ActGood::class,'actCode','actCode')
+        ->where(['is_del'=>0])
+        ->with(['platformYz'=>["good"=>['unit','brand','category'],"platform"]]);
     }
 }