Merge branch 'dev' into pre-production

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));
-
+			if (StrUtil.isNotEmpty(post)) {
-			// return result;
+				JSONObject entries = JSONUtil.parseObj(post);
+				if (ObjectUtil.equals(entries.getInt("code"), 200)) {
+					return true;
+				}
+			}
 		}
 		return false;
 	}

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