feat:remove invalid code

service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java

@@ -3,7 +3,6 @@ package com.jiejing.fitness.finance.service.merchant.convert;
 import static com.jiejing.paycenter.common.enums.merchant.ResourceTypeEnums.*;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.jiejing.common.utils.convert.BeanUtil;
 import com.jiejing.common.utils.crypt.AesUtil;
@@ -21,17 +20,16 @@ import com.jiejing.fitness.finance.repository.entity.BrandMerchantApply;
 import com.jiejing.fitness.finance.repository.entity.BrandToMerchant;
 import com.jiejing.fitness.finance.service.merchant.params.ApplyBrandMerchantParams;
 import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
-import com.jiejing.paycenter.api.merchant.request.OpenSingleSubChannelRequest;
 import com.jiejing.paycenter.api.merchant.request.UploadRequest;
 import com.jiejing.paycenter.api.merchant.vo.MerchantVO;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.BusinessTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.LicenseTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.MccEnums;
-import com.jiejing.paycenter.common.enums.merchant.PaySceneEnums;
 import com.jiejing.paycenter.common.enums.merchant.ResourceTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SceneTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelAuthTypeEnums;
+import com.jiejing.paycenter.common.enums.merchant.SubChannelOpenTypeEnums;
 import com.jiejing.paycenter.common.event.MerchantEvent;
 import com.jiejing.paycenter.common.model.Address;
 import com.jiejing.paycenter.common.model.BankCard;
