wugg 8 hónapja
szülő
commit
0a9410e4d0

+ 1 - 1
app/txx/controller/Act.php

@@ -234,7 +234,7 @@ class Act extends Base
         $param = $this->request->only(['actCode'=>'','status'=>0],'post','trim');
         $validate = Validate::rule([
             'actCode|活动编号' => 'require',
-            'status|状态' => 'require|in:0,1,2,3,4,5',
+            'status|状态' => 'require|in:0,1,2,3,4,5,6',
             ]);
         if($validate->check($param)==false)$this->error($validate->getError());
         $info = $this->model->where(['actCode'=>$param['actCode'],'is_del'=>0])->findOrEmpty();

+ 24 - 1
app/txx/controller/Activity.php

@@ -7,7 +7,7 @@ namespace app\txx\controller;
 use app\admin\model\GoodSpec;
 use app\txx\model\ActGood;
 use app\txx\model\PlatformYouzan;
-use think\App;
+use app\txx\model\YzActivityPromoCode;use think\App;
 use think\facade\Validate;
 class Activity extends Base{
     private $platform_id=[37,79];
@@ -192,4 +192,27 @@ class Activity extends Base{
         }
         $this->success("删除成功");
     }
+
+    public function promocodeList(){
+        $param=$this->request->param(["title"=>"","status"=>"","start"=>"","end"=>"","page"=>1,"size"=>15],"post","trim");
+        $where=[["is_del","=",0]];
+        if($param['title']!==""){
+            $where[]=["title","like","%".$param['title']."%"];
+        }
+        if($param['status']!==""){
+            $where[]=["status","=",$param['status']];
+        }
+        if($param['start']!==""){
+            $where[]=["createTime",">=",startTime($param['start'])];
+        }
+        if($param['end']!==""){
+            $where[]=["createTime","<=",endTime($param['end'])];
+        }
+
+         $list= YzActivityPromoCode::with(["Good"])
+         ->where($where)
+         ->order("id desc")
+         ->paginate(["list_rows"=>$param['size'],"page"=>$param['page']]);
+         $this->success("获取成功",["list"=>$list->items(),"count"=>$list->total()]);
+        }
 }

+ 1 - 1
app/txx/middleware.php

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

+ 24 - 0
app/txx/model/YzActivityPromoCode.php

@@ -0,0 +1,24 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\txx\model;
+
+use think\Model;
+
+/**
+ * @mixin \think\Model
+ */
+class YzActivityPromoCode extends Model
+{
+    protected $connection = 'mysql_yz';//切换连接参数
+    protected $table = 'yz_activity_promocode';
+    protected $pk = 'id';
+    protected $autoWriteTimestamp = false;
+    protected $createTime="createTime";
+    protected $updateTime="updateTime";
+
+    public function Good()
+    {
+        return $this->belongsTo(ActGood::class,'act_good_id','id')->bind(["good_name","actCode"]);
+    }
+}

+ 6 - 0
app/youzan/model/YzActivityPromoCode.php

@@ -3,6 +3,7 @@ declare (strict_types = 1);
 
 namespace app\youzan\model;
 
+use app\txx\model\ActGood;
 use think\Model;
 
 /**
@@ -16,4 +17,9 @@ class YzActivityPromoCode extends Model
     protected $autoWriteTimestamp = false;
     protected $createTime="createTime";
     protected $updateTime="updateTime";
+
+    public function ActGood()
+    {
+        return $this->belongsTo("app\\txx\model\ActGood",'act_good_id','id');
+    }
 }