Merge branch 'dev' of http://git.huaml.com/zhh/huahuibao into dev

biz-hd/birthday/classes/BirthdayGiftClass.php

@@ -66,7 +66,7 @@ class BirthdayGiftClass extends BaseClass
                 $level = intval($row['level'] ?? $row->level ?? 0);
                 $map[$level] = [
                     'name' => $row['name'] ?? $row->name ?? '',
-                    'birthdayBenefit' => trim($row['birthdayBenefit'] ?? $row->birthdayBenefit ?? ''),
+                    'birthdayBenefit' => trim($row['benefitDesc'] ?? $row->benefitDesc ?? ''),
                     'discount' => $row['discount'] ?? $row->discount ?? 10,
                 ];
             }
@@ -557,9 +557,9 @@ class BirthdayGiftClass extends BaseClass
         if (empty($mobile)) {
             return [false, '客户无手机号'];
         }
-        $shopName = self::getShopDisplayName($shop);
-        $giftDesc = $gift->giftName ?: '生日礼品';
-        $msg = "{$shopName}：亲爱的会员您好，明天就是您生日啦！为您准备了专属生日礼品：{$giftDesc}。请您回复领取时间，如（5月20日10点），24小时内回复有效。不领取请忽略短信，祝您生活愉快！拒收请回复R";
+        $shopName = mb_substr(self::getShopDisplayName($shop), 0, 13, 'UTF-8');
+        $giftDesc = mb_substr($gift->giftName ?: '精美礼品', 0, 10, 'UTF-8');
+        $msg = "{$shopName}：亲爱的会员您好，明天就是您生日啦！为您准备了专属生日礼品：{$giftDesc}。请您回复领取时间，如明天10点左右，24小时内回复有效。不领取请忽略短信，祝您生活愉快！拒收请回复R";
         $sms = new ChuanglanSmsApi();
         $sms->useAccount('marketing');
         $re = $sms->sendSMS($mobile, $msg);
@@ -842,6 +842,8 @@ class BirthdayGiftClass extends BaseClass
         $content .= '<BR>';
         if ($pickupShort) {
             $content .= $pickupShort . ' 到店自取<BR>';
+        } else {
+            $content .= '客户回复信息不明确，请电话联系';
         }
         $content .= '<BR>';
         $content .= '取花人：<BR>';