From 780461e27d87b769b6f9649a9a7fa532d880a2e9 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 07 一月 2026 14:54:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
index ca4c2ac..6e4d79e 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -57,7 +57,7 @@
                     }else if( order.getDocType() == 21){  //瀵煎叆璁㈠崟鍑哄簱锛堥鏂欙級
                         order.setSettle(8L);
                         orderService.updateById(order);
-                    }else if(order.getPayType() == 1 || order.getSalesman() != null){
+                    }else if((order.getPayType() != null && order.getPayType() == 1) && order.getSalesman() != null){
                         Order order1 = orderService.selectByNo(order.getSalesman());
                         if(orderDetlPakinService.morpt(order.getSalesman(),order.getOrderNo())){
                             order.setSettle(11L); //yu/cheng/dan/deng/dai/chu/ku/dan

--
Gitblit v1.9.1