优化drone

.drone.yml

@@ -135,12 +135,12 @@ steps:
 
 trigger:
   branch:
-    include:
-      - release-gateway
+    - release-gateway
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 
 ---
 kind: pipeline
@@ -230,12 +230,12 @@ steps:
         - echo ====部署成功=======
 trigger:
   branch:
-    include:
-      - release-transfer
+    - release-transfer
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 
 ---
 kind: pipeline
@@ -329,12 +329,12 @@ steps:
 
 trigger:
   branch:
-    include:
-      - release-quartz
+    - release-quartz
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 
 ---
 kind: pipeline
@@ -486,12 +486,12 @@ steps:
 
 trigger:
   branch:
-    include:
-      - release-system
+    - release-system
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 ---
 kind: pipeline
 type: docker
@@ -642,12 +642,12 @@ steps:
 
 trigger:
   branch:
-    include:
-      - release-user
+    - release-user
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 
 ---
 kind: pipeline
@@ -799,12 +799,12 @@ steps:
 
 trigger:
   branch:
-    include:
-      - release-product
+    - release-product
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 
 ---
 kind: pipeline

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsMerchantServiceImpl.java

@@ -101,9 +101,9 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
                     break;
             }
         }
-        KxsMerchant kxsMerchant = baseMapper.selectById(merchant.getId());
 
         if(operation.equals(OperationType.INSERT)){
+            KxsMerchant kxsMerchant = baseMapper.selectById(merchant.getId());
             if(kxsMerchant == null){
                 baseMapper.insert(merchant);
             }