From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 02 三月 2023 17:51:57 +0800
Subject: [PATCH] gzw 正式环境最新代码更新
---
force-app/main/default/classes/NFM007Controller.cls | 403 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 349 insertions(+), 54 deletions(-)
diff --git a/force-app/main/default/classes/NFM007Controller.cls b/force-app/main/default/classes/NFM007Controller.cls
index e21d6cd..c51a037 100644
--- a/force-app/main/default/classes/NFM007Controller.cls
+++ b/force-app/main/default/classes/NFM007Controller.cls
@@ -75,7 +75,7 @@
//CHAN-BDPBVY 20190703 end
public static boolean isRunning = false;
public static String debug_msg = '';
-
+ // 20220921 ljh SWAG-CG2A7S update start
/**
* NFM007銇�佷俊鍑︾悊
*
@@ -85,6 +85,19 @@
*/
@future (callout=true)
public static void callout(String iflog_Id, List<String> oppIds, Map<String, String> purposeOfAdviceMap) {
+ calloutNotfuture(iflog_Id,oppIds,purposeOfAdviceMap);
+ }
+ // 20220921 ljh SWAG-CG2A7S update end
+
+ /**
+ * NFM007銇�佷俊鍑︾悊
+ *
+ * @param iflog_Id 銉偘銉嗐兗銉栥儷銇甀d
+ * @param oppIds 閫佷俊瀵捐薄鍟嗚珖(璜栫悊涓�1浠躲伄銇裤仹銇�)
+ * @param purposeOfAdviceMap 1:Delete 2:Add(Insert) 3:Change(Update)
+ */
+ // @future (callout=true)
+ public static void calloutNotfuture(String iflog_Id, List<String> oppIds, Map<String, String> purposeOfAdviceMap) {
if (oppIds == null || oppIds.size() == 0) {
return;
}
@@ -371,17 +384,32 @@
}
system.debug(' detail.PROCODE=='+detail.PROCODE);
//WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� fy start
- if(opp.Trade__c == '澶栬部'){
- detail.GuaranteeType = promotionSalesProductsList.get(i).latestWarrantyType__c+',';// 淇濅慨绫诲埆
- }else{
+ detail.GuaranteeType =',';
+ if(String.isNotBlank(promotionSalesProductsList.get(i).latestWarrantyType__c)){
Date nowDate = Date.today();
- // Date baojidate = Date.valueOf('2022-4-1');
Date baojidate = Date.newInstance(2022,3,30);
- if(baojidate<=nowDate){
+ Date baojidatewai = Date.newInstance(2022,8,1);
+ if(opp.Trade__c == '鍐呰部'&&baojidate<=nowDate&&promotionSalesProductsList.get(i).latestWarrantyType__c=='甯傚満澶氬勾淇濅慨'){
detail.GuaranteeType = promotionSalesProductsList.get(i).latestWarrantyType__c+',new';
- }else{
- detail.GuaranteeType = promotionSalesProductsList.get(i).latestWarrantyType__c+',';
}
+ // detail.GuaranteeType = promotionSalesProductsList.get(i).latestWarrantyType__c+',';// 淇濅慨绫诲埆
+ else{
+ // Date nowDate = Date.today();
+ // // Date baojidate = Date.valueOf('2022-4-1');
+ // Date baojidate = Date.newInstance(2022,3,30);
+ // if(baojidate<=nowDate&&promotionSalesProductsList.get(i).latestWarrantyType__c=='甯傚満澶氬勾淇濅慨'){
+ // detail.GuaranteeType = promotionSalesProductsList.get(i).latestWarrantyType__c+',new';
+ // }else{
+ if(opp.Trade__c == '澶栬部'&&baojidatewai<=nowDate&&promotionSalesProductsList.get(i).latestWarrantyType__c=='甯傚満澶氬勾淇濅慨'){
+ detail.GuaranteeType = promotionSalesProductsList.get(i).latestWarrantyType__c+',new';
+ }else{
+ detail.GuaranteeType = promotionSalesProductsList.get(i).latestWarrantyType__c+',';
+ }
+ // detail.GuaranteeType = promotionSalesProductsList.get(i).latestWarrantyType__c+',';
+ // }
+ }
+ }else{
+ detail.GuaranteeType =',';
}
//WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� fy end
// detail.GuaranteeType = promotionSalesProductsList.get(i).latestWarrantyType__c; // 淇濅慨绫诲埆
@@ -487,33 +515,37 @@
//淇濅慨绫诲埆
if(oppLiList.get(i).latestWarrantyType__c != null){
//WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� fy start
- if(opp.Trade__c == '澶栬部'){
- detail.GuaranteeType = oppLiList.get(i).latestWarrantyType__c+',';// 淇濅慨绫诲埆
- }else{
- Date nowDate = Date.today();
- // Date baojidate = Date.valueOf('2022-4-1');
- Date baojidate = Date.newInstance(2022,3,30);
- if(baojidate<=nowDate){
+ Date nowDate = Date.today();
+ Date baojidate = Date.newInstance(2022,3,30);
+ Date baojidatewai = Date.newInstance(2022,8,1);
+ if(opp.Trade__c == '鍐呰部'&&baojidate<=nowDate&&oppLiList.get(i).latestWarrantyType__c=='甯傚満澶氬勾淇濅慨'){
+ detail.GuaranteeType = oppLiList.get(i).latestWarrantyType__c+',new';
+ }
+ else{
+ if(opp.Trade__c == '澶栬部'&&baojidatewai<=nowDate&&oppLiList.get(i).latestWarrantyType__c=='甯傚満澶氬勾淇濅慨'){
detail.GuaranteeType = oppLiList.get(i).latestWarrantyType__c+',new';
}else{
detail.GuaranteeType = oppLiList.get(i).latestWarrantyType__c+',';
}
+ // detail.GuaranteeType = oppLiList.get(i).latestWarrantyType__c+',';
}
+ // if(opp.Trade__c == '澶栬部'){
+ // detail.GuaranteeType = oppLiList.get(i).latestWarrantyType__c+',';// 淇濅慨绫诲埆
+ // }else{
+ // Date nowDate = Date.today();
+ // // Date baojidate = Date.valueOf('2022-4-1');
+ // Date baojidate = Date.newInstance(2022,3,30);
+ // if(baojidate<=nowDate&&oppLiList.get(i).latestWarrantyType__c=='甯傚満澶氬勾淇濅慨'){
+ // detail.GuaranteeType = oppLiList.get(i).latestWarrantyType__c+',new';
+ // }else{
+ // detail.GuaranteeType = oppLiList.get(i).latestWarrantyType__c+',';
+ // }
+ // }
//WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� fy end
// detail.GuaranteeType = oppLiList.get(i).latestWarrantyType__c; // 淇濅慨绫诲埆
}else{
//WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� fy start
- if(opp.Trade__c == '澶栬部'){
- detail.GuaranteeType = ',';
- }else{
- Date nowDate = Date.today();
- Date baojidate = Date.newInstance(2022,3,30);
- if(baojidate<=nowDate){
- detail.GuaranteeType = ',new';
- }else{
- detail.GuaranteeType = ',';
- }
- }
+ detail.GuaranteeType = ',';
//WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� fy end
// detail.GuaranteeType = null;
}
@@ -534,17 +566,8 @@
// detail.GuaranteeType = null;
//澶栬锤澶氬勾淇濅慨鏈笂绾垮墠 淇濅慨绫诲埆 浼爊ull
//WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� fy start
- if(opp.Trade__c == '澶栬部'){
+
detail.GuaranteeType = ',';
- }else{
- Date nowDate = Date.today();
- Date baojidate = Date.newInstance(2022,3,30);
- if(baojidate<=nowDate){
- detail.GuaranteeType = ',new';
- }else{
- detail.GuaranteeType = ',';
- }
- }
//WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� fy end
// detail.GuaranteeType = null;
//澶栬锤澶氬勾淇濅慨鏈笂绾垮墠 璁℃彁閲戦 浼�0
@@ -561,17 +584,7 @@
else if(oldDate){
detail.GuaranteePeriod = null;
//WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� fy start
- if(opp.Trade__c == '澶栬部'){
- detail.GuaranteeType = ',';
- }else{
- Date nowDate = Date.today();
- Date baojidate = Date.newInstance(2022,3,30);
- if(baojidate<=nowDate){
- detail.GuaranteeType = ',new';
- }else{
- detail.GuaranteeType = ',';
- }
- }
+ detail.GuaranteeType = ',';
//WLIG-CCT9UG 銆愬鎵樸�戝叧浜庡競鍦哄骞翠繚璁℃彁閲戣皟鏁� fy end
// detail.GuaranteeType = null;
detail.ProvistonPeriod = null;
@@ -699,14 +712,15 @@
// NFMUtil.sendToSap(rowDataStr, NFMUtil.NFM007_ENDPOINT);
// CHAN-BSV3GZ start
// 鎺ユ敹 SAP杩斿洖鐘舵��
- status =
+ // status = // 2022-07-13 zyh update 娉ㄩ噴
// CHAN-BSV3GZ end
- NFMUtil.sendToSapRet(rowDataStr, NFMUtil.NFM007_ENDPOINT);
+ // NFMUtil.sendToSapRet(rowDataStr, NFMUtil.NFM007_ENDPOINT); // 2022-07-13 zyh update 娉ㄩ噴
//CHAN-BDPBVY 20190703 end
+ NFMUtil.sendToSap(rowDataStr, NFMUtil.NFM007_ENDPOINT); // 2022-07-13 zyh add
// CHAN-BSV3GZ start
// 鍘熶唬鐮�
- // rowData.retry_cnt__c=0;
- if (status == 'OK') {
+ rowData.retry_cnt__c=0;// 2022-07-13 zyh update 瑙ｅ紑娉ㄩ噴
+ /* if (status == 'OK') {
rowData.retry_cnt__c = 0;
} else {
if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0;
@@ -718,7 +732,7 @@
rowData.ErrorLog__c = 'status:' + status + ' 璇环缂栫爜锛�' + nfm007.Quotations.Quotation.get(0).QuotationCode +
'\n閿欒娆℃暟宸茬粡瓒呰繃鑷姩閫佷俊璁惧畾鐨勬渶澶ф鏁帮紝璇锋墜鍔ㄩ�佷俊';
}
- }
+ }*/ // 2022-07-13 zyh update 娉ㄩ噴
// CHAN-BSV3GZ end
}catch(Exception ex) {
@@ -731,14 +745,16 @@
iflog.ErrorLog__c += ex.getStackTraceString() + '\n';
//---xiongyl---add
- if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0;
+ /*if (rowData.retry_cnt__c == null) rowData.retry_cnt__c = 0;
if (rowData.retry_cnt__c < batch_retry_max_cnt){
rowData.retry_cnt__c++;
LogAutoSendSchedule.assignOneMinute();
}
if (rowData.retry_cnt__c >= batch_retry_max_cnt){
rowData.ErrorLog__c = ex.getMessage() + '\n' + ex.getStackTraceString() + '\n' + rowData.ErrorLog__c+'閿欒娆℃暟宸茬粡瓒呰繃鑷姩閫佷俊璁惧畾鐨勬渶澶ф鏁帮紝璇锋墜鍔ㄩ�佷俊';
- }
+ }*/ // 2022-12-6 zyh 娉ㄩ噴锛氶噸鍙戦�昏緫淇敼锛岃棰樺彿锛欴B202211540694
+ Boolean check = true;
+ NFMUtil.LogAutoSend(rowData, ex , null,check); // 2022-12-6 zyh add
}
iflog.Log__c = logstr;
if (needUpdateIflog) {
@@ -746,4 +762,283 @@
update rowData;
}
}
+ @TestVisible private void test() {
+ Integer i = 0;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1