Merge remote-tracking branch 'origin/pre-production' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java

@@ -235,7 +235,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 	@Override
 	public void customPushNodeData() {
 		JSONObject js = this.baseMapper.customPushNodeData();
-		if(ObjectUtil.isEmpty(js)){
+		if (ObjectUtil.isEmpty(js)) {
 			return;
 		}
 		String sns = js.getStr("sns");
@@ -253,10 +253,12 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		}
 		js.set("snList", snArray);
 		js.remove("sns");
+		JSONArray jsonArray = new JSONArray();
+		jsonArray.add(js);
 		if (StrUtil.isNotEmpty(oldProperties.getPushNodeUrl())) {
 			try {
-				log.info("自定义推送节点数据：{}", js.toString());
+				log.info("自定义推送节点数据：{}", JSONUtil.toJsonStr(jsonArray));
-				String post = HttpUtil.post(oldProperties.getPushNodeUrl(), JSONUtil.toJsonStr(CollUtil.newArrayList(js)));
+				String post = HttpUtil.post(oldProperties.getPushNodeUrl(), JSONUtil.toJsonStr(jsonArray));
 				log.info("推送结果：{}", post);
 				// 修改推送状态
 				this.baseMapper.updateSustomPushNodeDataStatus(js.getStr("status"), js.getStr("orderNo"), js.getStr("deliveryNo"));