新增str

FullCardClient/src/main/java/com/zhongshu/card/client/model/pay/RechargeOrderModel.java

@@ -2,6 +2,7 @@ package com.zhongshu.card.client.model.pay;
 
 import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.client.model.org.UserCountModel;
+import com.zhongshu.card.client.model.org.orgUser.UserOrgStoreModel;
 import com.zhongshu.card.client.type.payAccount.RechargeOrderStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -25,9 +26,29 @@ public class RechargeOrderModel {
     @Schema(description = "支付方式")
     private PaymentType paymentType;
 
+    @Schema(description = "支付方式str")
+    private String paymentTypeStr;
+
+    public String getPaymentTypeStr() {
+        if (paymentType != null) {
+            return paymentType.getRemark();
+        }
+        return "";
+    }
+
     @Schema(description = "订单状态")
     private RechargeOrderStatus status;
 
+    @Schema(description = "订单状态")
+    private RechargeOrderStatus statusStr;
+
+    public String getStatusStr() {
+        if (status != null) {
+            return status.getRemark();
+        }
+        return "";
+    }
+
     @Schema(description = "状态说明")
     private String statusDesc;
 
@@ -40,7 +61,8 @@ public class RechargeOrderModel {
     @Schema(description = "描述")
     private String description;
 
-    private UserCountModel userCountModel;
+    @Schema(description = "用户在机构的信息和基本信息")
+    private UserOrgStoreModel storeUserInfo;
 
     private String userName;
 }