Merge branch 'master' of ssh://16.162.42.175:8013/guanli/ngds

backendApi/modules/v1/controllers/UserController.php

@@ -160,7 +160,7 @@ class UserController extends BaseController
 
             $condition = $filter['condition'];
             $params = $filter['params'];
-            $condition .= " AND UI.DELETED=0 AND U.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ")";
+            $condition .= " AND U.DELETED=0 AND U.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ")";
         } else {
             $condition = $filter['condition'] . ' AND U.DELETED=0' ?? ' AND U.DELETED=0';
             $params = $filter['params'];

backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -37,7 +37,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
         $orderQuery = Order::find()
             ->alias('O')
             ->where($this->condition, $this->params)
-            ->select('O.*,U.REAL_NAME,U.DEC_ID,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV,OG.STANDARD_PRICE,CS.NAME AS COUNTRY,CY.CODE AS CURRENCY, DO.DEC_ID AS ORDER_DEC_ID')
+            ->select('O.*,U.REAL_NAME,U.DEC_ID,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV,OG.STANDARD_PRICE,CS.NAME AS COUNTRY,CY.CODE AS CURRENCY, O.DEC_USER_ID AS ORDER_DEC_ID')
             ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
             ->join('LEFT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
             ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
@@ -52,7 +52,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
         $orderStandardQuery = ApproachOrder::find()
             ->alias('O')
             ->where($this->condition . ' AND (O.STATUS = :NOT_PAID OR O.STATUS = :FAIL_PAID)', $this->params)
-            ->select('O.*,U.REAL_NAME,U.DEC_ID,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV,OG.STANDARD_PRICE,CS.NAME AS COUNTRY,CY.CODE AS CURRENCY, DO.DEC_ID AS ORDER_DEC_ID')
+            ->select('O.*,U.REAL_NAME,U.DEC_ID,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV,OG.STANDARD_PRICE,CS.NAME AS COUNTRY,CY.CODE AS CURRENCY, O.DEC_USER_ID AS ORDER_DEC_ID')
             ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
             ->join('LEFT JOIN', ApproachOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
             ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
@@ -87,7 +87,8 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     $this->listData['list'][$key]['DEC_USER_NAME'] = Info::getUserNameByUserId($value['DEC_ID']);
                 }
             } else {
-                $this->listData['list'][$key]['DEC_USER_NAME'] = Info::getUserNameByUserId($value['ORDER_DEC_ID']);
+//                $this->listData['list'][$key]['DEC_USER_NAME'] = Info::getUserNameByUserId($value['ORDER_DEC_ID']);
+                $this->listData['list'][$key]['DEC_USER_NAME'] = $value['ORDER_DEC_ID'];
             }
 
             $CREATE_USER_ID = Info::getUserIdByUserName($value['CREATE_USER']);

common/models/forms/ApproachDeclarationForm.php

@@ -619,7 +619,8 @@ class ApproachDeclarationForm extends Model
                 }
 
                 // 报单中心汇率
-                $decCountryId = User::getEnCodeInfo(\Yii::$app->user->id)['COUNTRY_ID'];
+                $userInfo = User::findOne(\Yii::$app->user->id);
+                $decCountryId = $userInfo->COUNTRY_ID;
                 $decCountry = Countries::getById($decCountryId);
                 $decUserCurrencyRate = CurrencyConversions::getToUSDRate($decCountry['LOCAL_CURRENCY_ID']);
                 // 升级会员汇率
@@ -725,7 +726,7 @@ class ApproachDeclarationForm extends Model
                 return $decResult;
             } catch (\Exception $e) {
 //                throw new Exception(Form::formatErrorsForApi($e->getFile() . ' ' . $e->getLine() . ' ' . $e->getMessage()));
-                throw new Exception(Form::formatErrorsForApi($e->getMessage()));
+                throw new Exception(Form::formatErrorsForApi($e->getMessage() . ', ' . $e->getFile() . '(' . $e->getLine() . ')'));
             }
         }
         return true;
