3 Commits b886dfd634 ... 467fe3e00f

Author SHA1 Message Date
  shensong00 467fe3e00f 调试 16 hours ago
  shensong00 63aeb66781 Merge branch 'priority' into dev/test 16 hours ago
  shensong00 28c2ea3e53 调试 16 hours ago

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

@@ -136,13 +136,13 @@ class BatchMarkTagDeal extends Command
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 140
             Log::logError('程序异常', ['record_id' => $recordInfo['id'], 'stat' => $update], $this->logName);
141 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 146
             $update['status'] = -1;
147 147
         } else {
148 148
             $update['status'] = 1;

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

@@ -257,4 +257,5 @@ class OrderController extends Controller
257 257
         $data = OrderService::getShareInProportionConf($sysGroupId);
258 258
         return self::returnValue($data);
259 259
     }
260
+
260 261
 }