conflict

modules/Channel/Http/Controllers/AdvertiserController.php

@@ -138,7 +138,7 @@ class AdvertiserController extends CatchController
             'miniProgramIds' => 'required|array|min:1',
             'miniProgramIds.*' => 'required|integer',
             'status' => 'required|in:1,2',
-            'remark' => 'string|max:140',
+            'remark' => 'nullable|string|max:140',
         ]);
         $uid = $request->input('id');
         $user = DB::table('users')

modules/Channel/Http/Controllers/PayTemplateController.php

@@ -235,6 +235,8 @@ class PayTemplateController extends CatchController
         $name = $request->post('name');
         $status = $request->post('status',-1);
         $options = $request->post('options');
+        // 1-首充模板,2-非首充模板
+        $type = $request->input('type');
         $uid = $this->getLoginUser()->id;
         if(UserService::userHasRole($uid,'administrator')){
             $uid = 0;
@@ -254,7 +256,7 @@ class PayTemplateController extends CatchController
         }
 
         if($status == 1){
-            $this->payTemplate->where('uid',$uid)->update(['status'=>0]);
+            $this->payTemplate->where('uid',$uid)->where('type', $type)->update(['status'=>0]);
             $this->payTemplate->where('id',$id)->update(['status'=>1]);
         }
         if($template_info_update){

modules/Operation/Service/ChannelServic.php

@@ -30,7 +30,7 @@ class ChannelServic extends BaseService
             foreach ($list as  $value){
                 $value->type_txt = $type[$value->type]['name'] ?? "-";
                 $value->miniprogram_type_text = $minParamType[$value->miniprogram_type]['name'] ?? "-";
-                $value->duanjus = collect($value->duanjus)->sortBy('sort');
+                $value->duanjus = collect($value->duanjus)->sortBy('sort')->toArray();
             }
         }
         return $list;

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -55,6 +55,7 @@ class PromotionController extends CatchController
             'videos.name as video_name', 'promotions.series_sequence', 'promotions.callback_type',
                 'promotions.callback_config_id', 'promotions.video_id', 'promotions.remark', 'promotions.status',
             'promotions.first_charge_template_id', 'promotions.not_first_charge_template_id')
+
             ->paginate($request->input('limit', 15));
         $chargeTemplateIds = $result->pluck('first_charge_template_id')->merge($result->pluck('not_first_charge_template_id'))->unique();