TRX 1 рік тому
батько
коміт
637cc6899b

+ 18 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/withdrawal/OrgWithdrawalModel.java

@@ -28,9 +28,27 @@ public class OrgWithdrawalModel {
     @Schema(description = "提现规则类型")
     private WithdrawType withdrawType;
 
+    private String withdrawTypeStr;
+
+    public String getWithdrawTypeStr() {
+        if (withdrawType != null) {
+            return withdrawType.getRemark();
+        }
+        return "";
+    }
+
     @Schema(description = "提现方式")
     private WithdrawMethodType withdrawMethodType;
 
+    private String withdrawMethodTypeStr;
+
+    public String getWithdrawMethodTypeStr() {
+        if (withdrawMethodType != null) {
+            return withdrawMethodType.getRemark();
+        }
+        return "";
+    }
+
     @Schema(description = "最小的提现额度")
     private Long minWithdraw = 0L;
 

+ 6 - 5
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/paySetting/ProjectPaySettingServiceImpl.java

@@ -512,11 +512,12 @@ public class ProjectPaySettingServiceImpl extends SuperService {
 
         // 查询项目的提现限制
         ProjectMainPaySetting projectMainPaySetting = projectMainPaySettingService.getProjectMainPaySetting(param.getProjectOid(), param.getPaymentType());
-        model.setWithdrawType(projectMainPaySetting.getWithdrawType());
-        model.setWithdrawMethodType(projectMainPaySetting.getWithdrawMethodType());
-        model.setMaxWithdraw(projectMainPaySetting.getMaxWithdraw());
-        model.setMinWithdraw(projectMainPaySetting.getMinWithdraw());
-
+        if (projectMainPaySetting != null) {
+            model.setWithdrawType(projectMainPaySetting.getWithdrawType());
+            model.setWithdrawMethodType(projectMainPaySetting.getWithdrawMethodType());
+            model.setMaxWithdraw(projectMainPaySetting.getMaxWithdraw());
+            model.setMinWithdraw(projectMainPaySetting.getMinWithdraw());
+        }
         // 查询提现余额
         com.github.microservice.net.ResultContent<Long> content = withdrawService.queryWithdrawAmount(param.getProjectOid(), param.getOid(), param.getPaymentType());
         if (content.getState() == com.github.microservice.net.ResultState.Success) {