3 Ревизии b886dfd634 ... 467fe3e00f

Автор SHA1 Съобщение Дата
  shensong00 467fe3e00f 调试 преди 18 часа
  shensong00 63aeb66781 Merge branch 'priority' into dev/test преди 18 часа
  shensong00 28c2ea3e53 调试 преди 18 часа
променени са 2 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 2 2
      app/Console/Commands/CorpInformation/BatchMarkTagDeal.php
  2. 1 0
      app/Http/Controllers/Api/OrderController.php

+ 2 - 2
app/Console/Commands/CorpInformation/BatchMarkTagDeal.php

136
         }
136
         }
137
 
137
 
138
         # 验证总数
138
         # 验证总数
139
-        if($update['success'] + $update['exec_fail'] != $recordInfo['exec_total']) {
139
+        if($update['exec_success'] + $update['exec_fail'] != $recordInfo['exec_total']) {
140
             Log::logError('程序异常', ['record_id' => $recordInfo['id'], 'stat' => $update], $this->logName);
140
             Log::logError('程序异常', ['record_id' => $recordInfo['id'], 'stat' => $update], $this->logName);
141
             EmailQueue::rPush('客户批量打标签 - 处理数据总数与待处理数据总数不一致', json_encode(['record_id' => $recordInfo['id'], 'stat' => $update]), $this->emailReceiver, $this->emailSender);
141
             EmailQueue::rPush('客户批量打标签 - 处理数据总数与待处理数据总数不一致', json_encode(['record_id' => $recordInfo['id'], 'stat' => $update]), $this->emailReceiver, $this->emailSender);
142
         }
142
         }
143
 
143
 
144
         # 更新任务状态
144
         # 更新任务状态
145
-        if($update['fail'] == $recordInfo['exec_total']) {
145
+        if($update['exec_fail'] == $recordInfo['exec_total']) {
146
             $update['status'] = -1;
146
             $update['status'] = -1;
147
         } else {
147
         } else {
148
             $update['status'] = 1;
148
             $update['status'] = 1;

+ 1 - 0
app/Http/Controllers/Api/OrderController.php

257
         $data = OrderService::getShareInProportionConf($sysGroupId);
257
         $data = OrderService::getShareInProportionConf($sysGroupId);
258
         return self::returnValue($data);
258
         return self::returnValue($data);
259
     }
259
     }
260
+
260
 }
261
 }