From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/NFM203Rest.cls | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/classes/NFM203Rest.cls b/force-app/main/default/classes/NFM203Rest.cls
index bbb2c9b..cad8fb9 100644
--- a/force-app/main/default/classes/NFM203Rest.cls
+++ b/force-app/main/default/classes/NFM203Rest.cls
@@ -96,13 +96,13 @@
// 鏀惰揣浜哄眰绾�
global class Consignee_Info {
public String ContactName;
- public String ContactNameEncrypted;//add 20220221
+ //public String ContactNameEncrypted;//add 20220221 //zhj鏂版柟妗堟敼閫� 2022-12-07
public String ContactPhone;
- public String ContactPhoneEncrypted;//add 20220221
+ //public String ContactPhoneEncrypted;//add 20220221 //zhj鏂版柟妗堟敼閫� 2022-12-07
public String PostalCode;
- public String PostalCodeEncrypted;//add 20220221
+ //public String PostalCodeEncrypted;//add 20220221 //zhj鏂版柟妗堟敼閫� 2022-12-07
public String ContactAddress;
- public String ContactAddressEncrypted;//add 20220221
+ //public String ContactAddressEncrypted;//add 20220221 //zhj鏂版柟妗堟敼閫� 2022-12-07
public String ContactCity; //鏈夋晥鏀惰揣浜哄煄甯�
public String ContactDataId;// add 20220221 CONTACT aws 瀛樺偍id
public String AddressDataId;// add 2020221 adress aws 瀛樺偍id
@@ -226,7 +226,7 @@
Internal_value__c
from BatchIF_Transfer__c
where Dropped_Flag__c = false
- and Table__c = 'Account'];
+ and (Table__c = 'Account' OR Table__c = 'NFM203Rest')];
for (BatchIF_Transfer__c t : transferList) {
transferMap.put(t.Column__c + t.External_value__c, t.Internal_value__c);
}
@@ -653,8 +653,10 @@
if (String.isNotBlank(contractInfos.ContractOwner) && contractOwnerMap.size() > 0) {
contractInfoAcc.Business_Assistant__c = contractOwnerMap[0].Id;
}
-
- contractInfoAcc.Contract_Fiscal_Period__c = contractInfos.TermContractNo.split('-')[0];
+ // GZW 220621 OCSM鏈熶紭鍖� start
+ // contractInfoAcc.Contract_Fiscal_Period__c = contractInfos.TermContractNo.split('-')[0];
+ contractInfoAcc.Contract_Fiscal_Period__c = NFMUtil.getMapValue(transferMap, 'Contract_Fiscal_Period__c', string.valueof(contractInfos.TermContractNo.split('-')[0]), iflog);
+ // GZW 220621 OCSM鏈熶紭鍖� end
contractInfoAcc.Agency_Application_Situation__c = '鎵胯獚娓堛伩';
contractInfoAcc.Name = contractInfos.TermContractNo + ':' + gda.CompanyName;
contractInfoAcc.SpecialDealerName__c = gda.CompanyName;
@@ -1253,9 +1255,9 @@
// SFDC鐢佃瘽閲嶅浜哄憳鍒涘缓淇℃伅纭 pk 2022-2-28 end
contact.Ignore_Same_Name__c = true;//涓嶆槸閲嶅鐨勫鎴峰悕 璺宠繃 瀹㈡埛浜哄憳鍚嶅瓧宸插瓨鍦� 楠岃瘉
// add pi 瀵嗘枃 start 20220221 sushanhu
- contact.Phone_Encrypted__c = info.ContactPhoneEncrypted;
- contact.MobilePhone_Encrypted__c = info.ContactPhoneEncrypted;
- contact.LastName_Encrypted__c =info.ContactNameEncrypted;
+ //contact.Phone_Encrypted__c = info.ContactPhoneEncrypted; //zhj鏂版柟妗堟敼閫� 2022-12-07
+ //contact.MobilePhone_Encrypted__c = info.ContactPhoneEncrypted; //zhj鏂版柟妗堟敼閫� 2022-12-07
+ //contact.LastName_Encrypted__c =info.ContactNameEncrypted; //zhj鏂版柟妗堟敼閫� 2022-12-07
contact.AWS_Data_Id__c = info.ContactDataId;
// add pi 瀵嗘枃 end 20220221 sushanhu
insertContactList.add(contact);
@@ -1267,7 +1269,7 @@
addressData.Customer__c = accountId;//瀹㈡埛
addressData.IsFromSPO__c = true;//鏄惁SPO鏉ユ簮
addressData.Telephone__c = contactPhone;//鐢佃瘽
- addressData.Telephone_Encrypted__c =info.ContactPhoneEncrypted;//鐢佃瘽瀵嗘枃 add sushanhu for pi 20220304
+ //addressData.Telephone_Encrypted__c =info.ContactPhoneEncrypted;//鐢佃瘽瀵嗘枃 add sushanhu for pi 20220304 //zhj鏂版柟妗堟敼閫� 2022-12-07
addressData.Address_Classification__c = '缁忛攢鍟�';//鍦板潃鍒嗙被
addressData.Detailed_Address__c = info.ContactAddress;//璇︾粏鍦板潃
// 鍥犳帴鍙ｄ笉浼犺緭鐪侊紝瀵艰嚧淇濆瓨鏃舵姤閿欍�傚洜姝ゅ皢鍏舵敞鎺�,鍩庡競瀛楁涓嶈祴鍊� XHL 20210823
@@ -1276,7 +1278,7 @@
// }
// add pi 瀵嗘枃 start sushanhu 20220221
addressData.AWS_Data_Id__c =info.AddressDataId;
- addressData.Detailed_Address_Encrypted__c =info.ContactAddressEncrypted;
+ //addressData.Detailed_Address_Encrypted__c =info.ContactAddressEncrypted; //zhj鏂版柟妗堟敼閫� 2022-12-07
// add pi 瀵嗘枃 end sushanhu 20220221
String mapkey = accountCode + contactName;
@@ -1309,7 +1311,10 @@
String mapkey = accountCode + contact.FullName__c;
if (insertAddressMap.containsKey(mapkey)) {
Address__c addressData = insertAddressMap.get(mapkey);
- addressData.Contacts__c = contact.Id;//鑱旂郴浜�
+ // addressData.Contacts__c = contact.Id;//鑱旂郴浜�
+ // WLIG-CCX4BB 銆愬鎵樸�戜慨鐞嗙洿杩旀敹璐у湴鍧�鍔熻兘鏀归�� thh 20220516 start
+ addressData.ContactName__c = contact.Name;
+ // WLIG-CCX4BB 銆愬鎵樸�戜慨鐞嗙洿杩旀敹璐у湴鍧�鍔熻兘鏀归�� thh 20220516 end
//addressData.Name = accountName + '_'+ contact.Name;//鏀惰揣鍦板潃鍚嶇О
insertAddressList.add(addressData);
}
--
Gitblit v1.9.1