From 2f4492ee18f90274582fcc2bb06f5e9bf64136e8 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 13 五月 2022 17:32:14 +0800
Subject: [PATCH] ProdBackup0513

---
 force-app/main/default/classes/OpportunityWebService.cls |   43 ++++++-------------------------------------
 1 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/force-app/main/default/classes/OpportunityWebService.cls b/force-app/main/default/classes/OpportunityWebService.cls
index 8b52fc2..3f26cf3 100644
--- a/force-app/main/default/classes/OpportunityWebService.cls
+++ b/force-app/main/default/classes/OpportunityWebService.cls
@@ -86,13 +86,6 @@
     }
 
 
-    WebService static void batch(String oppId){
-
-        System.debug('$$$$$$$$$$'+oppId);
-        List<String> idList = new List<String>();
-        idList.add(oppId);
-        Database.executeBatch(new OpportunityUpdateSendEmailBatch(idList), 10);
-    }
 
     WebService static String checkUpperLimitOfSales(String oppId, String dealerId) {
         String result = '';
@@ -125,7 +118,7 @@
         }
         String accountDealerErrorMessage = RadiationUtil.updateCertificationDetails(dealerId, null, getModelQuantityMap, false);*/
         String olympusDealerErrorMessage = RadiationUtil.updateCertificationDetails(olympusAccountId, null, getModelQuantityMap, false);
-        result = olympusDealerErrorMessage == '' ? '' : '浠櫙閫氬彲閿�鍞暟閲忎笉瓒�' ;
+        result = olympusDealerErrorMessage == '' ? '' : '濂ユ灄宸存柉鍙攢鍞暟閲忎笉瓒�' ;
         //String flage = LicenseCheckUtil.LicenseCheckOly();
         Boolean temp = result.startsWith('浣犱笉鑳�');
         if (temp) {
@@ -135,7 +128,7 @@
         }
     }
 
-    WebService static String checkOrderStatus(String oppId, String stageName, String creuser, String owner) {
+    WebService static String checkOrderStatus(String oppId, String stageName, String creuser) {
         String temp = '1';
         Order ord = new Order();
         List<Order> ordList = new List<Order>();
@@ -145,7 +138,7 @@
         if (ordList.size() > 0) {
             ord = ordList[0];
            
-            if ( (ord.ApproveStatus__c == 'CancelPass' ||  ord.ApproveStatus__c == 'OrderDraft' || ord.ApproveStatus__c  == 'Draft' || ord.ApproveStatus__c == 'Reject') &&  (creuser == userId || owner == userId)) {
+            if ( (ord.ApproveStatus__c == 'CancelPass' ||  ord.ApproveStatus__c == 'OrderDraft' || ord.ApproveStatus__c  == 'Draft' || ord.ApproveStatus__c == 'Reject') &&  creuser == userId ) {
                 StaticParameter.StageProgressBarUpdate = true;
 
                 
@@ -159,7 +152,7 @@
                         roleId == '00E28000000aKzs' || roleId == '00E0K000001jGiC' || roleId == '00E0K000001jGiR' ||
                         roleId == '00E0K000001ywgX' || roleId == '00E28000000knAc' || roleId == '00E28000000knAh' ||
                         roleId == '00E28000000aKzx' || roleId == '00E28000000knAw' || roleId == '00E28000000knB1' ||
-                        roleId == '00E28000000aL02' || roleId == '00E28000000kjpX') {
+                        roleId == '00E28000000aL02') {
 
                     Opportunity opp = new Opportunity();
                     opp.Id = oppId;
@@ -179,7 +172,7 @@
                 temp = '0';
             }
         } else {
-            if  ((userId == '005280000037mrQ' || userId == '00528000002OAvH' || userId == '00528000000YSdB' ||
+            if (userId == '005280000037mrQ' || userId == '00528000002OAvH' || userId == '00528000000YSdB' ||
                     roleId == '00E0K000001ywwz' || roleId == '00E0K000001jGiM' || roleId == '00E0K000001jGib' ||
                     roleId == '00E0K000001ywgS' || roleId == '00E28000000knAm' || roleId == '00E28000000knAr' ||
                     roleId == '00E28000000aKzn' || roleId == '00E0K000001jGhn' || roleId == '00E0K000001jGhs' ||
@@ -188,7 +181,7 @@
                     roleId == '00E28000000aKzs' || roleId == '00E0K000001jGiC' || roleId == '00E0K000001jGiR' ||
                     roleId == '00E0K000001ywgX' || roleId == '00E28000000knAc' || roleId == '00E28000000knAh' ||
                     roleId == '00E28000000aKzx' || roleId == '00E28000000knAw' || roleId == '00E28000000knB1' ||
-                    roleId == '00E28000000aL02' || roleId == '00E28000000kjpX') &&  (creuser == userId || owner == userId)) {
+                    roleId == '00E28000000aL02') {
 
                 Opportunity opp = new Opportunity();
                 opp.Id = oppId;
@@ -325,30 +318,6 @@
 
     private static void add() {
         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++;

--
Gitblit v1.9.1