@@ -62,12 +60,12 @@ public class MerchantConvert {
 
   private final static BigDecimal WX_OFFLINE_FEE_RATE = new BigDecimal("0.38");
 
-  private final static List<OpenSingleSubChannelRequest> DEFAULT_SUB_CHANNELS = Lists.newArrayList(
-      OpenSingleSubChannelRequest.builder().scene(PaySceneEnums.ALI_OFFLINE).feeRate(ALI_OFFLINE_FEE_RATE)
+  private final static List<SubChannelInfo> DEFAULT_SUB_CHANNELS = Lists.newArrayList(
+      SubChannelInfo.builder().openType(SubChannelOpenTypeEnums.ALI_OFFLINE).feeRate(ALI_OFFLINE_FEE_RATE)
           .build(),
-      OpenSingleSubChannelRequest.builder().scene(PaySceneEnums.WX_GZH_OFFLINE).feeRate(WX_OFFLINE_FEE_RATE)
+      SubChannelInfo.builder().openType(SubChannelOpenTypeEnums.WX_GZH_OFFLINE).feeRate(WX_OFFLINE_FEE_RATE)
           .build(),
-      OpenSingleSubChannelRequest.builder().scene(PaySceneEnums.WX_XCX_OFFLINE).feeRate(WX_OFFLINE_FEE_RATE)
+      SubChannelInfo.builder().openType(SubChannelOpenTypeEnums.WX_XCX_OFFLINE).feeRate(WX_OFFLINE_FEE_RATE)
           .build()
   );
 
@@ -224,11 +222,11 @@ public class MerchantConvert {
 
   public static BrandMerchantApply convertApply(BrandMerchantApply apply, MerchantEvent event) {
     // 品牌商户规则：微信线下公众号、微信线下小程序、支付宝线下通道全部开通成功才算成功
-    Map<PaySceneEnums, SubChannelInfo> channelMap = convertSubChannelMap(event.getSubChannels());
+    Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap = convertSubChannelMap(event.getSubChannels());
     OpenStateEnums state = convertOpenState(channelMap);
     String openFailMessage = OpenStateEnums.FAIL == state ? convertFailMessage(event.getSubChannels()) : null;
-    SubChannelInfo ali = channelMap.get(PaySceneEnums.ALI_OFFLINE);
-    SubChannelInfo wxGzhOffline = channelMap.get(PaySceneEnums.WX_GZH_OFFLINE);
+    SubChannelInfo ali = channelMap.get(SubChannelOpenTypeEnums.ALI_OFFLINE);
+    SubChannelInfo wxGzhOffline = channelMap.get(SubChannelOpenTypeEnums.WX_GZH_OFFLINE);
     OpenStateEnums wxOfflineState = convertWxOfflineState(channelMap);
     String wxOfflineFailMessage = convertWxOfflineFailMessage(channelMap);
     return BrandMerchantApply.builder()
@@ -245,12 +243,12 @@ public class MerchantConvert {
         .companyType(event.getCompanyType())
         .openState(state)
         .openFailMessage(openFailMessage)
-        .aliOpenState(ali.getOpenState())
+        .aliOpenState(ali.getState())
         .aliAuthState(convertAliAuthState(event.getSubChannelAuths()))
-        .aliMerchantNo(JSON.toJSONString(ali.getSubMerchantNos()))
+        .aliMerchantNo(JSON.toJSONString(ali.getMerchantNos()))
         .aliOpenFailMessage(ali.getFailMessage())
         .wxOfflineOpenState(wxOfflineState)
-        .wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getSubMerchantNos()))
+        .wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getMerchantNos()))
         .wxOfflineAuthState(convertWxOfflineAuthState(event.getSubChannelAuths()))
         .wxOfflineOpenFailMessage(wxOfflineFailMessage)
         .finishTime(OpenStateEnums.SUCCESS == state ? new Date() : null)
@@ -312,29 +310,30 @@ public class MerchantConvert {
         .orElse(null);
   }
 
-  private static String convertWxOfflineFailMessage(Map<PaySceneEnums, SubChannelInfo> channelMap) {
-    SubChannelInfo wxGzhOffline = channelMap.get(PaySceneEnums.WX_GZH_OFFLINE);
-    SubChannelInfo wxXcxOffline = channelMap.get(PaySceneEnums.WX_XCX_OFFLINE);
-    if (OpenStateEnums.FAIL == wxGzhOffline.getOpenState()) {
+  private static String convertWxOfflineFailMessage(Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap) {
+    SubChannelInfo wxGzhOffline = channelMap.get(SubChannelOpenTypeEnums.WX_GZH_OFFLINE);
+    SubChannelInfo wxXcxOffline = channelMap.get(SubChannelOpenTypeEnums.WX_XCX_OFFLINE);
+    if (OpenStateEnums.FAIL == wxGzhOffline.getState()) {
       return wxGzhOffline.getFailMessage();
     }
-    if (OpenStateEnums.FAIL == wxXcxOffline.getOpenState()) {
+    if (OpenStateEnums.FAIL == wxXcxOffline.getState()) {
       return wxXcxOffline.getFailMessage();
     }
     return null;
   }
 
-  private static OpenStateEnums convertWxOfflineState(Map<PaySceneEnums, SubChannelInfo> channelMap) {
-    SubChannelInfo wxGzhOffline = channelMap.get(PaySceneEnums.WX_GZH_OFFLINE);
-    SubChannelInfo wxXcxOffline = channelMap.get(PaySceneEnums.WX_XCX_OFFLINE);
-    if (OpenStateEnums.SUCCESS == wxGzhOffline.getOpenState()
-        && OpenStateEnums.SUCCESS == wxXcxOffline.getOpenState()) {
+  private static OpenStateEnums convertWxOfflineState(
+      Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap) {
+    SubChannelInfo wxGzhOffline = channelMap.get(SubChannelOpenTypeEnums.WX_GZH_OFFLINE);
+    SubChannelInfo wxXcxOffline = channelMap.get(SubChannelOpenTypeEnums.WX_XCX_OFFLINE);
+    if (OpenStateEnums.SUCCESS == wxGzhOffline.getState()
+        && OpenStateEnums.SUCCESS == wxXcxOffline.getState()) {
       return OpenStateEnums.SUCCESS;
     }
-    if (OpenStateEnums.FAIL == wxGzhOffline.getOpenState()) {
+    if (OpenStateEnums.FAIL == wxGzhOffline.getState()) {
       return OpenStateEnums.FAIL;
     }
-    if (OpenStateEnums.FAIL == wxXcxOffline.getOpenState()) {
+    if (OpenStateEnums.FAIL == wxXcxOffline.getState()) {
       return OpenStateEnums.FAIL;
     }
     return OpenStateEnums.PROCESS;
@@ -342,44 +341,45 @@ public class MerchantConvert {
 
   private static String convertFailMessage(List<SubChannelInfo> subChannels) {
     return subChannels.stream()
-        .filter(e -> OpenStateEnums.FAIL == e.getOpenState())
+        .filter(e -> OpenStateEnums.FAIL == e.getState())
         .map(SubChannelInfo::getFailMessage)
         .findFirst()
         .orElse(null);
   }
 
-  private static OpenStateEnums convertOpenState(Map<PaySceneEnums, SubChannelInfo> channelMap) {
+  private static OpenStateEnums convertOpenState(Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap) {
 
-    List<PaySceneEnums> sceneList = getDefaultScene();
+    List<SubChannelOpenTypeEnums> sceneList = getDefaultScene();
 
     OpenStateEnums state = OpenStateEnums.SUCCESS;
-    for (PaySceneEnums scene : sceneList) {
+    for (SubChannelOpenTypeEnums scene : sceneList) {
       SubChannelInfo subChannel = channelMap.get(scene);
-      if (OpenStateEnums.PROCESS == subChannel.getOpenState()) {
+      if (OpenStateEnums.PROCESS == subChannel.getState()) {
         state = OpenStateEnums.PROCESS;
       }
-      if (OpenStateEnums.FAIL == subChannel.getOpenState()) {
+      if (OpenStateEnums.FAIL == subChannel.getState()) {
         return OpenStateEnums.FAIL;
       }
     }
     return state;
   }
 
-  private static Map<PaySceneEnums, SubChannelInfo> convertSubChannelMap(List<SubChannelInfo> subChannels) {
-    Map<PaySceneEnums, SubChannelInfo> map = subChannels.stream()
-        .collect(Collectors.toMap(SubChannelInfo::getScene, e -> e));
-    for (OpenSingleSubChannelRequest defaultSubChannel : DEFAULT_SUB_CHANNELS) {
-      if (null == map.get(defaultSubChannel.getScene())) {
-        map.put(defaultSubChannel.getScene(),
-            SubChannelInfo.builder().scene(defaultSubChannel.getScene()).openState(OpenStateEnums.PROCESS)
+  private static Map<SubChannelOpenTypeEnums, SubChannelInfo> convertSubChannelMap(
+      List<SubChannelInfo> subChannels) {
+    Map<SubChannelOpenTypeEnums, SubChannelInfo> map = subChannels.stream()
+        .collect(Collectors.toMap(SubChannelInfo::getOpenType, e -> e));
+    for (SubChannelInfo defaultSubChannel : DEFAULT_SUB_CHANNELS) {
+      if (null == map.get(defaultSubChannel.getOpenType())) {
+        map.put(defaultSubChannel.getOpenType(),
+            SubChannelInfo.builder().openType(defaultSubChannel.getOpenType()).state(OpenStateEnums.PROCESS)
                 .build());
       }
     }
     return map;
   }
 
-  public static List<PaySceneEnums> getDefaultScene() {
-    return DEFAULT_SUB_CHANNELS.stream().map(OpenSingleSubChannelRequest::getScene)
+  public static List<SubChannelOpenTypeEnums> getDefaultScene() {
+    return DEFAULT_SUB_CHANNELS.stream().map(SubChannelInfo::getOpenType)
         .collect(Collectors.toList());
   }
 
@@ -431,9 +431,9 @@ public class MerchantConvert {
   }
 
   public static BrandMerchantVO convertBrandMerchant(BrandToMerchant relation, MerchantVO merchant) {
-    Map<PaySceneEnums, SubChannelInfo> channelMap = convertSubChannelMap(merchant.getSubChannels());
-    SubChannelInfo ali = channelMap.get(PaySceneEnums.ALI_OFFLINE);
-    SubChannelInfo wxGzhOffline = channelMap.get(PaySceneEnums.WX_GZH_OFFLINE);
+    Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap = convertSubChannelMap(merchant.getSubChannels());
+    SubChannelInfo ali = channelMap.get(SubChannelOpenTypeEnums.ALI_OFFLINE);
+    SubChannelInfo wxGzhOffline = channelMap.get(SubChannelOpenTypeEnums.WX_GZH_OFFLINE);
     OpenStateEnums wxOfflineState = convertWxOfflineState(channelMap);
     String wxOfflineFailMessage = convertWxOfflineFailMessage(channelMap);
     return BrandMerchantVO.builder()
@@ -444,12 +444,12 @@ public class MerchantConvert {
         .merchantName(merchant.getMerchantName())
         .shortName(merchant.getShortName())
         .companyType(merchant.getCompanyType())
-        .aliOpenState(ali.getOpenState())
+        .aliOpenState(ali.getState())
         .aliAuthState(convertAliAuthState(merchant.getSubChannelAuths()))
-        .aliMerchantNo(JSON.toJSONString(ali.getSubMerchantNos()))
+        .aliMerchantNo(JSON.toJSONString(ali.getMerchantNos()))
         .aliOpenFailMessage(ali.getFailMessage())
         .wxOfflineOpenState(wxOfflineState)
-        .wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getSubMerchantNos()))
+        .wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getMerchantNos()))
         .wxOfflineAuthState(convertWxOfflineAuthState(merchant.getSubChannelAuths()))
         .wxOfflineOpenFailMessage(wxOfflineFailMessage)
         .license(convertLicense(merchant.getLicense()))