feat:merchant

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)
-        .aliMerchantNo(JSON.toJSONString(ali.getMerchantNos()))
+        .aliAuthState(aliAuthState).aliMerchantNo(
+            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))