代理人3.0app开发

src/main/java/com/ydtech/modules/partner/dao/PartnerUserMapper.java

@@ -201,7 +201,7 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUser> {
     @Select("SELECT identity_time FROM partner_user WHERE user_id = #{userId} AND grade = #{originalLevel}")
     Date selectLockTime(@Param("userId") String userId, @Param("originalLevel")String originalLevel);
 
-    @Select(" SELECT * FROM partner_user WHERE grade = 2 and user_id = '99140426001' and expired_time IS NOT NULL  AND identity_status = 1 AND DATE(DATE_ADD(expired_time, INTERVAL #{expireDays} DAY)) =  CURDATE()  ")
+    @Select(" SELECT * FROM partner_user WHERE expired_time IS NOT NULL  AND identity_status = 1 AND DATE(DATE_ADD(expired_time, INTERVAL #{expireDays} DAY)) =  CURDATE()  ")
     List<PartnerUser> queryExpiredRecords(Integer expireDays);
 
     @Update(" UPDATE partner_user SET expired_time = #{expiredTime} WHERE  user_id = #{userId} and grade = #{grade}  ")

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

@@ -26,6 +26,7 @@ public class PartnerExpiredCommissionServiceImpl extends ServiceImpl<PartnerExpi
         queryWrapper.eq(StringUtils.isNotBlank(expiredCommission.getName()),"name", expiredCommission.getName());
         queryWrapper.eq(StringUtils.isNotBlank(expiredCommission.getMobile()),"mobile", expiredCommission.getMobile());
         queryWrapper.eq(StringUtils.isNotBlank(expiredCommission.getUserId()),"user_id", expiredCommission.getUserId());
+        queryWrapper.orderByDesc("create_time");
         List<String> startTime = expiredCommission.getStartTime();
         if (CollectionUtil.isNotEmpty(startTime) && startTime.size() >= 2){
             String s = startTime.get(0);

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

@@ -27,6 +27,7 @@ import com.ydtech.modules.partner.utils.PartnerDateUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;;
 import java.math.BigDecimal;
 import java.util.*;
@@ -53,6 +54,9 @@ public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingR
     @Autowired
     private PartnerPremiumDetailsMapper premiumDetailsMapper;
 
+    @Value("${partner.expireDays}")
+    private Integer expireDays;
+
     @Override
     public Map<String,Object> queryPage(PartnerLiftingRecordParam recordParam) {
         QueryWrapper<PartnerLiftingRecord> queryWrapper = new QueryWrapper<>();
@@ -376,7 +380,7 @@ public class PartnerLiftingRecordServiceImpl extends ServiceImpl<PartnerLiftingR
         if (null == user || Objects.isNull(user.getIdentityTime())){
             return null;
         }
-        BigDecimal commission = detailsMapper.commissionAfterUserLocking(userId,user.getGrade(),user.getIdentityTime());
+        BigDecimal commission = detailsMapper.commissionAfterUserLocking(userId,user.getGrade(),PartnerDateUtils.addDays(user.getExpiredTime(), expireDays));
         return commission;
     }