feat:apply

79c0f0ca · 程裕兵 · 9ca7c90d · 79c0f0ca
Commit 79c0f0ca authored Apr 16, 2024 by 程裕兵
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

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

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
@@ -239,10 +239,14 @@ public class MerchantConvert {
        .openFailMessage(openFailMessage)
        .aliOpenState(ali.getState().getCode())
        .aliAuthState(convertAliAuthState(auths))
-        .aliMerchantNo(JSON.toJSONString(ali.getMerchantNos()))
+        .aliMerchantNo(
+            Optional.ofNullable(ali.getMerchantNos()).orElse(new ArrayList<>(1)).stream().findFirst()
+                .orElse(null))
        .aliOpenFailMessage(ali.getFailMessage())
        .wxOfflineOpenState(wxOfflineState.getCode())
-        .wxOfflineMerchantNo(JSON.toJSONString(wxGzhOffline.getMerchantNos()))
+        .wxOfflineMerchantNo(
+            Optional.ofNullable(wxGzhOffline.getMerchantNos()).orElse(new ArrayList<>(1)).stream().findFirst()
+                .orElse(null))
        .wxOfflineAuthState(convertWxOfflineAuthState(auths))
        .wxOfflineOpenFailMessage(wxOfflineFailMessage)
        .finishTime(OpenStateEnums.SUCCESS == state ? new Date() : null)