Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/common/YouZan.php

@@ -50,12 +50,12 @@ class YouZan
         return $this->Client->post($method,$this->apiVersion, $params);
     }
     private function GetToken(){
-        $token = Cache::get("YouZanToken");
+        $token = Cache::get("YouZanToken".$this->authorityId);
         if(isset($token['access_token'])&& $token['access_token']!=''){
             return  $token['access_token'];
         }
         $token =$this->Token->getSelfAppToken($this->authorityId,["refresh"=>true]);
-        Cache::set("YouZanToken",$token,3500);
+        Cache::set("YouZanToken".$this->authorityId,$token,3600*24*7-100);
         return $token['access_token'];
     }
 

app/admin/controller/Consult.php

@@ -607,6 +607,9 @@ class Consult extends Base
                 $zxinfo["updatetime"] =date("Y-m-d H:i:s");
                 $bar=Db::name("consult_info")->save($zxinfo);
                 if($bar==false)throw  new \Exception("反馈商品更新失败");
+                 Db::name('consult_bids')
+                      ->where([['infoNo' ,'=', $zxinfo['infoNo']],['is_del','=',0],['status','<>',6]])
+                      ->update(['tax_status'=>3]);
                     //修改状态，添加待办
                     ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], [
                         "order_code" => $zxinfo['infoNo'],//咨询单详情编号

app/admin/controller/Sale.php

@@ -1135,6 +1135,9 @@ class Sale extends Base
                     Db::rollback();
                     return error_show(1002, "咨询单修改失败");
                 } else {
+                      Db::name('consult_bids')
+                      ->where([["infoNo" ,"=", $zxinfo['infoNo']],["is_del","=",0],["status","<>",6]])
+                      ->update(["tax_status"=>3]);
                     //修改状态，添加待办
                     ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], [
                         "order_code" => $zx['infoNo'],//咨询单详情编号

app/admin/model/ConsultTemp.php

@@ -77,6 +77,8 @@ class ConsultTemp extends Model
             	$item['isChild'] = 1;
             	$item['creater'] = $item['cgder'];
             	$item['createrid'] = $item['cgderid'];
+            	$item['addtime'] = date('Y-m-d H:i:s');
+            	$item['updatetime'] = date('Y-m-d H:i:s');
                 $addGood[]  = array_merge($item->toArray(),$marage);
                 $combind[]=[
                 	"spuCode"=>$marage["parent_code"],
@@ -104,9 +106,9 @@ class ConsultTemp extends Model
                 }
 
             }
-            if(empty($addGood)==false)(new GoodZixun())->strict(false)->insertAll($addGood);
-            if(empty($combind)==false)(new GoodCombind())->insertAll($combind);
-            if(empty($goodTax)==false)(new GoodTax())->insertAll($goodTax);
+            if(empty($addGood)==false)(new GoodZixun())->strict(false)->saveAll($addGood);
+            if(empty($combind)==false)(new GoodCombind())->saveAll($combind);
+            if(empty($goodTax)==false)(new GoodTax())->saveAll($goodTax);
       }
     }
 }

app/admin/model/GoodZixun.php

@@ -11,4 +11,7 @@ use think\Model;
 class GoodZixun extends Model
 {
     //
+
+    protected  $createTime='addtime';
+    protected $updateTime='updatetime';
 }

app/txx/command/updateAct.php

@@ -34,7 +34,7 @@ class updateAct extends Command
                 $info->updatetime=date("Y-m-d H:i:s");
                 $info->save();
             }elseif($info->promocode_status==1){
-                $info->status=3;
+                $info->status=6; //同步中
                 $info->save();
             }else{
                 $info->status=5;

app/txx/controller/Act.php

@@ -62,6 +62,7 @@ class Act extends Base
       }
 
       $list=$this->model->where($condition)
+      ->order("id desc")
       ->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);

app/txx/controller/Activity.php

