fix

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -1,6 +1,8 @@
 package com.zhongzheng.controller.cmmon;
 
 import cn.hutool.core.lang.Validator;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
@@ -320,6 +322,9 @@ public class CommonController extends BaseController {
     {
         DistributionSellerVo vo = iDistributionSellerService.queryByShareCode(shareCode);
         vo.setNull();
+        String jsonStr = configService.selectConfigByKey("home.header");
+        JSONObject objectJson = JSON.parseObject(jsonStr);
+        vo.setTenantName(String.valueOf(objectJson.get("companyName")));
         return AjaxResult.success(vo);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSellerAddBo.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -63,4 +65,10 @@ public class DistributionSellerAddBo {
 
     @ApiModelProperty("批量用户ID")
     private List<Long> userIds;
+    /** 可提现余额(不含冻结) */
+    @ApiModelProperty("可提现余额(不含冻结)")
+    private BigDecimal cash;
+    /** 已提现余额 */
+    @ApiModelProperty("已提现余额")
+    private BigDecimal usedCash;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionSellerEditBo.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -71,4 +73,5 @@ public class DistributionSellerEditBo {
     *//** 分享码 *//*
     @ApiModelProperty("分享码")
     private String shareCode;*/
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionSeller.java

@@ -59,4 +59,8 @@ private static final long serialVersionUID=1L;
     private Long parentId;
     /** 分享码 */
     private String shareCode;
+    /** 可提现余额(不含冻结) */
+    private BigDecimal cash;
+    /** 已提现余额 */
+    private BigDecimal usedCash;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionSellerVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 
 
 /**
@@ -74,6 +75,9 @@ public class DistributionSellerVo {
 	public void setNull(){
 		this.setGzhOpenId(null);
 		this.setPassword(null);
+		this.setCash(null);
+		this.setUsedCash(null);
+
 	}
 	@ApiModelProperty("邀请人姓名")
 	private String parentName;
@@ -86,5 +90,13 @@ public class DistributionSellerVo {
 
 	@ApiModelProperty("所属机构")
 	private String tenantName;
+	/** 可提现余额(不含冻结) */
+	@Excel(name = "可提现余额(不含冻结)")
+	@ApiModelProperty("可提现余额(不含冻结)")
+	private BigDecimal cash;
+	/** 已提现余额 */
+	@Excel(name = "已提现余额")
+	@ApiModelProperty("已提现余额")
+	private BigDecimal usedCash;
 
 }