From 0fd8f8676c15f3010ae38db4f46d267e767e06bd Mon Sep 17 00:00:00 2001
From: "476474485@qq.com" <q8928627q>
Date: Sat, 9 Aug 2025 16:34:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4rest=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kekao/service/impl/CreditauditServiceImpl.java   | 12 ++++++++----
 .../service/impl/SysApplicationServiceImpl.java      |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/service/impl/CreditauditServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/service/impl/CreditauditServiceImpl.java
index e75c5d98..403ba873 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/service/impl/CreditauditServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/kekao/service/impl/CreditauditServiceImpl.java
@@ -108,7 +108,7 @@ public class CreditauditServiceImpl extends BaseService<CreditauditEntity, Strin
         headVO.put("vbillcode", mainData.getString("field0033"));//单据号
         headVO.put("dbilldate", mainData.getString("field0003"));//单据日期
         headVO.put("dmakedate", mainData.getString("field0003"));//制单日期
-        headVO.put("fstatusflag", mainData.getString("field0028"));//单据状态
+        headVO.put("fstatusflag","");//单据状态
         headVO.put("billmaker", mainData.getString("field0029"));//制单人
         headVO.put("vnote",  mainData.getString("field0011"));//备注
         if(mainData.getString("field0036") != null && !"".equals(mainData.getString("field0036"))){
@@ -251,6 +251,8 @@ public class CreditauditServiceImpl extends BaseService<CreditauditEntity, Strin
         }
         salerebate.put("pk_group", "COCOS"); // pk_group
         salerebate.put("vbillcode", mainData.getString("field0001")); // 返利申请单号，OA申请单号
+        salerebate.put("vdef3", mainData.getString("field0034")); // oa申请部门名称
+        salerebate.put("vdef2", mainData.getString("field0033")); // oa申请人名称
         salerebate.put("maketime", mainData.getString("field0004")); // 制单时间，必填，格式：2025-08-08 00:00:00
         salerebate.put("lastmaketime", null); // 最后修改时间，格式：2025-08-08 00:00:00
         if(mainData.getString("field0022") != null && !"".equals(mainData.getString("field0022"))){
@@ -278,8 +280,8 @@ public class CreditauditServiceImpl extends BaseService<CreditauditEntity, Strin
         }else {
             salerebate.put("pk_dept", "0201");
         }
-        salerebate.put("rebatetype", mainData.getString("field0026")); // 返利类型，必填，取Dee返利类型自定义档案编码
-        salerebate.put("totalaount", mainData.getString("field0028")); // 返利总额，必填，金额总额
+
+        salerebate.put("totalaount", mainData.getString("field0026")); // 返利总额，必填，金额总额
         salerebate.put("memo", mainData.getString("field0016")); // 备注
         salerebate.put("approvenote", null); // 审批批语
         salerebate.put("approver", null); // 审批人
@@ -290,6 +292,7 @@ public class CreditauditServiceImpl extends BaseService<CreditauditEntity, Strin
         salerebate.put("vdef1", mainData.getString("field0026")); // 返利类型编码，必填，取Dee返利类型自定义档案编码
 
         String field0009 = null;
+        String field0028 = null;
         // 构建pk_salerebate_b数组
         JSONArray salerebateBArray = new JSONArray();
         for (int i = 0; i < jsonArray.size(); i++) {
@@ -312,6 +315,7 @@ public class CreditauditServiceImpl extends BaseService<CreditauditEntity, Strin
             salerebateB.put("pk_measdoc", null); // 主计量单位，取DEE计量单位的编码
             salerebateB.put("money", jsonArray.getJSONObject(i).getString("field0014")); // 返利金额，必填，返利金额
             field0009 = jsonArray.getJSONObject(i).getString("field0009");
+            field0028 = jsonArray.getJSONObject(i).getString("field0028");
             salerebateB.put("vmemo", null); // 行备注
             salerebateB.put("vbdef1", null); // 自定义项 1
 
@@ -319,7 +323,7 @@ public class CreditauditServiceImpl extends BaseService<CreditauditEntity, Strin
             salerebateBArray.add(salerebateB);
         }
         salerebate.put("pk_customer", field0009); // 客户，必填，取DEE客户编码
-
+        salerebate.put("rebatetype", field0028); // 返利类型，必填，取Dee返利类型自定义档案编码
         // 将salerebate和pk_salerebate_b添加到外层对象
         sendData.put("salerebate", salerebate);
         sendData.put("pk_salerebate_b", salerebateBArray);
diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
index 5afcadef..6524316b 100644
--- a/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
+++ b/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
@@ -1938,9 +1938,9 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
                 response = closeableHttpClient.execute(post);
 
                 HttpEntity entity = response.getEntity();
-                synchronized (lock) {
+//                synchronized (lock) {
                     body.append(EntityUtils.toString(entity,"UTF-8"));
-                }
+//                }
                 flag = true;
                 logger.info("返回结果：" + body);
             } catch (Exception e) {