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

app/admin/controller/OrderImport.php

@@ -29,34 +29,11 @@ class OrderImport extends Base
             $createrid = isset($user["data"]['id']) ? $userinfo["data"]['id'] : 0;
             $creater = isset($user["data"]['nickname']) ? $userinfo["data"]['nickname'] : "";
 
-
-            $val = Validate::rule([
-                'platform_code|平台订单号' => 'require|length:0,255',
-                'po_code|其他单号' => 'length:0,255',
-                'platform_time|平台下单时间' => 'require|date',
-                'sale_source|销售渠道' => 'require|length:0,255',
-                'plat_code|平台商品编号' => 'require|length:0,255',
-                'price|单价' => 'require|float',
-                'num|数量' => 'require|number',
-                'before_discount_all_price|优惠前总金额' => 'require|float',
-                'discount_price|优惠金额' => 'require|float',
-                'after_price|商品优惠后金额' => 'require|float',
-                'activity_name|优惠活动名称' => 'length:0,255',
-                'mode|收费模式' => 'require|length:0,255',
-                'order_remark|订单备注' => 'length:0,255',
-                'contactor|收货人' => 'require|length:0,255',
-                'mobile|联系电话' => 'require|length:0,20',
-                'addr|联系地址' => 'require|length:0,255',
-            ]);
-
             $insert_data = [];
             foreach ($param['list'] as $key => $value) {
-                if (!$val->check($value)) throw new \think\Exception('第' . (string)($key + 1) . '行数据格式有问题，' . $val->getError());
-                else {
-                    $value['createrid'] = $createrid;
-                    $value['creater'] = $creater;
-                    $insert_data[] = $value;
-                }
+                $value['createrid'] = $createrid;
+                $value['creater'] = $creater;
+                $insert_data[] = $value;
             }
 
             $res = Db::name('order_import_from_c')
@@ -130,35 +107,38 @@ class OrderImport extends Base
             ->where('c.id', $id)
             ->find();
 
-        $info['platform_names'] = Db::name('platform')
-            ->whereIn('platform_code', $info['platform_codes'])
-            ->where(['is_del' => 0, 'status' => 1])
-            ->column('platform_name');
-
-        $info['addr_name'] = GetAddr($info['addr_code']);
-
-        //导入字段
-        $res['import'] = [
-            'platform_code' => $info['platform_code'],
-            'platform_time' => $info['platform_time'],
-            'plat_code' => $info['plat_code'],
-            'sale_source' => $info['sale_source'],
-            'price' => $info['price'],
-            'num' => $info['num'],
-            'before_discount_all_price' => $info['before_discount_all_price'],
-            'activity_name' => $info['activity_name'],
-            'discount_price' => $info['discount_price'],
-            'after_price' => $info['after_price'],
-            'mode' => $info['mode'],
-            'order_remark' => $info['order_remark'],
-            'contactor' => $info['contactor'],
-            'mobile' => $info['mobile'],
-            'addr' => $info['addr'],
-        ];
-        //确认字段
-        $res['confirm'] = $info;
-
-        return app_show(0, '请求成功', $res);
+        if ($info) {
+            $info['platform_names'] = Db::name('platform')
+                ->whereIn('platform_code', $info['platform_codes'])
+                ->where(['is_del' => 0, 'status' => 1])
+                ->column('platform_name');
+
+            $info['addr_name'] = GetAddr($info['addr_code']);
+
+            //导入字段
+            $res['import'] = [
+                'platform_code' => $info['platform_code'],
+                'platform_time' => $info['platform_time'],
+                'plat_code' => $info['plat_code'],
+                'sale_source' => $info['sale_source'],
+                'price' => $info['price'],
+                'num' => $info['num'],
+                'before_discount_all_price' => $info['before_discount_all_price'],
+                'activity_name' => $info['activity_name'],
+                'discount_price' => $info['discount_price'],
+                'after_price' => $info['after_price'],
+                'mode' => $info['mode'],
+                'order_remark' => $info['order_remark'],
+                'contactor' => $info['contactor'],
+                'mobile' => $info['mobile'],
+                'addr' => $info['addr'],
+            ];
+            //确认字段
+            $res['confirm'] = $info;
+
+            return app_show(0, '请求成功', $res);
+
+        } else  return error_show(1005, '系统尚未解析完成，无法查看详情,请等待');
 
     }
 
@@ -196,6 +176,28 @@ class OrderImport extends Base
             ->limit(10)
             ->cursor();
 
+
+        /**
+         * $val = Validate::rule([
+         * 'platform_code|平台订单号' => 'require|length:0,255',
+         * 'po_code|其他单号' => 'length:0,255',
+         * 'platform_time|平台下单时间' => 'require|date',
+         * 'sale_source|销售渠道' => 'require|length:0,255',
+         * 'plat_code|平台商品编号' => 'require|length:0,255',
+         * 'price|单价' => 'require|float',
+         * 'num|数量' => 'require|number',
+         * 'before_discount_all_price|优惠前总金额' => 'require|float',
+         * 'discount_price|优惠金额' => 'require|float',
+         * 'after_price|商品优惠后金额' => 'require|float',
+         * 'activity_name|优惠活动名称' => 'length:0,255',
+         * 'mode|收费模式' => 'require|length:0,255',
+         * 'order_remark|订单备注' => 'length:0,255',
+         * 'contactor|收货人' => 'require|length:0,255',
+         * 'mobile|联系电话' => 'require|length:0,20',
+         * 'addr|联系地址' => 'require|length:0,255',
+         * ]);
+         */
+
         foreach ($list as $value) {
 
             Db::startTrans();
@@ -288,10 +290,10 @@ class OrderImport extends Base
     }
 
     //【辅助2】接口2-获取销售渠道备选数据：入参所在平台Id,响应：销售渠道备选数据
-    public function getSourceDataByPlatformId(){
-
-        $platform_id = $this->request->post('platform_id/d',0,'trim');
+    public function getSourceDataByPlatformId()
+    {
 
+        $platform_id = $this->request->post('platform_id/d', 0, 'trim');
 
 
     }