ProdBackup0513

buli

2022-05-13 2f4492ee18f90274582fcc2bb06f5e9bf64136e8

 force-app/main/default/classes/OpportunityTriggerHandler.cls

@@ -135,10 +135,6 @@
                newOpp.Competitor_Product_Code8_D__c = newOpp.CompetitorProductCode8__c;
                newOpp.Dealer_Sales_Staff_Name_D__c = newOpp.DealerSalesStaffName__c;
                newOpp.Dealer_Service_D__c = newOpp.DealerService__c;
                // PIPL Update 20220420 By Chen Yanan Start
                newOpp.Dealer_Sales_Staff_Name_D_Encrypted__c = newOpp.DealerSalesStaffName_Encrypted__c;
                newOpp.Dealer_Service_D_Encrypted__c = newOpp.DealerService_Encrypted__c;
                // PIPL Update 20220420 By Chen Yanan End
                newOpp.Expected_Delivery_Date_D__c = newOpp.ExpectedDeliveryDate__c;
                newOpp.Expected_Order_Date_D__c = newOpp.ExpectedOrderDate__c;
                newOpp.Inquiry_Result_D__c = newOpp.InquiryResult__c;
@@ -415,15 +411,9 @@
            }
            if (newOpp.DealerSalesStaffName__c != oldOpp.DealerSalesStaffName__c) {
                newOpp.Dealer_Sales_Staff_Name_D__c = newOpp.DealerSalesStaffName__c;
                // PIPL Update 20220420 By Chen Yanan Start
                newOpp.Dealer_Sales_Staff_Name_D_Encrypted__c = newOpp.DealerSalesStaffName_Encrypted__c;
                // PIPL Update 20220420 By Chen Yanan End
            }
            if (newOpp.DealerService__c != oldOpp.DealerService__c) {
                newOpp.Dealer_Service_D__c = newOpp.DealerService__c;
                // PIPL Update 20220420 By Chen Yanan Start
                newOpp.Dealer_Service_D_Encrypted__c = newOpp.DealerService_Encrypted__c;
                // PIPL Update 20220420 By Chen Yanan End
            }
            if (newOpp.ExpectedDeliveryDate__c != oldOpp.ExpectedDeliveryDate__c) {
                newOpp.Expected_Delivery_Date_D__c = newOpp.ExpectedDeliveryDate__c;
@@ -548,10 +538,6 @@
                    newOpp.CompetitorProductCode8__c = newOpp.Competitor_Product_Code8_D__c;
                    newOpp.DealerSalesStaffName__c = newOpp.Dealer_Sales_Staff_Name_D__c;
                    newOpp.DealerService__c = newOpp.Dealer_Service_D__c;
                    // PIPL Update 20220420 By Chen Yanan Start
                    newOpp.DealerSalesStaffName_Encrypted__c = newOpp.Dealer_Sales_Staff_Name_D_Encrypted__c;
                    newOpp.DealerService_Encrypted__c = newOpp.Dealer_Service_D_Encrypted__c;
                    // PIPL Update 20220420 By Chen Yanan End
                    newOpp.ExpectedDeliveryDate__c = newOpp.Expected_delivery_date_D__c;
                    newOpp.ExpectedOrderDate__c = newOpp.Expected_Order_Date_D__c;
                    newOpp.InquiryResult__c = newOpp.Inquiry_result_D__c;
@@ -625,10 +611,6 @@
                    newOpp.Competitor_Product_Code8_D__c = newOpp.CompetitorProductCode8__c;
                    newOpp.Dealer_Sales_Staff_Name_D__c = newOpp.DealerSalesStaffName__c;
                    newOpp.Dealer_Service_D__c = newOpp.DealerService__c;
                    // PIPL Update 20220420 By Chen Yanan Start
                    newOpp.Dealer_Sales_Staff_Name_D_Encrypted__c = newOpp.DealerSalesStaffName_Encrypted__c;
                    newOpp.Dealer_Service_D_Encrypted__c = newOpp.DealerService_Encrypted__c;
                    // PIPL Update 20220420 By Chen Yanan End
                    newOpp.Expected_Delivery_Date_D__c = newOpp.ExpectedDeliveryDate__c;
                    newOpp.Expected_Order_Date_D__c = newOpp.ExpectedOrderDate__c;
                    newOpp.Inquiry_Result_D__c = newOpp.InquiryResult__c;
@@ -1142,7 +1124,7 @@
        }

        if (targetList.size() > 0) {
            List<Order> odrList = [select id, OpportunityId,ForeignTradeCompany_D__c,TradeType__c,ProductSegment__c from Order where OpportunityId = :targetList and Status__c = 'Active'];
            List<Order> odrList = [select id, OpportunityId from Order where OpportunityId = :targetList and Status__c = 'Active'];
            for (Order odr : odrList) {
                Opportunity opp = newMap.get(odr.OpportunityId);

@@ -1167,8 +1149,7 @@
                    odr.Status__c = 'Inactive';
                }
            }
            
            System.debug('odrList------'+odrList);

            if (odrList.size() > 0) update odrList;
        }
        if (targetList2.size() > 0) {