获取身价的信息返回修改

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/orderpercentage/vo/OrderPercentageDoubleSaveReqVO.java

@@ -43,7 +43,8 @@ public class OrderPercentageDoubleSaveReqVO {
     @Schema(description = "是否启用 0关闭 1启动", example = "2")
     private Integer status;
 
-
+    @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
+    private String baseMaxQuota;
 
 
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/orderpercentage/vo/OrderPercentagePageReqVO.java

@@ -49,4 +49,7 @@ public class OrderPercentagePageReqVO extends PageParam {
     private LocalDateTime[] createTime;
     @Schema(description = "是否启用 0关闭 1启动", example = "2")
     private Integer status;
+
+    @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
+    private String baseMaxQuota;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/orderpercentage/vo/OrderPercentageRespVO.java

@@ -59,4 +59,7 @@ public class OrderPercentageRespVO {
     private LocalDateTime createTime;
     @Schema(description = "是否启用 0关闭 1启动", example = "2")
     private Integer status;
+
+    @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
+    private String baseMaxQuota;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/orderpercentage/vo/OrderPercentageSaveReqVO.java

@@ -44,7 +44,8 @@ public class OrderPercentageSaveReqVO {
     private Integer status;
 
 
-
+    @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
+    private String baseMaxQuota;
 
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionbrothers/vo/PartitionBrothersPageReqVO.java

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.partitionbrothers.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -37,4 +36,7 @@ public class PartitionBrothersPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
+    private String baseMaxQuota;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/app/ptprofitlog/vo/PtProfitLogPageReqVO.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -49,5 +50,6 @@ public class PtProfitLogPageReqVO extends PageParam {
     private String percentTemplate;
 
     @Schema(description = "是否冻结  true-冻结  false-可用")
+    @NotNull(message = "是否冻结不能为空")
     private Boolean isFreeze;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/orderpercentage/OrderPercentageDO.java

@@ -68,4 +68,9 @@ public class OrderPercentageDO extends BaseDO {
 
     private Integer status;
 
+    /**
+     * 用户注册后，获得的基础最大合赢奖、直推奖积分限额
+     */
+    private String baseMaxQuota;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/ptprofitlog/PtProfitLogMapper.java

@@ -24,10 +24,16 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                 .eqIfPresent(PtProfitLogDO::getPercentTemplate, reqVO.getPercentTemplate())
                 .eqIfPresent(PtProfitLogDO::getUserId, reqVO.getUserId())
                 .orderByDesc(PtProfitLogDO::getCreateTime);
-        if(reqVO.getIsFreeze()){
-            queryWrapper.isNotNull(PtProfitLogDO::getAmount);
+        if(!reqVO.getIsFreeze()){
+            queryWrapper
+                    .isNotNull(PtProfitLogDO::getAmount)
+                    .ne(PtProfitLogDO::getAmount,0)
+            ;
         }else{
-            queryWrapper.isNotNull(PtProfitLogDO::getFreezeAmount);
+            queryWrapper
+                    .isNotNull(PtProfitLogDO::getFreezeAmount)
+                    .ne(PtProfitLogDO::getFreezeAmount,0)
+            ;
         }
         return selectPage(reqVO, queryWrapper);
     }