linwu 4 lat temu
rodzic
commit
54f6dffd67

+ 6 - 1
app/Admin/Controllers/Content/BuyHouseJcController.php

@@ -4,6 +4,7 @@ namespace App\Admin\Controllers\Content;
 
 use App\Admin\Exports\Content\HouseApplyJcExport;
 use App\Http\Controllers\Controller;
+use App\Models\SmsTemplate;
 use App\Models\TalentHouse;
 use App\Models\TalentHouseApply;
 use App\Services\Common\SmsService;
@@ -118,11 +119,15 @@ class BuyHouseJcController extends Controller
         ];
         DB::table('talent_house_check_log')->insert($log);
 
-        //审核不通过发送短信
+        //审核发送短信
         if ($status == 3) {
             $time = strtotime($house['supply_time']);
             $smsService->sendSms($apply['mobile'], 'sms_buyhouse_supply', ['name' => $apply['name'], 'month' => date('m', $time), 'day' => date('d', $time)]);
         }
+        if ($status == 2) {
+            SmsTemplate::buyHouseCheck('zj');
+            SmsTemplate::buyHouseCheck('zr');
+        }
 
         if ($result) {
             admin_toastr('审核成功', 'success');

+ 6 - 1
app/Admin/Controllers/Content/BuyHouseRsController.php

@@ -4,6 +4,7 @@ namespace App\Admin\Controllers\Content;
 
 use App\Admin\Exports\Content\HouseApplyRsExport;
 use App\Http\Controllers\Controller;
+use App\Models\SmsTemplate;
 use App\Models\TalentHouse;
 use App\Models\TalentHouseApply;
 use App\Services\Common\SmsService;
@@ -118,11 +119,15 @@ class BuyHouseRsController extends Controller
         ];
         DB::table('talent_house_check_log')->insert($log);
 
-        //审核不通过发送短信
+        //审核发送短信
         if ($status == 3) {
             $time = strtotime($house['supply_time']);
             $smsService->sendSms($apply['mobile'], 'sms_buyhouse_supply', ['name' => $apply['name'], 'month' => date('m', $time), 'day' => date('d', $time)]);
         }
+        if ($status == 2) {
+            SmsTemplate::buyHouseCheck('zj');
+            SmsTemplate::buyHouseCheck('zr');
+        }
 
         if ($result) {
             admin_toastr('审核成功', 'success');

+ 13 - 2
app/Http/Controllers/Web/Content/BuyhouseController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Web\Content;
 use App\Http\Controllers\Web\WebBaseController;
 use App\Models\Article;
 use App\Models\MemberInfo;
+use App\Models\SmsTemplate;
 use App\Models\TalentHouse;
 use App\Models\TalentHouseApply;
 use App\Models\TalentHousePeople;
@@ -46,7 +47,7 @@ class BuyhouseController extends WebBaseController
         $return_data = ['user_id' => $user_id ?: 0, 'apply' => '[]'];
 
         //房源
-        $house = TalentHouse::orderBy('updated_at', 'desc')->orderByRaw(DB::raw("FIELD(status,2,1,3)"))->limit(8)->get();
+        $house = TalentHouse::orderBy('apply_time_start', 'desc')->limit(8)->get();
         foreach ($house as $v) {
             $v['status']           = $this->_get_status($v);
             $v['apply_time_start'] = date('Y-m-d', strtotime($v['apply_time_start']));
@@ -58,7 +59,12 @@ class BuyhouseController extends WebBaseController
         $return_data['house'] = $house;
 
         //新闻
-        $news = Article::where('type_id', 56)->where('is_display', 1)->select(['id', 'title', 'updated_at', 'created_at'])->orderBy('list_order', 'desc')->limit(6)->get();
+        $news = Article::where('type_id', 56)
+            ->where('is_display', 1)
+            ->select(['id', 'title', 'updated_at', 'created_at'])
+            ->orderByRaw('list_order desc,created_at desc')
+            ->limit(6)
+            ->get();
         foreach ($news as $v) {
             $v['created_at_text'] = date('Y-m-d', strtotime($v['created_at']));
             $v['updated_at_text'] = date('Y-m-d', strtotime($v['updated_at']));
@@ -463,12 +469,17 @@ class BuyhouseController extends WebBaseController
         //审核状态
         if ($info->rs_check_status == 3) {
             $info->rs_check_status = 1;
+            if ($info->type == 2) {
+                SmsTemplate::buyHouseCheck('rs');
+            }
         }
         if ($info->zj_check_status == 3) {
             $info->zj_check_status = 1;
+            SmsTemplate::buyHouseCheck('zj');
         }
         if ($info->zr_check_status == 3) {
             $info->zr_check_status = 1;
+            SmsTemplate::buyHouseCheck('zr');
         }
         if ($info->is_draft == 1) {
             $info->is_draft = 2;

+ 10 - 0
app/Models/SmsTemplate.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Services\Common\SmsService;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -53,5 +54,14 @@ class SmsTemplate extends Model
         return $this->hasOne(SmsRule::class, 'alias', 'alias');
     }
 
+    public static function buyHouseCheck($key)
+    {
+        $arr = ['rs' => '13313826760', 'zj' => '15377968035', 'zr' => '18850292263'];
+        if (empty($arr[$key])) {
+            return false;
+        }
 
+        $smsService = new SmsService();
+        $smsService->sendSms($arr[$key], 'sms_buyhouse_check', []);
+    }
 }