外部订单、外部报单导入相关

backendApi/config/menu.php

@@ -52,9 +52,9 @@ return [
             ['name'=>'订单发货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-delivery', 'routePath'=>'shop/order-delivery', 'show'=>0,],
             ['name'=>'Remain BV', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'remain-pv', 'routePath'=>'shop/remain-pv', 'show'=>1,], // 剩余BV
             ['name'=>'Remain BV Flow', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'flow-remain-pv', 'routePath'=>'shop/flow-remain-pv', 'show'=>1,], // 剩余BV流水
-//            ['name'=>'External mall order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-shop-list', 'routePath'=>'shop/order-shop-list', 'show'=>1,],//外部商城订单列表
-            // ['name'=>'External mall entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-dec-list', 'routePath'=>'shop/order-dec-list', 'show'=>1,],//外部商城报单列表
-            // ['name'=>'List of qualified orders of external mall', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-standard-list', 'routePath'=>'shop/order-standard-list', 'show'=>1,],//外部商城达标订单列表
+            ['name'=>'External mall order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-shop-list', 'routePath'=>'shop/order-shop-list', 'show'=>1,], // 外部商城订单列表
+            ['name'=>'External mall entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-dec-list', 'routePath'=>'shop/order-dec-list', 'show'=>1,], // 外部商城报单列表
+            // ['name'=>'List of qualified orders of external mall', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-standard-list', 'routePath'=>'shop/order-standard-list', 'show'=>1,], // 外部商城达标订单列表
 
         ]
     ],

backendApi/modules/v1/controllers/ShopController.php

@@ -459,7 +459,7 @@ class ShopController extends BaseController {
         ]);
         $condition = $filter['condition'];
         $params = $filter['params'];
-        $condition .= ' 1=1 AND O.IS_DELETE=0';
+        $condition .= ' AND O.IS_DELETE=0';
         $listObj = new OrderDecList();
         $data = $listObj->getList(['condition'=>$condition, 'params'=>$params]);
         return static::notice($data);
@@ -498,7 +498,7 @@ class ShopController extends BaseController {
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('发生错误：' . $errorMsg, 400);
+                return static::notice('Error：' . $errorMsg, 400);
             }
         }
     }
@@ -554,7 +554,7 @@ class ShopController extends BaseController {
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('发生错误：' . $errorMsg, 400);
+                return static::notice('Error：' . $errorMsg, 400);
             }
         }
     }

common/helpers/Excel.php

@@ -806,7 +806,8 @@ class Excel extends BaseObject {
             $limit = $limit - 1;
         }
         $fileNameArray = ExcelImport::find()->select('U.FILE_NAME')->from(ExcelImport::tableName() . ' AS ET')->join('LEFT JOIN', Uploads::tableName() . ' AS U', 'ET.UPLOAD_ID=U.ID')->where('ET.ID=:ID', [':ID' => $excelImportId])->asArray()->one();
-        $filePath = \Yii::getAlias('@common/runtime/uploads/' . $fileNameArray['FILE_NAME']);
+//        $filePath = \Yii::getAlias('@common/runtime/uploads/' . $fileNameArray['FILE_NAME']);
+        $filePath = '/ng/Volumes/HDD/workshop/old/ar.upload.ming/files/' . $fileNameArray['FILE_NAME'];
         if ($startRow > $rowCount) {
             return 0;
         }

common/models/OrderGoodsShop.php

@@ -56,6 +56,7 @@ class OrderGoodsShop extends \common\components\ActiveRecord
             'ORDER_SN' => '订单ID',
             'GOODS_TITLE' => '商品名称',
             'PRICE' => '价格',
+            'PRICE_STANDARD' => '标准价格',
             'REAL_PRICE' => '实际价格',
             'PV' => '订货BV',
             'REAL_PV' => '实际BV',

common/models/forms/ExcelOrderDecForm.php

@@ -46,9 +46,10 @@ class ExcelOrderDecForm extends \common\components\ActiveRecord
         '存货名称' => 'GOODS_TITLE',
         '数量' => 'BUY_NUMS',
         '商品单价' => 'PRICE',
+        '商品标准单价' => 'PRICE_STANDARD',
         '商品金额' => 'REAL_PRICE',
-        '商品BV' => 'PV',
-        'BV合计' => 'REAL_PV',
+        '商品PV' => 'PV',
+        'PV合计' => 'REAL_PV',
         '期数' => 'PERIOD_NUM',
     ];
 

common/models/forms/ExcelOrderShopForm.php

@@ -46,9 +46,10 @@ class ExcelOrderShopForm extends \common\components\ActiveRecord
         '存货名称' => 'GOODS_TITLE',
         '数量' => 'BUY_NUMS',
         '商品单价' => 'PRICE',
+        '商品标准单价' => 'PRICE_STANDARD',
         '商品金额' => 'REAL_PRICE',
-        '商品BV' => 'PV',
-        'BV合计' => 'REAL_PV',
+        '商品PV' => 'PV',
+        'PV合计' => 'REAL_PV',
         '期数' => 'PERIOD_NUM',
     ];
 

common/models/forms/UploadForm.php

@@ -189,7 +189,7 @@ class UploadForm extends Model {
                 $uploadInfo = [
                     'fileName' => $fileName . '.' . $this->file->extension,
                     'category' => $uploadCategory,
-                    'url' => $fileName . '.' . $this->file->extension,
+                    'url' => $localPath,
                     'fileSize' => null,
                     'md5' => null,
                 ];