From 2a0888cfece176f281f4f87a988bcc632fa71829 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 19 May 2025 16:34:39 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E9=94=80=E5=94=AE=E5=8F=AF=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E4=B8=8B=E5=8D=95=E5=90=8E=E4=BF=AE=E6=94=B9=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=81=94=E7=B3=BB=E4=BA=BA=E7=BB=95=E8=BF=87=E9=A2=9D?=
 =?UTF-8?q?=E5=BA=A6=E6=A0=A1=E9=AA=8Cbug=E4=BF=AE=E5=A4=8D=20committer:?=
 =?UTF-8?q?=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xdadan/erp/emis/service/EmisBaseService.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 296898334..647f947e1 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -36,7 +36,6 @@ package com.xdadan.erp.emis.service;
  import lombok.extern.slf4j.Slf4j;
  import org.apache.commons.collections.MapUtils;
  import org.apache.commons.lang3.StringUtils;
- import org.apache.commons.text.WordUtils;
  import org.springframework.beans.BeanUtils;
  import org.springframework.beans.factory.annotation.Autowired;
  import org.springframework.stereotype.Service;
@@ -259,9 +258,7 @@ public class EmisBaseService {
             String newSettleType=getWaybillSettleType(newBill);
 
             // 结算方式相同，判断增加的额度是否在范围内
-             if (oldSettleType.equals(newSettleType) &&
-                     (oldBill.getPayee().equals(newBill.getPayee()) ||
-                             oldBill.getCustNo().equals(newBill.getCustNo()))) {
+             if (oldSettleType.equals(newSettleType) && checkOperator(oldBill, newBill, newSettleType)) {
                 BigDecimal changeMoney=newBill.getFreight().subtract(oldBill.getFreight());
                 if(changeMoney.compareTo(BigDecimal.ZERO)>0){
                     if("2".equals(newSettleType)){
@@ -347,6 +344,13 @@ public class EmisBaseService {
          }
      }
 
+     private boolean checkOperator(EmisWaybill oldBill, EmisWaybill newBill, String newSettleType) {
+         if ("2".equals(newSettleType)) {
+             return oldBill.getCustNo().equals(newBill.getCustNo());
+         }
+         return oldBill.getPayee().equals(newBill.getPayee());
+     }
+
      /**
       * 计算并返回销售临时额度总额
       * tempCreditMoney = creditMoney + tempCreditMoneyAdjust