更改包路径

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -5,7 +5,6 @@ import cn.dev33.satoken.session.TokenSign;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -27,7 +26,7 @@ import com.ydtech.modules.admin.model.po.SysUserLinkSys;
 import com.ydtech.modules.admin.model.vo.*;
 import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.modules.partner.UpdateRatioUtils;
+import com.ydtech.modules.partner.utils.UpdateRatioUtils;
 import com.ydtech.modules.partner.service.PartnerUserService;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.IPUtil;
@@ -44,7 +43,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -40,7 +40,7 @@ import com.ydtech.modules.message.constants.MessageTypeConstants;
 import com.ydtech.modules.message.service.MessageSecretaryService;
 import com.ydtech.modules.order.entity.po.InsUploadFiles;
 import com.ydtech.modules.order.service.InsUploadFilesService;
-import com.ydtech.modules.partner.UpdateRatioUtils;
+import com.ydtech.modules.partner.utils.UpdateRatioUtils;
 import com.ydtech.modules.partner.dao.PartnerUserMapper;
 import com.ydtech.modules.partner.model.PartnerUser;
 import com.ydtech.modules.protocol.utils.AssertionUtils;

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -47,8 +47,8 @@ import com.ydtech.modules.message.constants.MessageTypeConstants;
 import com.ydtech.modules.message.entity.SystemMessage;
 import com.ydtech.modules.message.service.MessageSecretaryService;
 import com.ydtech.modules.message.service.SystemMessageService;
-import com.ydtech.modules.partner.ListComparator;
-import com.ydtech.modules.partner.UpdateRatioUtils;
+import com.ydtech.modules.partner.utils.ListComparator;
+import com.ydtech.modules.partner.utils.UpdateRatioUtils;
 import com.ydtech.modules.partner.dao.PartnerUserMapper;
 import com.ydtech.modules.partner.model.PartnerUser;
 import com.ydtech.modules.partner.model.vo.CommissionRulesVo;
@@ -79,7 +79,6 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 @Service

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -71,14 +71,11 @@ import com.ydtech.modules.order.entity.vo.ya.YaExtendInfoDto;
 import com.ydtech.modules.order.entity.vo.yangguang.YgQuoteAccidentVo;
 import com.ydtech.modules.order.entity.vo.zj.ZjQuoteAccidentVo;
 import com.ydtech.modules.order.service.*;
-import com.ydtech.modules.partner.CalculateCommissionUtils;
-import com.ydtech.modules.partner.KickbackChangeUtils;
+import com.ydtech.modules.partner.utils.CalculateCommissionUtils;
+import com.ydtech.modules.partner.utils.KickbackChangeUtils;
 import com.ydtech.modules.partner.dao.PartnerPremiumDetailsMapper;
-import com.ydtech.modules.partner.model.PartnerKickbackChange;
-import com.ydtech.modules.partner.model.PartnerPartnerAccount;
 import com.ydtech.modules.partner.model.PartnerPremiumDetails;
 import com.ydtech.modules.partner.model.PartnerUser;
-import com.ydtech.modules.partner.service.PartnerKickbackChangeService;
 import com.ydtech.modules.partner.service.PartnerUserService;
 import com.ydtech.modules.protocol.entity.constants.PtlApiType;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementInsCompanyDto;

src/main/java/com/ydtech/modules/partner/controller/NewAppPartnerController.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.partner.controller;
 
 
-import cn.hutool.extra.spring.SpringUtil;
 import com.alipay.api.AlipayApiException;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
@@ -11,7 +10,6 @@ import com.ydtech.modules.admin.model.vo.*;
 import com.ydtech.modules.admin.service.SysPartnerService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.modules.partner.UpdateRatioUtils;
 import com.ydtech.modules.partner.model.param.AppHomeParams;
 import com.ydtech.modules.partner.service.PartnerUserService;
 import com.ydtech.modules.protocol.utils.AssertionUtils;

src/main/java/com/ydtech/modules/partner/model/param/PartnerRuleEntity.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -44,7 +45,14 @@ public class PartnerRuleEntity implements Serializable {
     @ApiModelProperty(value = "考核周期")
     private PartnerAttribute cycle;
 
+    @ApiModelProperty(value = "天数")
+    private Integer khDays;
 
+    @ApiModelProperty(value = "0-勾选降级；1-未勾选")
+    private boolean fallTick;
+
+    @ApiModelProperty(value = "购买保级金额")
+    private BigDecimal fallAmount;
 
 
 

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -5,29 +5,22 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
-import cn.hutool.core.bean.BeanUtil;
+
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.admin.controller.SysUserController;
-import com.ydtech.modules.admin.dao.SysPartnerConfigMapper;
 import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.vo.AppUserInfoVo;
 import com.ydtech.modules.admin.model.vo.SysUser2Vo;
 import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.modules.esm.dao.EsmUserImageMapper;
-import com.ydtech.modules.esm.model.EsmUserImage;
 import com.ydtech.modules.order.dao.InsUploadFilesMapper;
 import com.ydtech.modules.order.entity.api.zhongmei.constants.TimeConstants;
 import com.ydtech.modules.order.entity.po.InsUploadFiles;
-import com.ydtech.modules.partner.CalculateCommissionUtils;
 import com.ydtech.modules.partner.dao.PartnerLiftingRecordMapper;
 import com.ydtech.modules.partner.dao.PartnerPartnerAccountMapper;
 import com.ydtech.modules.partner.dao.PartnerPremiumDetailsMapper;
@@ -47,7 +40,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static net.sf.jsqlparser.parser.feature.Feature.values;
 

src/main/java/com/ydtech/modules/partner/CalculateCommissionUtils.java → src/main/java/com/ydtech/modules/partner/utils/CalculateCommissionUtils.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.partner;
+package com.ydtech.modules.partner.utils;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

src/main/java/com/ydtech/modules/partner/KickbackChangeUtils.java → src/main/java/com/ydtech/modules/partner/utils/KickbackChangeUtils.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.partner;
+package com.ydtech.modules.partner.utils;
 
 
 import com.ydtech.modules.partner.model.PartnerKickbackChange;

src/main/java/com/ydtech/modules/partner/ListComparator.java → src/main/java/com/ydtech/modules/partner/utils/ListComparator.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.partner;
+package com.ydtech.modules.partner.utils;
 
 import java.util.*;
 

src/main/java/com/ydtech/modules/partner/UpdateRatioUtils.java → src/main/java/com/ydtech/modules/partner/utils/UpdateRatioUtils.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.partner;
+package com.ydtech.modules.partner.utils;
 
 
 import cn.hutool.core.collection.CollectionUtil;

src/main/resources/mapper/modules/partner/PartnerAttributeMapper.xml

@@ -11,6 +11,9 @@
         <result property="appraise" column="appraise"/>
         <result property="relSatisfy" column="rel_satisfy"/>
         <result property="strategy" column="strategy"/>
+        <result property="khDays" column="kh_days"/>
+        <result property="fallTick" column="fall_tick"/>
+        <result property="fallAmount" column="fall_amount"/>
         <association property="cycle"  column="id=id" select="selectCycle" />
         <collection property="strategyArray" column="id=id" select="selectStrategy" />
         <collection property="requirement" column="id=id" select="selectRequirement" />
@@ -33,7 +36,7 @@
     </resultMap>
 
     <select id="queryAll" resultMap="BaseMapper">
-        select id, upgrade, relegation, grade_name, grade, appraise, rel_satisfy,strategy from partner_rule
+        select id, upgrade, relegation, grade_name, grade, appraise, rel_satisfy,strategy,kh_days,fall_tick,fall_amount from partner_rule
     </select>