From ba1c90575c47f9cb5c2ce0a20da90d3b1739b5fa Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 26 四月 2022 11:47:45 +0800
Subject: [PATCH] 0425 Commit
---
force-app/main/default/classes/SBG203Rest.cls | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/force-app/main/default/classes/SBG203Rest.cls b/force-app/main/default/classes/SBG203Rest.cls
index fb055d9..439066d 100644
--- a/force-app/main/default/classes/SBG203Rest.cls
+++ b/force-app/main/default/classes/SBG203Rest.cls
@@ -33,6 +33,7 @@
public String BPCodeforeign; //鍏嶇◣
public String BPType; //鍚堜綔浼欎即绫诲瀷
public String RegisterAddress; //浣忔墍(绛夊悓娉ㄥ唽鍦板潃)
+ public String RegisterAddressEncrypted;// add by sushanhu 瀛樺偍register瀵嗘枃
public String RegionName; //鐪佸埆
public String City; //甯�
public String Phone; //鍚堜綔浼欎即鐢佃瘽
@@ -204,7 +205,6 @@
// 鍙栧緱鎺ュ彛浼犺緭鍐呭
String strData = RestContext.request.requestBody.toString();
GeDatas ges = (GeDatas) JSON.deserializeStrict(strData, GeDatas.class);
- NFMUtil.NFMResponse result = NFMUtil.getNFMResponse(); //add for pipl sushanhu 20220311
if (ges == null) {
return;
}
@@ -222,17 +222,23 @@
RestResponse res = RestContext.response;
res.addHeader('Content-Type', 'application/json');
res.statusCode = 200;
- //update response to aws 20220311 sushanhu for pipl start
- // String jsonResponse = '{"status": "0", "Message":""}';
- // res.responseBody = blob.valueOf(jsonResponse);
- //updata response toAWS
-
- result.SFStatus=SFStatus;
- result.SFMessage=SFMessage;
- String jsonResponse =JSON.serialize(result);
- system.debug('result---'+jsonResponse);
- res.responseBody = blob.valueOf(jsonResponse);
- //update response to aws 20220311 sushanhu for pipl end
+ // 娣诲姞aws涓婄嚎寮�鍏� by sushanhu 20220422
+ Boolean piOn =AWSServiceTool.getAWSServiceStatus();
+ // test
+ // piOn =false;
+ if (piOn) {
+ //update response to aws 20220311 sushanhu for pipl start
+ // result.SFStatus=SFStatus;
+ // result.SFMessage=SFMessage;
+ // String jsonResponse =JSON.serialize(result);
+ // system.debug('result---'+jsonResponse);
+ String jsonResponse = '{"staticResponse":{"status":"0","Message":""},"SFStatus":true,"SFMessage":""}' ;
+ res.responseBody = blob.valueOf(jsonResponse);
+ //update response to aws 20220311 sushanhu for pipl end
+ }else {
+ String jsonResponse = '{"status": "0", "Message":""}';
+ res.responseBody = blob.valueOf(jsonResponse);
+ }
return;
}
@@ -1112,15 +1118,13 @@
con.PhoneD__c = consigneeInfo.ContactPhone;
con.Postcode__c = consigneeInfo.PostalCode;
con.PostcodeD__c = consigneeInfo.PostalCode;
+ con.Address1__c = gda.BPType == '22' ? gda.RegisterAddress : consigneeInfo.ContactAddress;
+ con.Address1D__c = gda.BPType == '22' ? gda.RegisterAddress : consigneeInfo.ContactAddress;
//update to aws pi start 20220309 sushanhu
- // con.Address1__c = gda.BPType == '22' ? gda.RegisterAddress : consigneeInfo.ContactAddress;
- // con.Address1D__c = gda.BPType == '22' ? gda.RegisterAddress : consigneeInfo.ContactAddress;
// con.EnglishAddress__c = gda.BPType == '22' ? gda.STR_SUPPL1 : '';
//鍒ゆ柇鍦╝ws鎵ц
- con.Address1__c= consigneeInfo.ContactAddress;
- con.Address1D__c= consigneeInfo.ContactAddress;
- con.Address1_Encrypted__c = consigneeInfo.ContactAddressEncrypted;
- con.Address1D_Encrypted__c = consigneeInfo.ContactAddressEncrypted;
+ con.Address1_Encrypted__c = gda.BPType == '22' ? gda.RegisterAddressEncrypted : consigneeInfo.ContactAddressEncrypted;
+ con.Address1D_Encrypted__c = gda.BPType == '22' ? gda.RegisterAddressEncrypted : consigneeInfo.ContactAddressEncrypted;
con.Postcode_Encrypted__c = consigneeInfo.PostalCodeEncrypted;
con.PostcodeD_Encrypted__c = consigneeInfo.PostalCodeEncrypted;
//delete by sushanhu 鍜屽鎴锋矡閫� 鍚庢湡 涓嶈祴鍊艰繖涓瓧娈� satrt 20220411
@@ -1441,7 +1445,10 @@
}
// 灏嗕唬鐞嗗晢鐨勫悎浣滀紮浼村鎴疯缃负鍋�
accountInfo.Dealer_Type__c = NFMUtil.getMapValue(transferMap, 'Dealer_Type__c', gda.AgentType, iflog);
- accountInfo.EnglishAddress__c = gda.RegisterAddress;
+ //accountInfo.EnglishAddress__c = gda.RegisterAddress;
+ //update to oher1 add by sushanhu 20220422 start
+ accountInfo.EnglishAddress__c = gda.other1;
+ //update to oher1 add by sushanhu 20220422 end
} else if (gda.BPType == '22') {
accountInfo.RecordTypeId = '01228000000TF3Q'; //澶栬锤鍏徃
accountInfo.Name = gda.CompanyName;
@@ -1533,8 +1540,12 @@
accountInfo.EnglishNameD__c = gda.CompanyEnglishName;
accountInfo.City__c = gda.City;
accountInfo.CityD__c = gda.City;
- accountInfo.Address1__c = gda.RegisterAddress;
- accountInfo.Address1D__c = gda.RegisterAddress;
+ //update to oher1 add by sushanhu 20220422 start
+ // accountInfo.Address1__c = gda.RegisterAddress;
+ // accountInfo.Address1D__c = gda.RegisterAddress;
+ accountInfo.Address1__c = gda.other1;
+ accountInfo.Address1D__c = gda.other1;
+ //update to oher1 add by sushanhu 20220422 end
accountInfo.Phone = gda.Phone;
accountInfo.PhoneD__c = gda.Phone;
accountInfo.Fax = gda.Fax;
--
Gitblit v1.9.1