Merge branch 'feature/支付门店查询过滤无效数据/zhiwei.zha'

assortment-ordercenter-sdk/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.8.RELEASE</version>
+            <version>5.5.42-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

call-back-service/pom.xml

@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-data-manager</artifactId>
-            <version>4.3.7.RELEASE</version>
+            <version>5.5.42-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>

order-application-service/pom.xml

@@ -162,7 +162,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.40-RELEASE</version>
+            <version>5.5.42-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java

@@ -111,8 +111,7 @@ public class PayServiceImpl {
     private AssortmentOpenPlatformIappWxappStoreManager assortmentOpenPlatformIappWxappStoreManager;
     @Autowired
     private AssortmentOpenPlatformPartnerPaymentConfigManager openPlatformPartnerPaymentConfigManager;
-    @Autowired
-    private AssortmentOpenPlatformPartnerMerchantManager openPlatformPartnerMerchantManager;
+
 
 
     @Autowired

order-management/pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.31-RELEASE</version>
+            <version>5.5.42-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

shopping-cart-application-service/pom.xml

@@ -61,7 +61,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.15.RESEALE</version>
+            <version>5.5.42-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>