update 团长分销-奖励脚本

application/modules/Job/controllers/Colonelorder.php

@@ -101,7 +101,7 @@ class ColonelorderController extends Job
      */
     private function getInviteNewUserData($userIds, &$colonelPayInfoData)
     {
-        if ($inviteNewUserList = $this->getInviteNewUserList($userIds)) {
+        if ($inviteNewUserList = $this->getInviteNewUserList($userIds,$this->startTime,$this->endTime)) {
             $userNickList = $this->getUserList(array_column($inviteNewUserList, 'user_id'));
             foreach ($inviteNewUserList as $newUser) {
                 $colonelPayInfoData[] = [
@@ -148,24 +148,19 @@ class ColonelorderController extends Job
 
     /**
      * 团长任务配置
-     * @param $yesterday
+     * @param $settlementDate
      * @return array
      */
-    private function getColonelConfig($yesterday): array
+    private function getColonelConfig($settlementDate): array
     {
         $config = ColonelDistributorConfig::getRecord([
-            'date' => $yesterday,
-            'type' => ColonelDistributorConfig::TYPE_COLONEL
+            'date[<=]' => $settlementDate,
+            'type' => ColonelDistributorConfig::TYPE_COLONEL,
+            'ORDER'    => ['date' => 'DESC'],
+            'LIMIT'    => 1
         ]);
-        if (empty($config)) {
-            $config = ColonelDistributorConfig::getRecord([
-                'date[<=]' => $yesterday,
-                'ORDER'    => ['date' => 'DESC'],
-                'LIMIT'    => 1
-            ]);
-        }
         $configData = [];
-        if (empty($config['data'])) {
+        if (!empty($config['data'])) {
             $configData = json_decode($config['data'], true);
         }
         return $configData;
@@ -193,10 +188,12 @@ class ColonelorderController extends Job
      * User: pengfei@yidian-inc.com
      * Date: 2021/9/3 4:03 下午
      * @param $userIds
+     * @param $startTime
+     * @param $endTime
      * @return array
      * @throws InterfaceException
      */
-    private function getInviteNewUserList($userIds): array
+    private function getInviteNewUserList($userIds,$startTime,$endTime): array
     {
         $url = config('interface', 'coupon.background.wx_invite_relation_list_by_user_ids');
         if (empty($url)) {
@@ -204,7 +201,7 @@ class ColonelorderController extends Job
         }
 
         $res = HttpUtil::get($url,
-            ['user_ids' => $userIds, 'start_time' => $this->startTime, 'end_time' => $this->endTime]);
+            ['user_ids' => $userIds, 'start_time' => $startTime, 'end_time' => $endTime]);
         if (!empty($res['response']['result'])) {
             return array_values(array_column($res['response']['result'], null, 'user_id'));
         }

application/modules/Job/controllers/Colonelwallet.php

@@ -34,6 +34,8 @@ class ColonelwalletController extends Job
                 if ($this->toWallet($payInfoList)) {
                     if ($this->handlePayInfoStatus(array_column($payInfoList, 'pay_info_id'))) {
                         $this->loggerInfo('success');
+                    } else {
+                        $this->loggerInfo('更新状态失败');
                     }
                 }
             }