@@ -161,7 +161,7 @@ class Activity extends Base{
     }
     public function info(){
         $param=$this->request->param(["id"=>""],"post","trim");
-        $info= $this->model->with(["act","platformYz"=>["platform","good"=>['unit','brand','category']],"promocode"])->findOrEmpty($param['id']);
+        $info= $this->model->with(["act","platformYz"=>["platform","good"=>['unit','brand','category']],"promocode"])->where(['is_del' => 0])->findOrEmpty($param['id']);
         if($info->isEmpty()){
             $this->error("信息有误");
         }
@@ -258,19 +258,20 @@ class Activity extends Base{
         if($info->isEmpty()){
             $this->error("信息有误");
         }
+        if($info->act_good_id!=0){
+            $act = $this->model->with(['act'])->where(['is_del' => 0, 'id' => $info->act_good_id])->findOrEmpty();
+            if (time()<=strtotime($act->endTime) && time()>=strtotime($act->startTime)) $this->error('活动正在进行中，不能删除');
+        }
         $info->is_del=1;
         try{
             $save= $info->save();
             if(!$save)throw new \Exception('删除失败');
-            if($info->act_good_id!==0){
-                $act= $this->model->with(["act"])->where(['is_del'=>0,'id'=>$info->act_good_id])->findOrEmpty();
-                if(!$act->isEmpty()){
+                if(isset($act) && !$act->isEmpty()){
                    if(time()<strtotime($act->startTime)){ //活动未开始
-                    $act->promocode_id=0;
-                    $act->status=1;
-                    $act->save();
-                    }
-                }
+                        $act->promocode_id=0;
+                        $act->status=1;
+                        $act->save();
+                   }
             }
         }catch (\Exception $e){
             $this->error($e->getMessage());

app/txx/middleware/CheckAuth.php

@@ -5,6 +5,7 @@ namespace app\txx\middleware;
 
 use app\txx\common\Sign;
 use think\facade\Db;use think\Response;
+use think\facade\Log;
 class CheckAuth
 {
     /**
@@ -21,12 +22,12 @@ class CheckAuth
     	$request->uname='';
         $param = $request->post();
 	    $header = $request->header();
-//	    Log::write("IPAddr:".$request->server("REMOTE_ADDR"),"info");
-//	    Log::write("Action:".$request->server("REQUEST_URI"),"info");
-//	    Log::write("param:".json_encode($param),"info");
-//	    Log::write("header:".json_encode($header),"info");
+	    Log::write("IPAddr:".$request->server("REMOTE_ADDR"),"info");
+	    Log::write("Action:".$request->server("REQUEST_URI"),"info");
+	    Log::write("param:".json_encode($param),"info");
+	    Log::write("header:".json_encode($header),"info");
 	    if(!isset($param['token'])||$param['token']==''){
-//		    Log::write("Action:".$request->server("REQUEST_URI"),"info");
+		    Log::write("Action:".$request->server("REQUEST_URI"),"info");
 		    $check =$this->check($header,$param);
 		    if($check['code']==1){
 			    return json_show(104,$check['msg']);

app/txx/model/Act.php

@@ -15,4 +15,18 @@ class Act extends Model
     public function goodInfo(){
         return $this->hasMany(ActGood::class,"actCode","actCode")->where(["is_del"=>0])->with(["Promocode"]);
     }
+
+    public static function onAfterUpdate(Model $model) : void{
+        if($model->version=='2.0' && $model->is_del==0 && $model->status==4){
+            self::sysncAct($model->actCode,$model->status,$model->version);
+         }
+     }
+
+     public static function sysncAct($actCode,$actStatus,$version){
+        $list=ActGood::where(['version'=>$version,'actCode'=>$actCode,'is_del'=>0,"status"=>6])->select();
+        if(!$list->isEmpty()){
+            ActGood::where(['version'=>$version,'actCode'=>$actCode,'is_del'=>0,'status'=>6])->update(['status'=>3]);
+        }
+
+     }
 }

app/txx/model/ActGood.php

@@ -10,7 +10,7 @@ use think\Model;
  */
 class ActGood extends Model
 {
-    public static $statusCn=["待审核","待生成券码信息","待同步券码信息","已同步券码信息","券码生成失败","券码同步失败"];
+    public static $statusCn=["待审核","待生成券码信息","待同步券码信息","已同步券码信息","券码生成失败","券码同步失败","券码信息同步中"];
     //
     public function act(){
         return $this->belongsTo(Act::class,"actCode","actCode")->bind(["act_name","startTime","endTime","company_name","contactor","mobile","act_status"=>"status"]);
@@ -27,22 +27,23 @@ class ActGood extends Model
         return $this->belongsTo(PlatformYouzan::class,'yz_good_code','skuCode')->bind(['plat_code','spuCode','sale_price','final_price','platform_name',"good_name"]);
     }
     public static function onAfterUpdate(Model $model) : void{
-        if($model->version=="2.0" && $model->is_del==0){
+        if($model->version=="2.0" && $model->is_del==0 && $model->status!=3){
             self::sysncAct($model->actCode,$model->status,$model->version);
          }
      }
 
-    // 0 '待审核',1 '待生成券码信息',2 '待同步券码信息',3 '已同步券码信息',4 '券码生成失败',5'券码同步失败'
+    // 0 '待审核',1 '待生成券码信息',2 '待同步券码信息',3 '已同步券码信息',4 '券码生成失败',5'券码同步失败' 6 待活动审批
     //'待选择商品','待同步创建优惠券码','待同步优惠券码','待确认上传至活动主办方','已确认上传至活动主办方','券码创建失败','券码同步失败'
     public static function sysncAct($actCode,$goodStatus,$version){
-                $actStatus=["1"=>"1","2"=>"2","3"=>"3","4"=>"5","5"=>"6"];//0 '待审核',1 '待生成券码信息',2 '待同步券码信息',3 '已同步券码信息',4 '券码生成失败',5'券码同步失败'
+
+                $actStatus=["1"=>"1","2"=>"2","4"=>"5","5"=>"6","6" =>"3"];//0 '待审核',1 '待生成券码信息',2 '待同步券码信息',3 '已同步券码信息',4 '券码生成失败',5'券码同步失败'
                 $num = self::where(['version'=>$version,'actCode'=>$actCode,'is_del'=>0])->where('status','<>',$goodStatus)->count();
                if($num==0){
                     $act = \app\txx\model\Act::where(['actCode'=>$actCode])->findOrEmpty();
                     if(!$act->isEmpty()){
                         $act->status=$actStatus[$goodStatus];
                         $save=$act->save();
-                        if($save&&$goodStatus==3){
+                        if($save&&$act->status==3){ //发送微信通知
                             event("wxPush",$act->toArray());
                         }
                     }