feat:merchant

cdf2e799 · 程裕兵 · be967e0b · cdf2e799
Commit cdf2e799 authored Apr 18, 2024 by 程裕兵
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java
+6 -3

No files found.
--- a/service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java
+++ b/service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java
@@ -531,11 +531,14 @@ public class MerchantConvert {
        .shortName(merchant.getShortName())
        .companyType(merchant.getCompanyType())
        .aliOpenState(Optional.ofNullable(ali.getState()).map(Enum::name).orElse(null))
-        .aliAuthState(aliAuthState)
+        .aliAuthState(aliAuthState).aliMerchantNo(
-        .aliMerchantNo(JSON.toJSONString(ali.getMerchantNos()))
+            Optional.ofNullable(ali.getMerchantNos()).orElse(new ArrayList<>()).stream().findFirst()
+                .orElse(null))
        .aliOpenFailMessage(ali.getFailMessage())
        .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)
        .wxOfflineOpenFailMessage(wxOfflineFailMessage)
        .license(JsonUtil.convertObject(merchant.getLicense(), BrandLicenseVO.class))