@@ -894,7 +895,7 @@ class ApproachDeclarationForm extends Model
         $orderModel->EXCHANGE_RATE = $userCurrencyRate;
         $orderModel->COUNTRY_ID = $userCountryId;
         $orderModel->CURRENCY_ID = $userCountry['LOCAL_CURRENCY_ID'] ?? 0;
-        $orderModel->DEC_USER_ID = Info::getUserNameByUserId(\Yii::$app->user->id);
+        $orderModel->DEC_USER_ID = Info::getUserNameByUserId($this->_decId);
         if ($this->province==1) {
             $orderModel->EXPRESS_TYPE = 1;
         }
@@ -916,7 +917,7 @@ class ApproachDeclarationForm extends Model
             $addressModel->USER_NAME = $this->insertUserName;
             $addressModel->CONSIGNEE = $this->consignee;
             $addressModel->MOBILE = $this->acceptMobile;
-            $addressModel->COUNTRY_ID = $userCountry['COUNTRY_ID'];
+            $addressModel->COUNTRY_ID = $userCountryId;
             $addressModel->PROVINCE = $this->province;
             $addressModel->CITY_NAME = $this->cityName;
             $addressModel->LGA_NAME = $this->lgaName;

common/models/forms/ApproachDeclarationLoopForm.php

@@ -219,7 +219,7 @@ class ApproachDeclarationLoopForm extends Model
             return $result;
         } catch (\Exception $e){
             $transaction->rollBack();
-            $this->addError('add', $e->getMessage());
+            $this->addError('add', $e->getMessage() . '; ' . $e->getLine() . '; ' . $e->getFile());
             return null;
         }
     }

common/models/forms/DeclarationForm.php

@@ -645,7 +645,8 @@ class DeclarationForm extends Model
             }
 
             // 报单中心汇率
-            $decCountryId = User::getEnCodeInfo(\Yii::$app->user->id)['COUNTRY_ID'];
+            $userInfo = User::findOne(\Yii::$app->user->id);
+            $decCountryId = $userInfo->COUNTRY_ID;
             $decCountry = Countries::getById($decCountryId);
             $decUserCurrencyRate = CurrencyConversions::getToUSDRate($decCountry['LOCAL_CURRENCY_ID']);
             // 升级会员汇率
@@ -942,7 +943,7 @@ class DeclarationForm extends Model
         $orderModel->EXCHANGE_RATE = $userCurrencyRate;
         $orderModel->COUNTRY_ID = $userCountryId;
         $orderModel->CURRENCY_ID = $userCountry['LOCAL_CURRENCY_ID'] ?? 0;
-        $orderModel->DEC_USER_ID = Info::getUserNameByUserId(\Yii::$app->user->id);
+        $orderModel->DEC_USER_ID = Info::getUserNameByUserId($this->_decId);
         if($this->province==1){
             $orderModel->EXPRESS_TYPE = 1;
         }

frontendApi/modules/v1/controllers/UserController.php

@@ -646,11 +646,17 @@ SQL;
             $post['type'] = DeclarationForm::TYPE_ZC;
 
             $allData['data'][] = $post;
-            if ($formModel->load($allData, '') && $result = $formModel->add()) {
-                //发送邮件
-                Email::sendRegistrationEmail($post['email'], $post['insertUserName'], $post['password']);
-                return static::notice($result);//报单成功
-            } else {
+
+            try {
+                if ($formModel->load($allData, '') && $result = $formModel->add()) {
+                    //发送邮件
+//                    Email::sendRegistrationEmail($post['email'], $post['insertUserName'], $post['password']);
+                    return static::notice($result);//报单成功
+                } else {
+                    return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
+                }
+            } catch (\Exception $e) {
+                LoggerTool::error($e->getMessage() . '; ' . $e->getLine() . '; ' . $e->getFile());
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
             }
         }