gx

@@ -13,6 +13,7 @@ use App\Models\SmsLog;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\User as UserModel;
 use App\Models\User\User as UserModel;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
 use Mrgoon\AliSms\AliSms;
 use Mrgoon\AliSms\AliSms;
@@ -146,6 +147,17 @@ class ComController extends BaseController
 
 
     public function ceshi(){
     public function ceshi(){
         $inquiry_list = (new FormGlobalsoApi())->getInquiryList('https://demomark.globalso.com/','',1,100000000);
         $inquiry_list = (new FormGlobalsoApi())->getInquiryList('https://demomark.globalso.com/','',1,100000000);
+        //总数
+        $total = $inquiry_list['data']['total'];
+        //数据详情
+        $data = $inquiry_list['data']['data'];
+        // 获取上个月的开始时间
+        $startTime = Carbon::now()->subMonth()->startOfMonth();
+        // 获取上个月的结束时间
+        $endTime = Carbon::now()->subMonth()->endOfMonth();
+        foreach ($data as $k => $v){
+
+        }
         $this->response('success',Code::SUCCESS,$inquiry_list);
         $this->response('success',Code::SUCCESS,$inquiry_list);
     }
     }
 
 

@@ -77,7 +77,7 @@ class ATemplateModuleLogic extends BaseLogic
      */
      */
     public function  aTemplateModuleDel(){
     public function  aTemplateModuleDel(){
         //TODO::查看当前模板是否有模板在使用
         //TODO::查看当前模板是否有模板在使用
-        $rs = $this->model->edit(['deleted_status'=>$this->param['deleted_status'],'deleted_at'=>date('Y-m-d H:i:s')],['id'=>$this->param['id']]);
+        $rs = $this->model->edit(['deleted_status'=>1,'deleted_at'=>date('Y-m-d H:i:s')],['id'=>$this->param['id']]);
         if($rs === false){
         if($rs === false){
             $this->fail('error');
             $this->fail('error');
         }
         }