From 00fec98bed38a7a21aa7ae1cd095d9b1221d0d16 Mon Sep 17 00:00:00 2001
From: yuqh <123456>
Date: Tue, 5 Nov 2024 15:01:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E6=8E=A5CRM?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/a8bill/plugin/PayReqSyncU8CPluginInitializer.java | 2 ++
 .../frame/plugin/u8c/plugin/SaleConPluginInitializer.java    | 4 +++-
 .../src/main/java/com/hzya/frame/seeyon/util/RestUtil.java   | 5 ++---
 .../frame/u8c/sosale/service/impl/SoSaleServiceImpl.java     | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/plugin/PayReqSyncU8CPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/plugin/PayReqSyncU8CPluginInitializer.java
index bf7d7ae8..74297311 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/plugin/PayReqSyncU8CPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/plugin/PayReqSyncU8CPluginInitializer.java
@@ -141,6 +141,8 @@ public class PayReqSyncU8CPluginInitializer extends PluginBaseEntity {
                 for (String key : hashMap.keySet()) {
                     main.put(key, hashMap.get(key));
                 }
+                logger.info("组装数据前"+JSON.toJSONString(hashMaps));
+                logger.info("组装数据前1"+main.toString());
                 ningboBankPluginService.updateU8CStatus(main,integration_task_living_details_id);
             }
         } catch (Exception e) {
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/plugin/SaleConPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/plugin/SaleConPluginInitializer.java
index 6c0d6b56..f406009d 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/plugin/SaleConPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/plugin/SaleConPluginInitializer.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.base.PluginBaseEntity;
 import com.hzya.frame.plugin.u8c.service.ISalesBillingService;
 import com.hzya.frame.u8c.sosale.service.ISoSaleService;
+import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -93,6 +94,7 @@ private ISoSaleService soSaleService;
      **/
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
-        return soSaleService.getU8cSaleToOa(requestJson);
+         soSaleService.getU8cSaleToOa(requestJson);
+        return BaseResult.getSuccessMessageEntity("销售订单同步OA成功");
     }
 }
diff --git a/service/src/main/java/com/hzya/frame/seeyon/util/RestUtil.java b/service/src/main/java/com/hzya/frame/seeyon/util/RestUtil.java
index e468fae4..a74908a1 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/util/RestUtil.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/util/RestUtil.java
@@ -208,9 +208,8 @@ public class RestUtil {
     }
     public static String sendU8CToOA(String parm, String apiCode,String userCode){
         String baseUrl = "http://127.0.0.1:8901/kangarooDataCenterV3/entranceController/externalCallInterface";
-        System.out.println("推送参数"+parm);
         //获取OAtoken
-
+        logger.info("推送参数"+parm);
         JSONObject tokenObj = new JSONObject();
         tokenObj.put("password","2cdd6cfc-5b87-47d1-aaea-756a55f6b5a6");
         tokenObj.put("userName","restUser");
@@ -231,7 +230,7 @@ public class RestUtil {
                 .body(parm)//表单内容
                 .timeout(20000)//超时,毫秒
                 .execute().body();
-        System.out.println("返回参数"+result);
+        logger.info("返回参数"+parm);
         if(StrUtil.isNotEmpty(result)){
             return analytic(result);
         }
diff --git a/service/src/main/java/com/hzya/frame/u8c/sosale/service/impl/SoSaleServiceImpl.java b/service/src/main/java/com/hzya/frame/u8c/sosale/service/impl/SoSaleServiceImpl.java
index 513b38a4..b2ea2c04 100644
--- a/service/src/main/java/com/hzya/frame/u8c/sosale/service/impl/SoSaleServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/u8c/sosale/service/impl/SoSaleServiceImpl.java
@@ -318,6 +318,8 @@ public class SoSaleServiceImpl extends BaseService<SoSaleEntity, String> impleme
                 field0032.put("value",line.getFrownote());
                 bodyDetails.add(field0032);
                 body.put("fields",bodyDetails);
+                records.add(body);
+
             });
             subTablesObj.put("records",records);
             subTablesObj.put("name","formson_0048");