合伙人bug修改

partner/src/main/java/com/jzg/controller/PartnerUserController.java

@@ -241,7 +241,7 @@ public class PartnerUserController extends BaseController {
      */
     @GetMapping("checkCommissionExpireTime")
     public void checkCommissionExpireTime() {
-        SpringUtil.getBean(TimedTaskUtils.class).updateOrderDateNoon();
+        SpringUtil.getBean(TimedTaskUtils.class).checkCommissionExpireTime();
     }
 
 

partner/src/main/java/com/jzg/service/Impl/PartnerUserServiceImpl.java

@@ -1299,11 +1299,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 //            appUserInfoVo.setInsUploadFiles(new InsUploadFiles());
         }
         appUserInfoVo.setGrade(null == min ? 4 : min);
-        SpringUtil.getBean(ExpiredCommissionUtils.class).initializeExpirationTime(userId);
-        SysUserJzgInfo sysUserJzgInfo = getSysUserJzgInfo(userId);
-        if (!Objects.isNull(sysUserJzgInfo)) {
-            appUserInfoVo.setUserInfoId(sysUserJzgInfo.getId());
-        }
+        SpringUtil.getBean(ExpiredCommissionUtils.class).initializeExpirationTime(userId,appUserInfoVo.getUserInfoId());
         return appUserInfoVo;
     }
 

partner/src/main/java/com/jzg/utils/ExpiredCommissionUtils.java

@@ -93,11 +93,11 @@ public class ExpiredCommissionUtils {
      * 登录初始化过期时间
      */
     @Transactional(rollbackFor = Exception.class)
-    public void initializeExpirationTime(String userId) {
+    public void initializeExpirationTime(String userId,String infoId) {
         List<PartnerUser> partnerUsers = partnerUserMapper.selectListByUserId(userId);
         for (PartnerUser partnerUser : partnerUsers) {
             if (null == partnerUser.getUpgradeCycleStartTime()){
-                partnerUserMapper.updateUpgradeStartTime(userId, partnerUser.getGrade());
+                partnerUserMapper.updateUpgradeStartTime(infoId, partnerUser.getGrade());
             }
         }
     }

partner/src/main/resources/mapper/PartnerUserMapper.xml

@@ -1164,7 +1164,7 @@ SELECT
 
     <select id="queryAppUserInfoVoByUserId" resultType="com.jzg.entity.vo.AppUserInfoVo">
         SELECT
-            u.id user_id,u.mobile
+            u.id user_id,u.mobile,info.id as userInfoId
         FROM
             sys_user u
                 LEFT JOIN sys_user_jzg_info info ON info.user_id = u.id