feat: NG-15: 新会员注册时增加国家与语言选项.

common/models/forms/DeclarationForm.php

@@ -854,8 +854,8 @@ class DeclarationForm extends Model
         $userForm->userName = $this->insertUserName;
         $userForm->zcPv = $this->_decPv;
         $userForm->zcAmount = $this->_decAmount;
-        $userForm->conUserName = $this->conUserName;
-        $userForm->recUserName = $this->recUserName;
+        $userForm->conUserName = $this->recUserName;
+        $userForm->recUserName = $this->conUserName;
         $userForm->location = $this->location;
         $userForm->idCard = $this->mobile;
         $userForm->allData = $allData;

common/models/forms/UserForm.php

@@ -313,8 +313,8 @@ class UserForm extends Model
             $userInfoModel->USER_NAME = $insertUserName;
             $userInfoModel->ZC_PV = $zcPv;
             $userInfoModel->ZC_AMOUNT = $this->zcAmount;
-            $userInfoModel->CON_UID = $recUid;
-            $userInfoModel->CON_UID_ACTUAL = $conUid;
+            $userInfoModel->CON_UID = $conUid;
+            $userInfoModel->CON_UID_ACTUAL = $recUid;
             $userInfoModel->REC_UID = $recUid;
             $userInfoModel->SYSTEM_ID = $conUserInfo['SYSTEM_ID'];
             //$userInfoModel->PERIOD_NUM = $nowPeriodNum;