Skip to content

F
fit-finance
Commit f84da714 by 程裕兵
Options

feat:merchant

parent 8b9fb523
Showing with 6 additions and 2 deletions
service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java
...@@ -418,10 +418,14 @@ public class MerchantConvert { ...@@ -418,10 +418,14 @@ public class MerchantConvert {
.companyType(merchant.getCompanyType()) .companyType(merchant.getCompanyType())
.aliOpenState(Optional.ofNullable(ali.getState()).map(Enum::name).orElse(null)) .aliOpenState(Optional.ofNullable(ali.getState()).map(Enum::name).orElse(null))
.aliAuthState(aliAuthState) .aliAuthState(aliAuthState)
.aliMerchantNo(JSON.toJSONString(ali.getMerchantNos())) .aliMerchantNo(
Optional.ofNullable(ali.getMerchantNos()).orElse(new ArrayList<>()).stream().findFirst()
.orElse(null))
.aliOpenFailMessage(ali.getFailMessage()) .aliOpenFailMessage(ali.getFailMessage())
.wxOfflineOpenState(Optional.ofNullable(wxOfflineState).map(Enum::name).orElse(null)) .wxOfflineOpenState(Optional.ofNullable(wxOfflineState).map(Enum::name).orElse(null))
.wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getMerchantNos())) .wxOfflineMerchantNo(
Optional.ofNullable(wxGzhOffline.getMerchantNos()).orElse(new ArrayList<>()).stream().findFirst()
.orElse(null))
.wxOfflineAuthState(wxOfflineAuthState) .wxOfflineAuthState(wxOfflineAuthState)
.wxOfflineOpenFailMessage(wxOfflineFailMessage) .wxOfflineOpenFailMessage(wxOfflineFailMessage)
.license(JsonUtil.convertObject(merchant.getLicense(), BrandLicenseVO.class)) .license(JsonUtil.convertObject(merchant.getLicense(), BrandLicenseVO.class))
......
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