gzw 测试环境代码更新

高章伟

2023-03-03 d8dc84a3d56df839895f1c417a4d9cbee763d262

 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);
                        }