From 93257b95c0f750b639739e3ea1c04cfc46580ae5 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 25 Nov 2024 16:30:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E8=8D=AF=E5=93=81=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=94=B6=E8=B4=B9=E9=A1=B9=E7=9B=AE=E4=B8=8E=E7=89=A9?=
 =?UTF-8?q?=E8=B5=84=E5=AD=97=E5=85=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/mipsdl/client/CommonHttpClient.java     | 8 +++++---
 .../java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java    | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java
index 1e04c55..2fa72ca 100644
--- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java
@@ -312,6 +312,7 @@ public abstract class CommonHttpClient implements BaseHttpClient {
     public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) {
         return null;
     }
+
     @Override
     public BaseResponse uploadCollectOrder(PostCollectOrderRequest postCollectOrderRequest) {
         return null;
@@ -325,7 +326,7 @@ public abstract class CommonHttpClient implements BaseHttpClient {
     @Resource
     private DataSource dataSource;
 
-    public String getDataSourceType(){
+    public String getDataSourceType() {
         Connection conn = null;
         DatabaseMetaData metaData = null;
         String databaseProductName = "";
@@ -335,7 +336,7 @@ public abstract class CommonHttpClient implements BaseHttpClient {
             databaseProductName = metaData.getDatabaseProductName();//MySQL //Oracle
         } catch (SQLException throwables) {
             throwables.printStackTrace();
-        }finally {
+        } finally {
             // 释放连接资源
             if (conn != null) {
                 try {
@@ -345,10 +346,11 @@ public abstract class CommonHttpClient implements BaseHttpClient {
                 }
             }
         }
-
+        log.info("数据库类型为：" + databaseProductName);
         return databaseProductName;
 
     }
+
     @Override
     public BaseResponse getBuyType() {
         return null;
diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
index 539d0ad..53cb24c 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -1779,7 +1779,7 @@ public class CtqyyClient extends CommonHttpClient {
                 List<IoCollectOrderBiz> bizList = new ArrayList<>();
                 value.forEach(entity -> {
                     IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
-                    BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()).last(" limit 1"));
+                    BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getCOUNTRY_CODE()).last(" limit 1"));
                     if (basicUdirelEntity != null) {
                         collectOrderBiz.setRelId(basicUdirelEntity.getId());
                     } else {
@@ -1793,7 +1793,7 @@ public class CtqyyClient extends CommonHttpClient {
                     collectOrderBiz.setGgxh(entity.getPACK_SPEC());
                     collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT());
                     collectOrderBiz.setCount(IntUtil.value(entity.getLAY_PHYSIC_QUANTITY()));
-                    collectOrderBiz.setThrCode(entity.getPHYSIC_CODE());
+                    collectOrderBiz.setThrCode(entity.getCOUNTRY_CODE());
                     collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME());
                     collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
                     collectOrderBiz.setYbbm(entity.getCOUNTRY_CODE());