From 248433c920f935ffcaee52b240f0c162decc1564 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 09 五月 2022 15:16:45 +0800
Subject: [PATCH] NFMUtilUpdate

---
 force-app/main/default/triggers/OrderTrigger.trigger |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/triggers/OrderTrigger.trigger b/force-app/main/default/triggers/OrderTrigger.trigger
index e7b28ac..64419a4 100644
--- a/force-app/main/default/triggers/OrderTrigger.trigger
+++ b/force-app/main/default/triggers/OrderTrigger.trigger
@@ -1,11 +1,23 @@
+/*
+ *@Description: OrderTrigger
+ *@Author: Dennis Rodman 
+ *@Date: 2022-04-14 14:31:47
+*/
 trigger OrderTrigger on Order (before insert, before update, after insert, after update) {
+    if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
+        return;
+    }
     
     if (Trigger.isBefore && Trigger.isInsert) {
         System.debug('@@@@@@@@@@@@@@!!!!!!!!!!!!!!!');
-        OrderTriggerHandler.setIsNew(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
-        OrderTriggerHandler.setPriceBook(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+        if(OrderDivisionController.OrderDivision == false){
+            
+            OrderTriggerHandler.setPriceBook(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+           
+            OrderTriggerHandler.check(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+        }
         OrderTriggerHandler.setTransferValue(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
-        OrderTriggerHandler.check(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
+        OrderTriggerHandler.setIsNew(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);
     }
     if (Trigger.isAfter && Trigger.isInsert) {
         OrderTriggerHandler.addItem(Trigger.new, Trigger.newMap, Trigger.old, Trigger.oldMap);

--
Gitblit v1.9.1