wugg 8 months ago
parent
commit
46953a66a2
3 changed files with 11 additions and 3 deletions
  1. 6 0
      app/txx/controller/Activity.php
  2. 1 1
      app/txx/middleware.php
  3. 4 2
      app/txx/model/YzActivityPromoCode.php

+ 6 - 0
app/txx/controller/Activity.php

@@ -213,6 +213,12 @@ class Activity extends Base{
          ->where($where)
          ->order("id desc")
          ->paginate(["list_rows"=>$param['size'],"page"=>$param['page']]);
+        $list->each(function(&$item){
+            $item['status_cn']=YzActivityPromoCode::$statusCn[$item['status']]??"";
+            $item['codeType_cn']=YzActivityPromoCode::$codeTypeCn[$item['code_type']]??"";
+            $item["rangeType_cn"]=YzActivityPromoCode::$rangeTypeCn[$item['range_type']]??"";
+
+        });
          $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初始化

+ 4 - 2
app/txx/model/YzActivityPromoCode.php

@@ -16,9 +16,11 @@ class YzActivityPromoCode extends Model
     protected $autoWriteTimestamp = false;
     protected $createTime="createTime";
     protected $updateTime="updateTime";
-
+    public static  $statusCn=['待创建','有效','失效','微信审核中','创建失败'];
+    public static  $codeTypeCn=["UNIQUE"=>"一卡一码","GENERAL"=>"通用码"];
+    public static $rangeTypeCn=["ALL"=>"全部","PART"=>"部分指定商品可用","EXCLUDED"=>"部分指定商品不可用"];
     public function Good()
     {
-        return $this->belongsTo(ActGood::class,'act_good_id','id')->bind(["good_name","actCode"]);
+        return $this->belongsTo(YzGood::class,'skuCode','item_no')->bind(["good_name"=>"title"]);
     }
 }