脚本优化

app/admin/controller/OrderImport.php

@@ -99,6 +99,7 @@ class OrderImport extends Base
         $total = $db->count('id');
 
         $list = $db
+            ->withoutField('discount_price,after_price')
             ->page($param['page'], $param['size'])
             ->order('id', 'desc')
             ->select()
@@ -113,19 +114,23 @@ class OrderImport extends Base
         $id = $this->request->post('id/d', 0, 'trim');
 
         $info = OIFCModel::where('id', $id)
+            ->withoutField('discount_price,after_price')
             ->where('status', '<>', OIFCModel::$status_wait_validate)
             ->findOrEmpty()
             ->toArray();
 
         if (empty($info)) return error_show(1005, '系统尚未解析完成，无法查看详情,请等待');
-        $res['id'] = $info['id'];
-        $res['status'] = $info['status'];
-        $res['createrid'] = $info['createrid'];
-        $res['creater'] = $info['creater'];
-        $res['updateid'] = $info['updateid'];
-        $res['updater'] = $info['updater'];
-        $res['orderCode'] = $info['orderCode'];
-        $res['success_date'] = $info['status'] == OIFCModel::$status_success ? $info['updatetime'] : '';//录入成功时间
+        $res = [
+            'id' => $info['id'],
+            'status' => $info['status'],
+            'createrid' => $info['createrid'],
+            'creater' => $info['creater'],
+            'updateid' => $info['updateid'],
+            'updater' => $info['updater'],
+            'orderCode' => $info['orderCode'],
+            'success_date' => $info['status'] == OIFCModel::$status_success ? $info['updatetime'] : '',//录入成功时间
+            'addtime' => $info['addtime'],
+        ];
 
         //导入原始数据
         $res['import'] = $info;

app/command/ImportOrderFromCAnalysisData.php

@@ -45,26 +45,17 @@ class ImportOrderFromCAnalysisData extends Command
             $val = Validate::rule([
                 'platform_code|平台订单号' => 'require',
                 'platform_time|平台下单时间' => 'require|date',
-                'sale_source|销售渠道' => 'require|checkSaleSource:',
+                'sale_source|销售渠道' => 'require',
                 'plat_code|平台商品编号' => 'require',
                 'price|单价' => 'require|float',
                 'num|数量' => 'require|number|gt:0',
                 'before_discount_all_price|总金额' => 'require|float',
-                'mode|收费模式' => 'require|in:卡券支付,现金支付,混合支付',
+                'mode|收费模式' => 'require',
                 'contactor|收货人' => 'require',
                 'mobile|联系电话' => 'require',
                 'addr|联系地址' => 'require',
             ]);
 
-            //校验销售渠道
-            $val->extend('checkSaleSource', function ($val) {
-                $temp = Db::name('platform_source')
-                    ->field('id')
-                    ->where(['source' => $val, 'is_del' => 0])
-                    ->find();
-                return empty($temp) ? '销售渠道不存在' : true;
-            });
-
             $update_c_data = [
                 'updatetime' => date('Y-m-d H:i:s'),
                 'updateid' => 0,
@@ -94,14 +85,18 @@ class ImportOrderFromCAnalysisData extends Command
                 'addtime' => date('Y-m-d H:i:s'),
                 'sale_source' => $rs['sale_source'],
                 'mode' => $rs['mode'],
-
             ];
 
-
             //销售渠道
-//            $extend_insert_data['sale_source'] = Db::name('platform_source')
-//                ->where(['source' => $rs['sale_source'], 'is_del' => 0])
-//                ->value('source', '');
+            $sale_source_temp = Db::name('platform_source')
+                ->field('id')
+                ->where(['source' => $val, 'is_del' => 0])
+                ->find();
+            if (empty($sale_source_temp)) {
+                $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',销售渠道不存在' : '销售渠道不存在';
+                $extend_insert_data['sale_source'] = '';
+            }
 
             //组织extend的数据
             $good_platform_info = Db::name('good_platform')
@@ -145,11 +140,13 @@ class ImportOrderFromCAnalysisData extends Command
                     if ($rs['price'] < $good_ladder['sale_price']) {
                         $update_c_data['status'] = OIFCModel::$status_wait_confirm;
                         $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',售价低于系统标准价' . $good_ladder['sale_price'] : '售价低于系统标准价' . $good_ladder['sale_price'];
+                        $extend_insert_data['price'] = 0;//价格错误
                     }
 
                     if (($rs['num'] * $rs['price']) != $rs['before_discount_all_price']) {
                         $update_c_data['status'] = OIFCModel::$status_wait_confirm;
                         $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',导入总价错误' : '导入总价错误';
+                        $extend_insert_data['before_discount_all_price'] = 0;
                     }
 
                 }
@@ -168,6 +165,7 @@ class ImportOrderFromCAnalysisData extends Command
                 if (empty($activity_info)) {
                     $update_c_data['status'] = OIFCModel::$status_wait_confirm;
                     $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',该活动不存在' : '该活动不存在';
+                    $extend_insert_data['activity_code'] = $extend_insert_data['activity_name'] = '';
                 } else {
                     $extend_insert_data['activity_code'] = $activity_info['activity_code'];
                     $extend_insert_data['activity_name'] = $activity_info['activity_name'];
@@ -176,7 +174,13 @@ class ImportOrderFromCAnalysisData extends Command
             }
 
             //收费模式
-//            $extend_insert_data['mode'] = in_array($rs['mode'], ['卡券支付', '现金支付', '混合支付']) ? $rs['mode'] : '';
+            $mode_temp = in_array($rs['mode'], ['卡券支付', '现金支付', '混合支付']);
+            if ($mode_temp) $extend_insert_data['mode'] = $rs['mode'];
+            else {
+                $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',收费模式错误' : '收费模式错误';
+                $extend_insert_data['mode'] = '';
+            }
 
             //企业客户
             $co = Db::name('good_platform')