From b823c7f3569cf9368e2245846e918f78f32e903a Mon Sep 17 00:00:00 2001
From: GWY <guweiyiscp096@foxmail.com>
Date: 星期五, 15 四月 2022 11:38:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlympusSSBG
---
force-app/main/default/classes/SBG203Rest.cls | 68 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/SBG203Rest.cls b/force-app/main/default/classes/SBG203Rest.cls
index 2d69b2c..fb055d9 100644
--- a/force-app/main/default/classes/SBG203Rest.cls
+++ b/force-app/main/default/classes/SBG203Rest.cls
@@ -1,5 +1,10 @@
@RestResource(urlMapping = '/SBG203/*')
global with sharing class SBG203Rest {
+ //add Response to aws 20220311 add sushanhu for pipl
+
+ static Boolean SFStatus=true;
+ static String SFMessage='';
+ //add Response to aws 20220311 add sushanhu for pipl
global class GeDatas {
public NFMUtil.Monitoring Monitoring;
@@ -125,6 +130,19 @@
public String ContactMobilePhone; //鏀惰揣浜烘墜鏈�
public String CITY1; //鏀惰揣浜哄煄甯�
public String ContactEnglishName; //鑻辨枃鍚嶇О
+ // add for pi sushanhu 20220309 start
+ public String ContactNameEncrypted; //鏀惰揣浜哄悕绉板瘑鏂�
+ public String ContactPhoneEncrypted; //鏀惰揣浜虹數璇濆瘑鏂�
+ public String PostalCodeEncrypted; //閭紪瀵嗘枃
+ public String ContactAddressEncrypted; //鏀惰揣鍦板潃瀵嗘枃
+ public String ContactMobilePhoneEncrypted; //鏀惰揣浜烘墜鏈哄瘑鏂�
+ public String ContactEnglishNameEncrypted; //鑻辨枃鍚嶇О瀵嗘枃
+ //delete by sushanhu 鍜屽鎴锋矡閫� 鍚庢湡 涓嶈祴鍊艰繖涓瓧娈� satrt 20220411
+ // public String EnglishAddress; //鑻辨枃鍦板潃
+ // public String EnglishAddressEncrypted;// 鑻辨枃鍦板潃瀵嗘枃
+ //delete by sushanhu 鍜屽鎴锋矡閫� 鍚庢湡 涓嶈祴鍊艰繖涓瓧娈� end 20220411
+ public String DataId; //aws瀛樺偍鍑嵁
+ // add for pi sushanhu 20220309 end
}
// 閿�鍞汉灞傜骇
@@ -186,7 +204,7 @@
// 鍙栧緱鎺ュ彛浼犺緭鍐呭
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;
}
@@ -204,8 +222,17 @@
RestResponse res = RestContext.response;
res.addHeader('Content-Type', 'application/json');
res.statusCode = 200;
- String jsonResponse = '{"status": "0", "Message":""}';
+ //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
return;
}
@@ -1085,18 +1112,45 @@
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;
- con.EnglishAddress__c = gda.BPType == '22' ? gda.STR_SUPPL1 : '';
+ //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.Postcode_Encrypted__c = consigneeInfo.PostalCodeEncrypted;
+ con.PostcodeD_Encrypted__c = consigneeInfo.PostalCodeEncrypted;
+ //delete by sushanhu 鍜屽鎴锋矡閫� 鍚庢湡 涓嶈祴鍊艰繖涓瓧娈� satrt 20220411
+ // con.EnglishAddress__c = gda.BPType == '22' ? consigneeInfo.EnglishAddress : '';
+ // con.EnglishAddress_Encrypted__c=gda.BPType == '22' ?consigneeInfo.EnglishAddressEncrypted : '';
+ //delete by sushanhu 鍜屽鎴锋矡閫� 鍚庢湡 涓嶈祴鍊艰繖涓瓧娈� end 20220411
+ //update to aws pi start 20220309 sushanhu end
if (String.isNotBlank(consigneeInfo.ContactEnglishName) && gda.BPType == '22') {
- con.LastName = consigneeInfo.ContactName + '(' + consigneeInfo.ContactEnglishName + ')';
+ //update for pipl 鍜屽鎴锋矡閫� 瀵嗘枃鏄剧ず浣嶆暟涓嶅彉 20220411 start
+ // con.LastName = consigneeInfo.ContactName + '(' + consigneeInfo.ContactEnglishName + ')';
+ con.LastName = consigneeInfo.ContactName ;
+ //update for pipl 鍜屽鎴锋矡閫� 瀵嗘枃鏄剧ず浣嶆暟涓嶅彉 20220411 end
+
con.FirstName = null;
+ con.FirstName_Encrypted__c =null; ////add for pipl susahnhu 20220311
con.ContactEnglishName__c = consigneeInfo.ContactEnglishName;
+ con.ContactEnglishName_Encrypted__c= consigneeInfo.ContactEnglishNameEncrypted;//add for pipl susahnhu 20220311
} else {
con.LastName = consigneeInfo.ContactName;
con.FirstName = null;
+ con.FirstName_Encrypted__c =null; ////add for pipl susahnhu 20220311
}
-
+ //add for pipl susahnhu 20220311 start
+ con.LastName_Encrypted__c = consigneeInfo.ContactNameEncrypted;
+ con.AWS_Data_Id__c = consigneeInfo.DataId;// AWS 瀛樺偍鍑嵁 add for pipl susahnhu 20220311
+ con.MobilePhone_Encrypted__c = consigneeInfo.ContactPhoneEncrypted;
+ con.MobilePhoneD_Encrypted__c = consigneeInfo.ContactPhoneEncrypted;
+ con.Phone_Encrypted__c = consigneeInfo.ContactPhoneEncrypted;
+ con.PhoneD_Encrypted__c = consigneeInfo.ContactPhoneEncrypted;
+ //add for pipl susahnhu 20220311 end
con.ContactStatus__c = 'Active';
con.ContactStatusD__c = 'Active';
con.StatusD__c = 'Pass';
--
Gitblit v1.9.1