|
@@ -2,7 +2,7 @@
|
|
|
|
|
|
namespace app\command;
|
|
|
|
|
|
-use app\admin\model\ComonOrder;use think\console\Command;
|
|
|
+use app\admin\model\ComonOrder;use app\admin\model\OrderCategory;use think\console\Command;
|
|
|
use think\console\Input;
|
|
|
use think\console\Output;
|
|
|
use think\Exception;
|
|
@@ -49,6 +49,11 @@ class handleCxData extends command
|
|
|
$output->writeln("[$date]:{$result['id']}数据解析失败");
|
|
|
continue;
|
|
|
}
|
|
|
+ if(isset($data['inv_cat_info']) && !empty($data['inv_cat_info'])){
|
|
|
+ $orderCode= $result['order_type']==1?$data['orderCode']:$data['cgdNo'];
|
|
|
+ OrderCategory::checkInfo($orderCode,$result['order_type'],$data['inv_cat_info']);
|
|
|
+ }
|
|
|
+
|
|
|
$qrd_insert_data=$wait_insert_data=$cgd_insert_data=[];
|
|
|
$data['cat_name']=is_array($data['cat_name']) ? $data['cat_name'] : json_decode($data['cat_name'],true);
|
|
|
if ($result['order_type'] == 1) {
|
|
@@ -304,7 +309,8 @@ class handleCxData extends command
|
|
|
(['qrdSend'=>$data['send_status']]);
|
|
|
}
|
|
|
|
|
|
- } else {
|
|
|
+ }
|
|
|
+ else {
|
|
|
//已存在
|
|
|
$data['total_fee']=round($data['total_fee'],2) - $data['th_fee'] - $data['diff_fee'];
|
|
|
$exitReport=Db::name('report_code')->where('cgdNo' , $data['cgdNo'])->findOrEmpty();
|