Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/command/handleYzOrderData.php

@@ -482,15 +482,12 @@ class handleYzOrderData extends Command
 //                    ]);
 
                 //维护台账记录
-                if (isset($standing_book_data['bk_code'])) Db::name('standing_book')->where('bk_code', $standing_book_data['bk_code'])->update(array_merge($standing_book_data, ['updatetime' => date('Y-m-d H:i:s')]));
-                else Db::name('standing_book')->insert(array_merge($standing_book_data, ['addtime' => date('Y-m-d H:i:s'), 'updatetime' => date('Y-m-d H:i:s'), 'standBookNo' => makeNo("IO")]));
+                Db::name('standing_book')->insert(array_merge($standing_book_data, ['addtime' => date('Y-m-d H:i:s'), 'updatetime' => date('Y-m-d H:i:s'), 'standBookNo' => makeNo("IO")]));
 
+                Db::commit();
 
                 //回调更新有赞订单数据
-                $callback_rs = $this->callbackYz(['status' => 6, 'id' => $c_data['id'], 'orderCode' => $orderCode]);
-                if ($callback_rs['code'] != 0) throw new Exception($callback_rs['message']);
-
-                Db::commit();
+                $this->callbackYz(['status' => 6, 'id' => $c_data['id'], 'orderCode' => $orderCode]);
 
                 $output->writeln(date('Y-m-d H:i:s') . '|处理成功,orderCode:' . $orderCode);