From 6edc6e92ad99da4f51ee40060a762a1c7bf7aec2 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Mon, 30 Dec 2024 09:57:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E7=B4=A2=E8=8F=B2=E4=BA=9A?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 增加华之韵物流对接
---
 .../suofeiya/controller/OrderController.java           | 10 +++++++---
 .../factorydata/suofeiya/vo/FactoryOrderDataVO.java    |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/controller/OrderController.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/controller/OrderController.java
index eaf0d67d2..206240d59 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/controller/OrderController.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/controller/OrderController.java
@@ -1,6 +1,7 @@
 package com.logpm.factorydata.suofeiya.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.factorydata.suofeiya.service.DeliveryNoteService;
@@ -64,9 +65,12 @@ public class OrderController {
 		log.info("接收工厂订单：{} ", jsonStr);
 		String res = "";
 		try {
-			DeliveryNoteVO params = vo.getParams();
-			if (ObjectUtil.isNotEmpty(params)) {
-				res = service.order(params);
+			String params = vo.getParams();
+			if(StrUtil.isNotEmpty(params)){
+				DeliveryNoteVO bean = JSONUtil.toBean(params, DeliveryNoteVO.class);
+				if (ObjectUtil.isNotEmpty(bean)) {
+					res = service.order(bean);
+				}
 			}
 		} catch (Exception e) {
 			log.error("工厂订单异常：{} ", e);
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/vo/FactoryOrderDataVO.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/vo/FactoryOrderDataVO.java
index 784eb71bf..7bb8a98c5 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/vo/FactoryOrderDataVO.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/vo/FactoryOrderDataVO.java
@@ -22,6 +22,6 @@ public class FactoryOrderDataVO  {
 	private String companyCode;
 
 	@ApiModelProperty("订单信息")
-	private DeliveryNoteVO params;
+	private String params;
 
 }