Skip to content

F
fit-finance
Commit 6beab951 by 程裕兵
Options

feat:remove invalid code

parent 8bcd5460
Showing with 46 additions and 46 deletions
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; ...@@ -3,7 +3,6 @@ package com.jiejing.fitness.finance.service.merchant.convert;
import static com.jiejing.paycenter.common.enums.merchant.ResourceTypeEnums.*; import static com.jiejing.paycenter.common.enums.merchant.ResourceTypeEnums.*;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.jiejing.common.utils.convert.BeanUtil; import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.common.utils.crypt.AesUtil; import com.jiejing.common.utils.crypt.AesUtil;
...@@ -21,17 +20,16 @@ import com.jiejing.fitness.finance.repository.entity.BrandMerchantApply; ...@@ -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.repository.entity.BrandToMerchant;
import com.jiejing.fitness.finance.service.merchant.params.ApplyBrandMerchantParams; import com.jiejing.fitness.finance.service.merchant.params.ApplyBrandMerchantParams;
import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest; 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.request.UploadRequest;
import com.jiejing.paycenter.api.merchant.vo.MerchantVO; import com.jiejing.paycenter.api.merchant.vo.MerchantVO;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums; import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.BusinessTypeEnums; import com.jiejing.paycenter.common.enums.merchant.BusinessTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.LicenseTypeEnums; import com.jiejing.paycenter.common.enums.merchant.LicenseTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.MccEnums; 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.ResourceTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.SceneTypeEnums; import com.jiejing.paycenter.common.enums.merchant.SceneTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.SubChannelAuthTypeEnums; 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.event.MerchantEvent;
import com.jiejing.paycenter.common.model.Address; import com.jiejing.paycenter.common.model.Address;
import com.jiejing.paycenter.common.model.BankCard; import com.jiejing.paycenter.common.model.BankCard;
...@@ -62,12 +60,12 @@ public class MerchantConvert { ...@@ -62,12 +60,12 @@ public class MerchantConvert {
private final static BigDecimal WX_OFFLINE_FEE_RATE = new BigDecimal("0.38"); private final static BigDecimal WX_OFFLINE_FEE_RATE = new BigDecimal("0.38");
private final static List<OpenSingleSubChannelRequest> DEFAULT_SUB_CHANNELS = Lists.newArrayList( private final static List<SubChannelInfo> DEFAULT_SUB_CHANNELS = Lists.newArrayList(
OpenSingleSubChannelRequest.builder().scene(PaySceneEnums.ALI_OFFLINE).feeRate(ALI_OFFLINE_FEE_RATE) SubChannelInfo.builder().openType(SubChannelOpenTypeEnums.ALI_OFFLINE).feeRate(ALI_OFFLINE_FEE_RATE)
.build(), .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(), .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() .build()
); );
...@@ -224,11 +222,11 @@ public class MerchantConvert { ...@@ -224,11 +222,11 @@ public class MerchantConvert {
public static BrandMerchantApply convertApply(BrandMerchantApply apply, MerchantEvent event) { 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); OpenStateEnums state = convertOpenState(channelMap);
String openFailMessage = OpenStateEnums.FAIL == state ? convertFailMessage(event.getSubChannels()) : null; String openFailMessage = OpenStateEnums.FAIL == state ? convertFailMessage(event.getSubChannels()) : null;
SubChannelInfo ali = channelMap.get(PaySceneEnums.ALI_OFFLINE); SubChannelInfo ali = channelMap.get(SubChannelOpenTypeEnums.ALI_OFFLINE);
SubChannelInfo wxGzhOffline = channelMap.get(PaySceneEnums.WX_GZH_OFFLINE); SubChannelInfo wxGzhOffline = channelMap.get(SubChannelOpenTypeEnums.WX_GZH_OFFLINE);
OpenStateEnums wxOfflineState = convertWxOfflineState(channelMap); OpenStateEnums wxOfflineState = convertWxOfflineState(channelMap);
String wxOfflineFailMessage = convertWxOfflineFailMessage(channelMap); String wxOfflineFailMessage = convertWxOfflineFailMessage(channelMap);
return BrandMerchantApply.builder() return BrandMerchantApply.builder()
...@@ -245,12 +243,12 @@ public class MerchantConvert { ...@@ -245,12 +243,12 @@ public class MerchantConvert {
.companyType(event.getCompanyType()) .companyType(event.getCompanyType())
.openState(state) .openState(state)
.openFailMessage(openFailMessage) .openFailMessage(openFailMessage)
.aliOpenState(ali.getOpenState()) .aliOpenState(ali.getState())
.aliAuthState(convertAliAuthState(event.getSubChannelAuths())) .aliAuthState(convertAliAuthState(event.getSubChannelAuths()))
.aliMerchantNo(JSON.toJSONString(ali.getSubMerchantNos())) .aliMerchantNo(JSON.toJSONString(ali.getMerchantNos()))
.aliOpenFailMessage(ali.getFailMessage()) .aliOpenFailMessage(ali.getFailMessage())
.wxOfflineOpenState(wxOfflineState) .wxOfflineOpenState(wxOfflineState)
.wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getSubMerchantNos())) .wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getMerchantNos()))
.wxOfflineAuthState(convertWxOfflineAuthState(event.getSubChannelAuths())) .wxOfflineAuthState(convertWxOfflineAuthState(event.getSubChannelAuths()))
.wxOfflineOpenFailMessage(wxOfflineFailMessage) .wxOfflineOpenFailMessage(wxOfflineFailMessage)
.finishTime(OpenStateEnums.SUCCESS == state ? new Date() : null) .finishTime(OpenStateEnums.SUCCESS == state ? new Date() : null)
...@@ -312,29 +310,30 @@ public class MerchantConvert { ...@@ -312,29 +310,30 @@ public class MerchantConvert {
.orElse(null); .orElse(null);
} }
private static String convertWxOfflineFailMessage(Map<PaySceneEnums, SubChannelInfo> channelMap) { private static String convertWxOfflineFailMessage(Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap) {
SubChannelInfo wxGzhOffline = channelMap.get(PaySceneEnums.WX_GZH_OFFLINE); SubChannelInfo wxGzhOffline = channelMap.get(SubChannelOpenTypeEnums.WX_GZH_OFFLINE);
SubChannelInfo wxXcxOffline = channelMap.get(PaySceneEnums.WX_XCX_OFFLINE); SubChannelInfo wxXcxOffline = channelMap.get(SubChannelOpenTypeEnums.WX_XCX_OFFLINE);
if (OpenStateEnums.FAIL == wxGzhOffline.getOpenState()) { if (OpenStateEnums.FAIL == wxGzhOffline.getState()) {
return wxGzhOffline.getFailMessage(); return wxGzhOffline.getFailMessage();
} }
if (OpenStateEnums.FAIL == wxXcxOffline.getOpenState()) { if (OpenStateEnums.FAIL == wxXcxOffline.getState()) {
return wxXcxOffline.getFailMessage(); return wxXcxOffline.getFailMessage();
} }
return null; return null;
} }
private static OpenStateEnums convertWxOfflineState(Map<PaySceneEnums, SubChannelInfo> channelMap) { private static OpenStateEnums convertWxOfflineState(
SubChannelInfo wxGzhOffline = channelMap.get(PaySceneEnums.WX_GZH_OFFLINE); Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap) {
SubChannelInfo wxXcxOffline = channelMap.get(PaySceneEnums.WX_XCX_OFFLINE); SubChannelInfo wxGzhOffline = channelMap.get(SubChannelOpenTypeEnums.WX_GZH_OFFLINE);
if (OpenStateEnums.SUCCESS == wxGzhOffline.getOpenState() SubChannelInfo wxXcxOffline = channelMap.get(SubChannelOpenTypeEnums.WX_XCX_OFFLINE);
&& OpenStateEnums.SUCCESS == wxXcxOffline.getOpenState()) { if (OpenStateEnums.SUCCESS == wxGzhOffline.getState()
&& OpenStateEnums.SUCCESS == wxXcxOffline.getState()) {
return OpenStateEnums.SUCCESS; return OpenStateEnums.SUCCESS;
} }
if (OpenStateEnums.FAIL == wxGzhOffline.getOpenState()) { if (OpenStateEnums.FAIL == wxGzhOffline.getState()) {
return OpenStateEnums.FAIL; return OpenStateEnums.FAIL;
} }
if (OpenStateEnums.FAIL == wxXcxOffline.getOpenState()) { if (OpenStateEnums.FAIL == wxXcxOffline.getState()) {
return OpenStateEnums.FAIL; return OpenStateEnums.FAIL;
} }
return OpenStateEnums.PROCESS; return OpenStateEnums.PROCESS;
...@@ -342,44 +341,45 @@ public class MerchantConvert { ...@@ -342,44 +341,45 @@ public class MerchantConvert {
private static String convertFailMessage(List<SubChannelInfo> subChannels) { private static String convertFailMessage(List<SubChannelInfo> subChannels) {
return subChannels.stream() return subChannels.stream()
.filter(e -> OpenStateEnums.FAIL == e.getOpenState()) .filter(e -> OpenStateEnums.FAIL == e.getState())
.map(SubChannelInfo::getFailMessage) .map(SubChannelInfo::getFailMessage)
.findFirst() .findFirst()
.orElse(null); .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; OpenStateEnums state = OpenStateEnums.SUCCESS;
for (PaySceneEnums scene : sceneList) { for (SubChannelOpenTypeEnums scene : sceneList) {
SubChannelInfo subChannel = channelMap.get(scene); SubChannelInfo subChannel = channelMap.get(scene);
if (OpenStateEnums.PROCESS == subChannel.getOpenState()) { if (OpenStateEnums.PROCESS == subChannel.getState()) {
state = OpenStateEnums.PROCESS; state = OpenStateEnums.PROCESS;
} }
if (OpenStateEnums.FAIL == subChannel.getOpenState()) { if (OpenStateEnums.FAIL == subChannel.getState()) {
return OpenStateEnums.FAIL; return OpenStateEnums.FAIL;
} }
} }
return state; return state;
} }
private static Map<PaySceneEnums, SubChannelInfo> convertSubChannelMap(List<SubChannelInfo> subChannels) { private static Map<SubChannelOpenTypeEnums, SubChannelInfo> convertSubChannelMap(
Map<PaySceneEnums, SubChannelInfo> map = subChannels.stream() List<SubChannelInfo> subChannels) {
.collect(Collectors.toMap(SubChannelInfo::getScene, e -> e)); Map<SubChannelOpenTypeEnums, SubChannelInfo> map = subChannels.stream()
for (OpenSingleSubChannelRequest defaultSubChannel : DEFAULT_SUB_CHANNELS) { .collect(Collectors.toMap(SubChannelInfo::getOpenType, e -> e));
if (null == map.get(defaultSubChannel.getScene())) { for (SubChannelInfo defaultSubChannel : DEFAULT_SUB_CHANNELS) {
map.put(defaultSubChannel.getScene(), if (null == map.get(defaultSubChannel.getOpenType())) {
SubChannelInfo.builder().scene(defaultSubChannel.getScene()).openState(OpenStateEnums.PROCESS) map.put(defaultSubChannel.getOpenType(),
SubChannelInfo.builder().openType(defaultSubChannel.getOpenType()).state(OpenStateEnums.PROCESS)
.build()); .build());
} }
} }
return map; return map;
} }
public static List<PaySceneEnums> getDefaultScene() { public static List<SubChannelOpenTypeEnums> getDefaultScene() {
return DEFAULT_SUB_CHANNELS.stream().map(OpenSingleSubChannelRequest::getScene) return DEFAULT_SUB_CHANNELS.stream().map(SubChannelInfo::getOpenType)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
...@@ -431,9 +431,9 @@ public class MerchantConvert { ...@@ -431,9 +431,9 @@ public class MerchantConvert {
} }
public static BrandMerchantVO convertBrandMerchant(BrandToMerchant relation, MerchantVO merchant) { public static BrandMerchantVO convertBrandMerchant(BrandToMerchant relation, MerchantVO merchant) {
Map<PaySceneEnums, SubChannelInfo> channelMap = convertSubChannelMap(merchant.getSubChannels()); Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap = convertSubChannelMap(merchant.getSubChannels());
SubChannelInfo ali = channelMap.get(PaySceneEnums.ALI_OFFLINE); SubChannelInfo ali = channelMap.get(SubChannelOpenTypeEnums.ALI_OFFLINE);
SubChannelInfo wxGzhOffline = channelMap.get(PaySceneEnums.WX_GZH_OFFLINE); SubChannelInfo wxGzhOffline = channelMap.get(SubChannelOpenTypeEnums.WX_GZH_OFFLINE);
OpenStateEnums wxOfflineState = convertWxOfflineState(channelMap); OpenStateEnums wxOfflineState = convertWxOfflineState(channelMap);
String wxOfflineFailMessage = convertWxOfflineFailMessage(channelMap); String wxOfflineFailMessage = convertWxOfflineFailMessage(channelMap);
return BrandMerchantVO.builder() return BrandMerchantVO.builder()
...@@ -444,12 +444,12 @@ public class MerchantConvert { ...@@ -444,12 +444,12 @@ public class MerchantConvert {
.merchantName(merchant.getMerchantName()) .merchantName(merchant.getMerchantName())
.shortName(merchant.getShortName()) .shortName(merchant.getShortName())
.companyType(merchant.getCompanyType()) .companyType(merchant.getCompanyType())
.aliOpenState(ali.getOpenState()) .aliOpenState(ali.getState())
.aliAuthState(convertAliAuthState(merchant.getSubChannelAuths())) .aliAuthState(convertAliAuthState(merchant.getSubChannelAuths()))
.aliMerchantNo(JSON.toJSONString(ali.getSubMerchantNos())) .aliMerchantNo(JSON.toJSONString(ali.getMerchantNos()))
.aliOpenFailMessage(ali.getFailMessage()) .aliOpenFailMessage(ali.getFailMessage())
.wxOfflineOpenState(wxOfflineState) .wxOfflineOpenState(wxOfflineState)
.wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getSubMerchantNos())) .wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getMerchantNos()))
.wxOfflineAuthState(convertWxOfflineAuthState(merchant.getSubChannelAuths())) .wxOfflineAuthState(convertWxOfflineAuthState(merchant.getSubChannelAuths()))
.wxOfflineOpenFailMessage(wxOfflineFailMessage) .wxOfflineOpenFailMessage(wxOfflineFailMessage)
.license(convertLicense(merchant.getLicense())) .license(convertLicense(merchant.getLicense()))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment