Merge branch 'release_real_202103' of https://git.malls.iformall.com/server/formallProject into release_real_202103

mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java

@@ -63,6 +63,8 @@ public interface WxAppinfoService {
      */
     WxAppinfo getCAppInfo(TenantEntity tenantEntity,EnumPayWay payWay);
     
+    WxAppinfo getBAppInfo(TenantEntity tenantEntity,EnumPayWay payWay);
+    
         /**
      * 保存或更新实体
      *

mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java

@@ -54,6 +54,25 @@ public class WxAppinfoServiceImpl implements WxAppinfoService {
         }
         return appInfo;
     }
+	
+	@Override
+    public WxAppinfo getBAppInfo(TenantEntity tenantEntity,EnumPayWay payWay) {
+        WxAppinfo appInfo = null;
+        WxAppinfo appinfoQ = new WxAppinfo();
+        if (null == payWay.getPlat()) {
+        	appinfoQ.setPlat(EnumPayWay.PAY_WAY_WECHAT.getPlat().getCode());
+        }else {
+        	appinfoQ.setPlat(payWay.getPlat().getCode());
+        }
+        
+        appinfoQ.updateTenantInfo(tenantEntity);
+        appinfoQ.setType(EnumAppType.B.getCode());
+        List<WxAppinfo> appList = wxAppinfoMapper.selectList(new QueryWrapper(appinfoQ));
+        if (appList.size() > 0) {
+            appInfo = appList.get(0);
+        }
+        return appInfo;
+    }
 
     @Override
     public WxAppinfo getByAppId(String appId) {

mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java

@@ -234,7 +234,7 @@ public class WxCashOutServiceImpl implements WxCashOutService {
 		if (null == cashout ) {
 			return;
 		}
-		WxAppinfo appInfo = wxAppinfoService.getCAppInfo(tenantEntity, payWay);
+		WxAppinfo appInfo = wxAppinfoService.getBAppInfo(tenantEntity, payWay);
 		if (null == appInfo) {
 			return;
 		}