日志修改

app/model/ShopInfo.php

@@ -69,7 +69,7 @@ class ShopInfo
            if($data_arr['data']['totalPage'] > 1) {
                for ($i = 2; $i <= $data_arr['data']['totalPage']; $i++) {
                    $data_arr = self::javaGetUserList($k_user_params, $i, $size);
-                   if($data_arr['code'] == 0) {
+                   if($data_arr['code'] == 200) {
                        if(empty($for_user_list)) {
                            $for_user_list = self::evnuserlist($data_arr['data']['records']);
                        }else {
@@ -80,10 +80,10 @@ class ShopInfo
                }
                $user_list = array_merge($user_list, $for_user_list);
            }
+           return $user_list;
        }else {
            Log::info('获取用户列表时出错' . json_encode($data_arr));
        }
-       return $user_list;
    }
 
    public static function evnuserlist($data)
@@ -92,7 +92,7 @@ class ShopInfo
            $push_user[] = [
                'user_id' => $user['id'],
                'phone' => $user['phone'],
-               'nick_name' => $user['nickName'],
+               'nick_name' => $user['nick_name'],
            ];
        }
        return $push_user;
@@ -103,25 +103,25 @@ class ShopInfo
    {
        return [
            '用户昵称' => [
-               'username', '用户昵称'
+               'username', '用户昵称', 'user_nick'
            ],
            '店铺名称' => [
-               'shopname', '店铺名称'
+               'shopname', '店铺名称', 'name'
            ],
            '活动名称' => [
-               'activityname', '活动名称',
+               'activityname', '活动名称', 'name'
            ],
            '活动时间' => [
-               'activitytime', '活动时间',
+               'activitytime', '活动时间', 'time'
            ],
            '数量' => [
-               'num', '数量',
+               'num', '数量', 'money'
            ],
            '金额' => [
-               'money', '金额',
+               'money', '金额', 'money'
            ],
            '时间' => [
-               'time', '时间',
+               'time', '时间', 'time',
            ],
        ];
    }
@@ -156,6 +156,38 @@ class ShopInfo
         return $new_arr;
     }
 
+
+    public static function handleSmsTemplatesrule($content)
+    {
+        $arr = handldollerstr($content);
+        $x_arr = self::getTempDineList();
+        $new_arr = [];
+        $item_new_arr = [];
+        if($arr) {
+            $i = 1;
+            foreach ($arr as $k => $v) {
+                if(isset($x_arr[$v])) {
+                    $k_str = $x_arr[$v][0];
+                    $v_str = $x_arr[$v][2];
+                    $new_arr[$k_str] = $v_str;
+                }else {
+                    $item = 'item' . $i;
+                    $item_new_arr[$item] = 'name';
+                    $i++;
+                }
+            }
+            if($new_arr && $item_new_arr) {
+                $new_arr = array_merge($new_arr, $item_new_arr);
+            }
+            if(!$new_arr && $item_new_arr) {
+                $new_arr = $item_new_arr;
+            }
+        }
+        return $new_arr;
+    }
+
+
+
     // 处理发送短信时短信模版替换内容
     public static function handlesendSmsTemplates($content)
     {