彭锟
2022-03-28 572b3f4b0248130d692621827ac167e6981bc771
UpdateContractAimAmountHandler,NFM601修改
2个文件已修改
48 ■■■■ 已修改文件
force-app/main/default/classes/NFM601Batch.cls 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/UpdateContractAimAmountHandler.cls 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/NFM601Batch.cls
@@ -8,8 +8,9 @@
        this.accountIdList = accountIdList;
    }
    global Database.QueryLocator start(Database.BatchableContext bc) {
        return null;
    global Database.QueryLocator start(Database.BatchableContext bc) {
        return Database.getQueryLocator([select Id,NFM601Tag__c from Account where NFM601Tag__c = true]);
        //return null;
        // if (accountIdList != null && accountIdList.size() > 0) {
        //     return Database.getQueryLocator([SELECT Id, RecordTypeId, Is_Active_Formula__c,AwaitToSendAWS__c
                    
@@ -41,8 +42,18 @@
    }
    global void execute(Database.BatchableContext BC, list < Account > accountList) {
    global void execute(Database.BatchableContext BC , List<Account> accList) {
        List<String> accIdList = new List<String>();
        if(accList.size()>0){
            for(Account temp : accList){
                accIdList.add(temp.Id);
            }
            NFM601Controller.executefuture('', accIdList);
            for(Account temp : accList){
                temp.NFM601Tag__c = false;
            }
        }
        update accList;
        // List < String > accIdList = new List < String > ();
        // for (Account account: accountList) {
        //     account.AwaitToSendAWS__c = false;
@@ -66,6 +77,6 @@
    }
    global void finish(Database.BatchableContext BC) {
        Id execBTId = Database.executeBatch(new NFM606Batch(), 200);
    }
}
force-app/main/default/classes/UpdateContractAimAmountHandler.cls
@@ -12,11 +12,16 @@
    }
    protected override void beforeUpdate() {
        changeAssume();
        SetAwaitToSendAWS();//new
    }
    //new
    protected override void beforeInsert() {
        SetAwaitToSendAWS();//new
    }
    protected override void afterInsert() {
        createAgencyTarget();
        SetAwaitToSendAWS();
        //SetAwaitToSendAWS();//old
    }
@@ -25,8 +30,7 @@
        // LHJ KWAG-BQMA89 202006 Start
        updateAgencyAccout();
        // LHJ KWAG-BQMA89 202006 End
        SetAwaitToSendAWS();
        //SetAwaitToSendAWS();//old
    }
    
@@ -207,7 +211,11 @@
                    if (!NFM601_IdMap.containsKey(acc.Id)) {
                        // 判断是否是接口用户
                        if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
                            interfaceUserUpsertAccount.add(acc.Id);
                            //此处做修改,NFM624Rest接收数据后触发trigger,trigger再去调用601存在bug,修改为增加标记,使用Batch发送
                            //interfaceUserUpsertAccount.add(acc.Id);
                            //2022-3-28 pk start
                            acc.NFM601Tag__c = true;
                            //2022-3-28 pk end
                        } else {
                            queueableAccountIdList.add(acc.Id); 
                        }
@@ -235,7 +243,10 @@
                        ) {
                        if (!NFM601_IdMap.containsKey(acc.Id)) {
                            if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
                                interfaceUserUpsertAccount.add(acc.Id);
                                //interfaceUserUpsertAccount.add(acc.Id);
                                 //2022-3-28 pk start
                                acc.NFM601tag__c = true;
                                 //2022-3-28 pk start
                            } else {
                                queueableAccountIdList.add(acc.Id);
                            } 
@@ -256,9 +267,9 @@
            if (queueableAccountIdList.size() > 0) {
                NFM601Controller.callout('', queueableAccountIdList);
            }
            if (interfaceUserUpsertAccount.size() > 0) {
                NFM601Controller.executefuture('', interfaceUserUpsertAccount);
            }
            // if (interfaceUserUpsertAccount.size() > 0) {
            //     NFM601Controller.executefuture('', interfaceUserUpsertAccount);
            // }
        }
    }