From c8a34415456325cfa474e6b2e9a9f5ca3cfcd3d9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 21 Aug 2024 13:16:38 +0800
Subject: [PATCH] md

---
 .../service/impl/EmisSettleInvoiceRecordServiceImpl.java  | 6 +++---
 .../main/java/com/xdadan/erp/emis/utils/Kd100Helper.java  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
index ee091d2d1..3bf7083e1 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
@@ -185,10 +185,10 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
         EmisSettleBill newBill = new EmisSettleBill();
         newBill.setId(oldBill.getId());
 
-        if(oldBill.getRecMoney().compareTo(totalMoney)>=0) {
-            newBill.setOpenBillStatus("1");
-        }else{
+        if(oldBill.getRecMoney().compareTo(totalMoney)>0) {
             newBill.setOpenBillStatus("2");
+        }else{
+            newBill.setOpenBillStatus("1");
         }
 
         // 更新账单开票状态
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
index b1be81fb6..bffe7abea 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
@@ -57,9 +57,9 @@ public class Kd100Helper {
         postDataMap.put("sign", genDigest(mgsData, KEY, CUSTOMER));     // 数字签名
         postDataMap.put("param", mgsData);
 
-//        log.debug("===KD100==POST==>{}",JSON.toJSONString(postDataMap));
+        log.debug("===KD100==POST==>{}",JSON.toJSONString(postDataMap));
         String allResult=HTTPHelperV3.post(POLL_QUERY_URL,postDataMap,"application/x-www-form-urlencoded");
-//        log.debug("===KD100==REST==>{}",allResult);
+        log.debug("===KD100==REST==>{}",allResult);
 
 //        try {
 //            // 订阅轨迹
@@ -194,8 +194,8 @@ public class Kd100Helper {
 //            String str=queryTraceByMainNoAndCom("SF080300002588","shunfeng","1234");
 //            emisWaybillTransfer.getTransferDate()
 //                    [顺丰速运 SF3126166442439] 发往 [无锡]
-            String str=pollTraceByMainNoAndCom("SF3126166442439","shunfeng","缅甸-莫比","中国-无锡","18070144003");
-//            String str=queryTraceByMainNoAndCom("T7080398716","","");
+//            String str=pollTraceByMainNoAndCom("SF3126166442439","shunfeng","缅甸-莫比","中国-无锡","18070144003");
+            String str=queryTraceByMainNoAndCom("SF3126166442439","shunfeng","18070144003");
             System.out.println(str);
 //            List<EmisTmsScanRecord> list=cvtTraceToScanRecord("12321",str);
 //            System.out.println(JSON.toJSONString(list));