From 06f5ee9de083dfe10de7c769010ea15b9509f2d2 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Wed, 26 Jun 2024 17:35:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=9E=97?=
 =?UTF-8?q?=E6=B0=8F=E5=88=A0=E9=99=A4=E8=AE=A2=E5=8D=95=E6=97=B6=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=9B=9E=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linsy/service/impl/DeliveryNoteServiceImpl.java  | 12 ++++++++----
 .../src/main/resources/application.yml               | 12 ------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java
index 35031999a..69e24e3f8 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java
@@ -176,14 +176,18 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		log.info("工厂发起取消订单：{}", JSONUtil.toJsonStr(vo));
 		CancelOrderParamVO param = new CancelOrderParamVO();
 		param.setOrderCode(vo.getSourceCode());
-		if(linsyProperties.getNewAdvance()){
+		if (linsyProperties.getNewAdvance()) {
 			Boolean result = advanceClient.cancelOrder(param);
 			return result;
 		}
-		if(linsyProperties.getOldAdvance()){
+		if (linsyProperties.getOldAdvance()) {
 			String post = HttpUtil.post(linsyProperties.getOldSystemHost() + linsyProperties.getOldSystemCancelAdvanceUrl(), JSONUtil.parseObj(param));
-
-			// return result;
+			if (StrUtil.isNotEmpty(post)) {
+				JSONObject entries = JSONUtil.parseObj(post);
+				if (ObjectUtil.equals(entries.getInt("code"), 200)) {
+					return true;
+				}
+			}
 		}
 		return false;
 	}
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application.yml b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application.yml
index 33da94b58..ca8dc27d5 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application.yml
+++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/resources/application.yml
@@ -10,21 +10,9 @@ swagger:
     - org.springblade
     - com.logpm
 
-#oss配置
-oss:
-  enabled: true
-  name: minio
-  tenant-mode: false
-  endpoint: http://8.137.14.82:9000
-  access-key: minio
-  secret-key: 123123123
-  bucket-name: bladex
-
-
 logging:
   config: classpath:logback.xml
 
-
 spring:
   main:
     allow-circular-references: true