Merge branch 'zhongqi-birthDay' into dev

app-hd/controllers/BirthdayGiftController.php

@@ -10,12 +10,14 @@ class BirthdayGiftController extends BaseController
 {
     public $guestAccess = [];
 
+    // 工作台栏数据
     public function actionWorkbenchSummary()
     {
         $data = BirthdayGiftClass::getWorkbenchSummary($this->shopId, $this->mainId);
         util::success($data);
     }
 
+    // 看板列表
     public function actionBoardList()
     {
         $get = Yii::$app->request->get();
@@ -23,6 +25,7 @@ class BirthdayGiftController extends BaseController
         util::success($data);
     }
 
+    // Tab 计数
     public function actionBoardCounts()
     {
         $get = Yii::$app->request->get();
@@ -30,6 +33,7 @@ class BirthdayGiftController extends BaseController
         util::success($data);
     }
 
+    // 赠礼统计
     public function actionGiftStats()
     {
         $get = Yii::$app->request->get();
@@ -38,6 +42,7 @@ class BirthdayGiftController extends BaseController
         util::success($data);
     }
 
+    // 一键通知(限明天)
     public function actionNotifyTomorrow()
     {
         $get = Yii::$app->request->get();
@@ -56,6 +61,7 @@ class BirthdayGiftController extends BaseController
         util::fail('没有需要通知的明日生日客户');
     }
 
+    // 设置生日日期
     public function actionModifyBirthday()
     {
         $get = Yii::$app->request->get();
@@ -63,6 +69,7 @@ class BirthdayGiftController extends BaseController
         util::complete('修改成功');
     }
 
+    // 手动标注为"已领取"
     public function actionCollect()
     {
         $get = Yii::$app->request->get();
@@ -71,6 +78,7 @@ class BirthdayGiftController extends BaseController
         util::complete('更新成功');
     }
 
+    // 看板内手动补打生日领取小票
     public function actionPrint()
     {
         $get = Yii::$app->request->get();

biz-hd/birthday/classes/BirthdayGiftClass.php

@@ -3,6 +3,7 @@
 namespace bizHd\birthday\classes;
 
 use biz\sj\classes\SjClass;
+use biz\sj\services\MerchantAssetService;
 use bizHd\custom\classes\CustomClass;
 use bizHd\custom\classes\HdClass;
 use bizHd\member\classes\MemberLevelClass;
@@ -247,6 +248,12 @@ class BirthdayGiftClass extends BaseClass
         return [$result, $levelMap];
     }
 
+    /**
+     * 今日/明日/近一周人数（member>0 + 有 birthdayBenefit + 生日落在区间）
+     * @param $shopId
+     * @param $mainId
+     * @return array
+     */
     public static function getWorkbenchSummary($shopId, $mainId)
     {
         list($customs,) = self::getEligibleCustoms($shopId, $mainId);
@@ -370,7 +377,7 @@ class BirthdayGiftClass extends BaseClass
     }
 
     /**
-     * 确保每年都有记录
+     * 看板打开时懒创建当年记录
      * @param $shop
      * @return bool
      * @throws IntegrityException
@@ -431,6 +438,13 @@ class BirthdayGiftClass extends BaseClass
         ];
     }
 
+    /**
+     * 时间区间 + 状态 + 搜索
+     * @param $shop
+     * @param $params
+     * @return array
+     * @throws IntegrityException
+     */
     public static function getBoardList($shop, $params)
     {
         self::ensureYearRecords($shop);
@@ -660,6 +674,18 @@ class BirthdayGiftClass extends BaseClass
         if (empty($mobile)) {
             return [false, '客户无手机号'];
         }
+        // 短信余额查询及可发数量削减 TODO
+        $asset = MerchantAssetService::getBySjId($sjId, true);
+        $remainSmsNum = $asset->remainSmsNum;
+        if ($remainSmsNum <= 0) {
+            $msg = '商家id:' . $sjId . ' -- ' . $merchant['name'] . '短信余额不足';
+            noticeUtil::push($msg);
+            Yii::info($msg);
+            return false;
+        }
+        $asset->remainSmsNum = --$remainSmsNum;
+        $asset->save();
+
         $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";