From 01f207d979d6be17c8cdec293feab48828c0ec3e Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期五, 08 四月 2022 14:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/UpdateContractAimAmountHandler.cls | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/classes/UpdateContractAimAmountHandler.cls b/force-app/main/default/classes/UpdateContractAimAmountHandler.cls
index 3fbe80a..1f97d9f 100644
--- a/force-app/main/default/classes/UpdateContractAimAmountHandler.cls
+++ b/force-app/main/default/classes/UpdateContractAimAmountHandler.cls
@@ -12,16 +12,13 @@
}
protected override void beforeUpdate() {
changeAssume();
- SetAwaitToSendAWS();//new
+ //SetAwaitToSendAWS();//new
}
- //new
- protected override void beforeInsert() {
- SetAwaitToSendAWS();//new
- }
+
protected override void afterInsert() {
createAgencyTarget();
- //SetAwaitToSendAWS();//old
+ SetAwaitToSendAWS();
}
@@ -30,7 +27,7 @@
// LHJ KWAG-BQMA89 202006 Start
updateAgencyAccout();
// LHJ KWAG-BQMA89 202006 End
- //SetAwaitToSendAWS();//old
+ SetAwaitToSendAWS();//old
}
@@ -211,11 +208,7 @@
if (!NFM601_IdMap.containsKey(acc.Id)) {
// 鍒ゆ柇鏄惁鏄帴鍙ｇ敤鎴�
if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
- //姝ゅ鍋氫慨鏀癸紝NFM624Rest鎺ユ敹鏁版嵁鍚庤Е鍙憈rigger锛宼rigger鍐嶅幓璋冪敤601瀛樺湪bug锛屼慨鏀逛负澧炲姞鏍囪锛屼娇鐢˙atch鍙戦��
- //interfaceUserUpsertAccount.add(acc.Id);
- //2022-3-28 pk start
- acc.NFM601Tag__c = true;
- //2022-3-28 pk end
+ interfaceUserUpsertAccount.add(acc.Id);
} else {
queueableAccountIdList.add(acc.Id);
}
@@ -243,10 +236,7 @@
) {
if (!NFM601_IdMap.containsKey(acc.Id)) {
if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
- //interfaceUserUpsertAccount.add(acc.Id);
- //2022-3-28 pk start
- acc.NFM601tag__c = true;
- //2022-3-28 pk start
+ interfaceUserUpsertAccount.add(acc.Id);
} else {
queueableAccountIdList.add(acc.Id);
}
@@ -262,14 +252,14 @@
//After : to avoid mutiple execute
//if(!(System.Test.isRunningTest()||System.isFuture()||System.isBatch())){
//Update by Li Jun for PIPL 20220304
- if(!(System.Test.isRunningTest()||System.isFuture()||System.isBatch())){
+ if(!(System.Test.isRunningTest())){
if (queueableAccountIdList.size() > 0) {
NFM601Controller.callout('', queueableAccountIdList);
}
- // if (interfaceUserUpsertAccount.size() > 0) {
- // NFM601Controller.executefuture('', interfaceUserUpsertAccount);
- // }
+ if (interfaceUserUpsertAccount.size() > 0) {
+ NFM601Controller.executefuture('', interfaceUserUpsertAccount);
+ }
}
}
--
Gitblit v1.9.1