Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -6591,6 +6591,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			resultMap = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
 			return resultMap;
 		} catch (Exception e) {
+			resultMap.put("result", false);
+			resultMap.put("msg", "数据准备错误"+e.getMessage());
 			log.error(">>>>> 推送老系统签收信息报错", e);
 		}
 

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -200,7 +200,7 @@ public class DistributionDatarepair {
 			Long id = entries.getLong("singnforId");
 
 			Map<String, Object> map = distributionSignforClient.clerkCheckPushData(id);
-			log.info(">>> 推送失败  map :{}",map);
+			log.info(">>> 推送反馈信息  map :{}",map);
 			Boolean b = (Boolean) map.get("result");
 			if (b != null && b) {
 				warehouseMappingDataMapper.updateClearSignforStatus(id, entries.getLong("warehouseId"), 1);
@@ -226,7 +226,7 @@ public class DistributionDatarepair {
 		Map<String, Object> map = distributionSignforClient.clerkCheckPushData(Long.parseLong(params));
 		Long id = Long.parseLong(params);
 		Boolean b = (Boolean) map.get("result");
-		log.info(">>> 推送失败  map :{}",map);
+		log.info(">>> 推送反馈信息  map :{}",map);
 		if (b != null && b) {
 			warehouseMappingDataMapper.updateClearSignforStatusBysignforId(Long.parseLong(params), 1);
 			log.info(">>> 推送成功 {}", Long.parseLong(params));