Merge branch 'feature/mod-import-order-excel' into new-version

common/models/forms/ExcelOrderShopForm.php

@@ -103,10 +103,10 @@ class ExcelOrderShopForm extends \common\components\ActiveRecord
             }
 
             //判断商城订单是表中是否已经存在该订单
-            $one = OrderShop::find()->select(["USER_ID", "PERIOD_NUM", "SN", "ORDER_AMOUNT", "PV", "PAY_AMOUNT", "PAY_PV"])->where('SN=:SN', ['SN' => $formatOrderGoodsData['ORDER_SN']])->asArray()->one();
+            $one = OrderShop::find()->select(["USER_ID", "PERIOD_NUM", "ORDER_DAY", "SN", "ORDER_AMOUNT", "PV", "PAY_AMOUNT", "PAY_PV"])->where('SN=:SN', ['SN' => $formatOrderGoodsData['ORDER_SN']])->asArray()->one();
             if ($one) {
 
-                if ( $one['PERIOD_NUM'] != $formatOrderData['PERIOD_NUM'] ) {
+                if ( $one['PERIOD_NUM'] != $formatOrderData['PERIOD_NUM'] || $one['ORDER_DAY'] != $orderDay) {
                     throw new \Exception(sprintf('订单号【%s】重复不可以导入', $formatOrderGoodsData['ORDER_SN']));
                 }