用户分群sql

fix,客服消息列表
增加小程序appid 的返回

modules/Audience/Services/UserGroupService.php

@@ -106,8 +106,11 @@ class UserGroupService
                  $sql->where('a.last_charge_at', $f[0], $f[1]);
              }
         }
-        $res =  $sql->distinct()
-            ->select('a.uid', 'b.mp_openid')->get();
+        if($tags['uid'] ?? 0) {
+            $sql->where('b.uid', $tags['uid']);
+        }
+
+        return $sql;
     }
 
 

modules/Channel/Http/Controllers/AdvertiserController.php

@@ -112,7 +112,7 @@ class AdvertiserController extends CatchController
         $moduleMap = config('common.common.moduleMap');
         if($miniProgramIds->count()) {
             $miniPrograms = DB::table('miniprogram')->whereIn('id', $miniProgramIds->unique())
-                ->select('id', 'name', 'type')
+                ->select('id', 'name', 'type', 'appid')
                 ->get()->keyBy('id');
             foreach ($res as $item) {
                 $item->miniPrograms = [];

modules/WechatPlatform/Http/Controllers/KFMessageController.php

@@ -37,9 +37,9 @@ class KFMessageController extends CatchController
             })->when($status, function ($query, $status){
                 return $query->where('status', $status);
             })->when($sendAtStart, function ($query, $sendAtStart){
-                return $query->where('start_at', '>=', $sendAtStart);
+                return $query->where('send_at', '>=', $sendAtStart);
             })->when($sendAtEnd, function ($query, $sendAtEnd){
-                return $query->where('start_at', '<=', $sendAtEnd . ' 23:59:59');
+                return $query->where('send_at', '<=', $sendAtEnd . ' 23:59:59');
             })->when($gzhid, function ($query, $gzhid){
                 return $query->where('gzh_ids', 'like', '%#'. $gzhid . '#%');
             })->orderBy('id', 'desc')
@@ -66,7 +66,7 @@ class KFMessageController extends CatchController
             $item->gzh_names = $this->strGzhId($item->gzh_ids, $gzhs);
             $item->status_str = WechatPlatformConstService::KF_MESSAGE_STATUS_MAPPER[$item->status] ?? '';
             $item->message_content_arr = \json_decode($item->message_content, true);
-            $item->message_type = WechatPlatformConstService::KF_MESSAGE_TYPE_MAPPER[$item->message_type] ?? '';
+            $item->message_type_str = WechatPlatformConstService::KF_MESSAGE_TYPE_MAPPER[$item->message_type] ?? '';
             $item->ug_str = $ugs->get($item->ug_id)->name ?? '';
         }