feat:get merchant

710f5e26 · 程裕兵 · dacd4285 · 710f5e26
Commit 710f5e26 authored Apr 19, 2024 by 程裕兵
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
+1 -1

No files found.
--- a/service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
+++ b/service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
@@ -100,7 +100,7 @@ public class PayConvert {
        .goods(params.getGoods())
        .remark(params.getRemark())
        .existRelatedTrans(false)
-        .extra(JSON.toJSONString(params.getExtra()))
+        .extra(JSON.toJSONString(Optional.ofNullable(params.getExtra()).orElse(new JSONObject())))
        .tradingTime(new Date())
        .createTime(new Date())
        .updateTime(new Date())