ad

app/txx/controller/Act.php

@@ -82,11 +82,13 @@ class Act extends Base
        $param = $this->request->only([
        	"act_name"=>"",
        	"company_name"=>'',
+       	"depart"=>"",
        	"contactor"=>'',
        	"mobile"=>'',
        	"web_url"=>'',
        	"start"=>'',
        	"end"=>'',
+       	"settle_time"=>"",
        	"act_type"=>1,
        	],"post","trim");
 
@@ -95,6 +97,8 @@ class Act extends Base
             'company_name|活动公司名称' => 'require',
             'contactor|联系人' => 'require|max:255',
             'mobile|联系电话' => 'require',
+            "depart|部门"=>"require",
+            "settle_time|结算时间"=>"require",
         ]);
         if($validate->check($param)==false)$this->error($validate->getError());
         $actCode=makeNo("ACE");
@@ -104,10 +108,12 @@ class Act extends Base
         	"company_name"=>$param['company_name'],
         	"contactor"=>$param['contactor'],
         	"mobile"=>$param['mobile'],
+        	"depart"=>$param['depart'],
         	"act_type"=>$param['act_type'],
         	"startTime"=>$param['start']==''?null : $param['start'],
         	"endTime"=>$param['end']==''?null : $param['end'],
         	"web_url"=>$param['web_url']??"",
+        	"settle_time"=>date("Y-m-d H:i:s",strtotime($param['settle_time'])),
         	"status"=>0,
         	"version"=>"2.0",
         	"apply_id"=>$this->uid,
@@ -133,10 +139,12 @@ class Act extends Base
        	"company_name"=>'',
        	"contactor"=>'',
        	"mobile"=>'',
+       	"depart"=>"",
        	"web_url"=>'',
        	"start"=>'',
        	"end"=>'',
        	"actCode"=>'',
+       	'settle_time'=>'',
        	"act_type"=>1,
        	],"post","trim");
 
@@ -146,6 +154,8 @@ class Act extends Base
             'company_name|活动公司名称' => 'require',
             'contactor|联系人' => 'require|max:255',
             'mobile|联系电话' => 'require',
+            'depart|部门'=>'require',
+            'settle_time|结算时间'=>'require',
         ]);
         if($validate->check($param)==false)$this->error($validate->getError());
          $actm=new Actm();
@@ -159,6 +169,8 @@ class Act extends Base
         	"contactor"=>$param['contactor'],
         	"mobile"=>$param['mobile'],
         	"act_type"=>$param['act_type'],
+        	"depart"=>$param['depart'],
+        	"settle_time"=>date("Y-m-d H:i:s",strtotime($param['settle_time'])),
         	"startTime"=>$param['start']==''?null : $param['start'],
         	"endTime"=>$param['end']==''?null : $param['end'],
         	"web_url"=>$param['web_url']??"",
@@ -196,7 +208,7 @@ class Act extends Base
       /**
      * 删除指定资源
      *
-     * @param  int  $id
+     * @param   actCode
      * @return \think\Response
      */
     public function delete()
@@ -214,4 +226,21 @@ class Act extends Base
       $this->success("删除成功");
 
     }
+    /**
+       @param $actCode
+     * @param $status
+     */
+    public function status(){
+        $param = $this->request->only(['actCode'=>'','status'=>0],'post','trim');
+        $validate = Validate::rule([
+            'actCode|活动编号' => 'require',
+            'status|状态' => 'require|in:0,1,2,3,4,5',
+            ]);
+        if($validate->check($param)==false)$this->error($validate->getError());
+        $info = $this->model->where(['actCode'=>$param['actCode'],'is_del'=>0])->findOrEmpty();
+        if($info==false) $this->error('活动不存在');
+        $info->status=$param['status'];
+        if($info->save()==false)$this->error('修改失败');
+        $this->success('修改成功');
+    }
 }

app/txx/controller/Activity.php

@@ -4,6 +4,7 @@
 namespace app\txx\controller;
 
 
+use app\admin\model\GoodSpec;
 use app\txx\model\ActGood;
 use app\txx\model\PlatformYouzan;
 use think\App;
@@ -11,6 +12,8 @@ use think\facade\Validate;
 class Activity extends Base{
     private $platform_id=[37,79];
     private $model;
+    private $origin_img_host ='http://stock.api.caixiao365.com';
+   private  $ssl_img_host ='https://image.caixiao365.com';
     public function __construct(App $app)
     {
         parent::__construct($app);
@@ -29,6 +32,13 @@ class Activity extends Base{
         ->where($where)->order("id desc")
         ->field("plat_code,spuCode,skuCode,sale_price,final_price,exam_status,online_time,creater")
         ->paginate(["list_rows"=>$param['size'],"page"=>$param['page']]);
+        $list->each(function (&$item) {
+            $item->good_img=str_replace($this->origin_img_host,$this->ssl_img_host,$item->good_img);
+       	    $item->good_info_img=str_replace($this->origin_img_host,$this->ssl_img_host,$item->good_info_img);
+       	    $item->good_thumb_img=str_replace($this->origin_img_host,$this->ssl_img_host,$item->good_thumb_img);
+            $item['spec_info'] =GoodSpec::where(['spuCode' => $item['spuCode'], 'is_del' => 0])->with(['spec',
+          			'Spec_info'])->field('spec_id,spec_value_id')->select();
+        });
         $this->success("获取成功",["list"=>$list->items(),"count"=>$list->total()]);
     }
 
@@ -64,6 +74,7 @@ class Activity extends Base{
          $valids= Validate::rule([
             "skuCode|商品编码"=>"require|max:20",
             "stock_num|库存数量"=>"require|integer",
+            "awards_type|商品类型"=>"require|max:255",
             "roundId|轮次"=>"integer",
         ]);
        $actArr=[];
@@ -77,6 +88,7 @@ class Activity extends Base{
 					'actCode'=>$param['actCode'],
 					'yz_good_code'=>$v['skuCode'],
 					'stock_num'=>$v['stock_num'],
+					"awards_type"=>$v['awards_type'],
 					'used_num'=>0,
 					'balance_num'=>$v['stock_num'],
 					'roundId'=>$v['roundId']??'',
@@ -118,10 +130,10 @@ class Activity extends Base{
             $where[]=['version','=',$param['version']];
         }
         $list= $this->model->with(["act","platformYz"=>["platform","good"=>['unit','brand','category']],"promocode"])->where($where)->order("id desc")->paginate(["list_rows"=>$param['size'],"page"=>$param['page']]);
-        $list->each(function($item,$key){
+        $list->each(function(&$item){
             $item['status_cn']=ActGood::$statusCn[$item['status']]??"";
-            $item['act_status_cn']=\app\txx\model\Act::$statusCn[$item['act_status']]??"";
-            return $item;
+            $item['ActStatus_cn']=\app\txx\model\Act::$statusCn[$item['act_status']];
+
         });
         $this->success("获取成功",["list"=>$list->items(),"count"=>$list->total()]);
     }