wugg 5 kuukautta sitten
vanhempi
commit
f3d7b4637d
2 muutettua tiedostoa jossa 5 lisäystä ja 3 poistoa
  1. 3 3
      app/txx/controller/Activity.php
  2. 2 0
      app/txx/controller/Base.php

+ 3 - 3
app/txx/controller/Activity.php

@@ -59,7 +59,7 @@ class Activity extends Base{
         if($Act->isEmpty()){
         if($Act->isEmpty()){
             $this->error("活动信息有误");
             $this->error("活动信息有误");
         }
         }
-        if($Act->status!==0){
+        if($Act->status!=0){
             $this->error("活动状态有误");
             $this->error("活动状态有误");
         }
         }
         if(strtotime($Act->endTime)<time()){
         if(strtotime($Act->endTime)<time()){
@@ -81,7 +81,7 @@ class Activity extends Base{
                 }
                 }
 
 
                 if(!isset($yzGood[$v['skuCode']]))  $this->error('商品信息有误');
                 if(!isset($yzGood[$v['skuCode']]))  $this->error('商品信息有误');
-                 if($yzGood[$v['skuCode']]['status']!==6)  $this->error($v['skuCode'].'有赞商品未上线');
+                 if($yzGood[$v['skuCode']]['status']!=6)  $this->error($v['skuCode'].'有赞商品未上线');
                  $temp=[
                  $temp=[
 					'actCode'=>$param['actCode'],
 					'actCode'=>$param['actCode'],
 					'yz_good_code'=>$v['skuCode'],
 					'yz_good_code'=>$v['skuCode'],
@@ -119,7 +119,7 @@ class Activity extends Base{
         }
         }
         if($param['status']!==""){
         if($param['status']!==""){
             $where[]=["status","=",$param['status']];
             $where[]=["status","=",$param['status']];
-            if($param['status']==3) $where[]=["used_num",">=",$param['stock_num']];
+           // if($param['status']==3) $where[]=["used_num",">=",$param['stock_num']];
         }
         }
         if($param['skuCode']!==""){
         if($param['skuCode']!==""){
             $where[]=["yz_good_code","like","%".$param['skuCode']."%"];
             $where[]=["yz_good_code","like","%".$param['skuCode']."%"];

+ 2 - 0
app/txx/controller/Base.php

@@ -11,6 +11,8 @@ use think\Response;
 class Base extends BaseController
 class Base extends BaseController
 {
 {
 	public $white=[];
 	public $white=[];
+	protected $uid=0;
+  	protected $uname='';
 	public function __construct(App $app) {
 	public function __construct(App $app) {
   	    parent::__construct($app);
   	    parent::__construct($app);
     }
     }