Merge branch 'dev' into pre-production

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -933,7 +933,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		Integer advanceId = iAdvanceClient.addAdvanceClient(advanceEntity);
 		advanceEntity.setId(advanceId);
 
-		String key = AdvanceEntity.class.getName() + ":"+serviceNumEntity.getReceiptId() + serviceNumEntity.getRelationOrderCode() + ":" + zbReceiptEntity.getDepartCode();
+		String key = AdvanceEntity.class.getName() + ":"+serviceNumEntity.getReceiptId() + serviceNumEntity.getPlatformOrderCode() + ":" + zbReceiptEntity.getDepartCode();
 		// 加入缓存  1小时的缓存
 		bladeRedis.setEx(key, advanceEntity, 60*60L);
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java

@@ -26,7 +26,7 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer {
 			excludePathPatterns("/factory/oupai/**").
 			excludePathPatterns("/factory/zb/**")
 			.excludePathPatterns("/factory/common/**");
-		InterceptorRegistration registryZbFactory = interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties));
-		registryZbFactory.addPathPatterns("/factory/zb/**");
+//		InterceptorRegistration registryZbFactory = interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties));
+//		registryZbFactory.addPathPatterns("/factory/zb/**");
 	}
 }