From 379686996b011828cd7a44a96ee68408b4d267ec Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 11 三月 2022 12:38:11 +0800
Subject: [PATCH] Merge branch 'PIPLFunctionStage20220310'
---
force-app/main/default/classes/NFM103Controller.cls | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/NFM103Controller.cls b/force-app/main/default/classes/NFM103Controller.cls
index c8e163b..0913c9f 100644
--- a/force-app/main/default/classes/NFM103Controller.cls
+++ b/force-app/main/default/classes/NFM103Controller.cls
@@ -103,6 +103,9 @@
public String ReturnType;//杩斿搧鏂瑰紡
public String UpdateStatus;//鐩磋繑淇敼鏍囪瘑
//add by wangweipeng 2021/07/14 end
+ //add pi 鍔犲瘑 sushanhu 20220222 start
+ public String DataId;//AWS瀛樺偍鍑瘉
+ //add pi 鍔犲瘑 sushanhu 20220222 end
}
////NFM103淇敼Rest end
@@ -283,7 +286,7 @@
List<Repair__c> recptList = [select
Id, Name, Workshop__c, SalesOfficeCode__c,
Repair_Detail__c, RepairSource__c, On_site_repair__c, PaperRepairRequestNo__c,
- Failure_Occurrence_Date__c,Failure_Occurrence_Date2__c, On_Site_Repair_Order_Date__c, Send_To_RC_Date__c,
+ Failure_Occurrence_Date__c, On_Site_Repair_Order_Date__c, Send_To_RC_Date__c,
Hospital__r.Management_Code__c, Account__r.Management_Code__c, Dealer__r.Management_Code__c,
Incharge_Staff__r.alias, Incharge_Staff_Email__c, Incharge_Staff_Contact__c, Incharge_Staff_Contact__r.Name, CreatedBy.Alias, CreatedBy.Email,
Delivered_Product__r.Product2.Asset_Model_No__c, Delivered_Product__r.SerialNumber, Delivered_Product__r.LastSFDCRepairNo__c,
@@ -327,7 +330,7 @@
,Returns_Product_way__c //杩斿搧鏂瑰紡
,FSE_ApplyForRepair_time__c //鐢宠淇悊鏃堕棿
//add by wangweipeng 2021/07/14 start
-
+ ,AWS_Data_Id__c //add by sushanhu AWSDateID for PIPL
from Repair__c where Id IN :repairIds]; // 鍓婇櫎銉囥兗銈裤倰妞滅储銇椼仾銇勩伅銇氥�丄ll ROWS 銇勩倝銇亜銇仛
System.debug(Logginglevel.DEBUG, 'NFM103_ recptList.size()=' + recptList.size());
@@ -472,7 +475,11 @@
element.Postal = rpr.address_ZipCode__c; //閭紪
element.ReturnType = NFMUtil.getMapValue(ReturnsProductWayMap,'Returns_Product_way__c', rpr.Returns_Product_way__c, iflog);//杩斿搧鏂瑰紡
element.UpdateStatus = rpr.Address_type__c; //鐢宠淇悊鏃堕棿
- //add by wangweipeng 2021/07/14 start
+ //add by wangweipeng 2021/07/14 end
+ //add pi 瀵嗘枃 sushanhu 20220222 start
+ element.DataId =rpr.AWS_Data_Id__c;//aws瀛樺偍鍑瘉
+ //add pi 瀵嗘枃 sushanhu 20220222 end
+
}
if (repairRequest.GeneralData.size() > 0) {
@@ -571,10 +578,24 @@
// NFM103淇敼Rest end
// WLIG-BXQBH6 start
- NFMUtil.response response =
- NFMUtil.sendToSapStatusAndBody(rowDataStr, NFMUtil.NFM103_ENDPOINT);
- status = response.status;
+ // NFMUtil.response response =
+ // NFMUtil.sendToSapStatusAndBody(rowDataStr, NFMUtil.NFM103_ENDPOINT);
+ //update to aws 20220222 sushanhu start for PIPL
+ NFMUtil.response res = NFMUtil.getAwsToken();
+ String token=res.responseBody;
+ if(String.isBlank(token)){
+ iflog.ErrorLog__c='NFM103'+'鑾峰彇aws token 澶辫触';
+
+ }
+ NFMUtil.response response = NFMUtil.sendToPiAWS(rowDataStr, NFMUtil.NFM103_ENDPOINT,token);
+ //update to aws 20220222 sushanhu end for PIPL
+ status = response.status;
+ system.debug('AWS Response status:'+status);
ResponseBody = response.responseBody;
+ //update to aws 20220302 sushanhu start for PIPL
+ Map<String, Object> results = (Map<String, Object>)JSON.deserializeUntyped(ResponseBody);
+ system.System.debug('NGM103 AWS result--'+ ResponseBody);
+ //update to aws 20220302 sushanhu end for PIPL
NFM103Response NFM103Response = new NFM103Response();
system.debug(ResponseBody);
if (string.isNotEmpty(ResponseBody)) {
@@ -599,6 +620,14 @@
// 鍘熷墖闈炲悓鏈熴仹銇欍伄銇с�乴ogs銈掔⒑瑾嶃仚銈嬪繀瑕併亴銇亜銇с仐銈囥亞銆�
if (status == 'OK') {
rowData.retry_cnt__c = 0;
+ //add wangweipeng 2022/02/18 start
+ //濡傛灉涓簍rue锛岃瘉鏄庢槸閲嶆柊鍙戦�佺殑鎺ュ彛锛岄渶瑕佹妸鏃ュ織璁板綍涓�
+ if(needUpdateIflog){
+ logstr += 'Status:' + status;
+ logstr += '\nResponse:' + responseBody;
+ logstr += '\nend';
+ }
+ //add wangweipeng 2022/02/18 start
} else {
if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0;
if (rowData.retry_cnt__c < batch_retry_max_cnt) {
--
Gitblit v1.9.1