合伙人bug修改

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

@@ -297,10 +297,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Override
     @Transactional
     public HttpResult<Object> inert(SysUserAccountVo sysUserAccountVo) {
-        if (sysSwitchConfigService.isEnabled(SwitchConfig.VIRTUAL_WITHDRAWAL.getCode())){
-            SpringUtil.getBean(VirtualWithdrawal.class).virtualWithdrawal("1212", new BigDecimal("100"));
-            return HttpResult.ok();
-        }
         String userId = BaseController.getUser().getId();
         if (isManagement(userId) && sysSwitchConfigService.getBalanceExtractStatus()) {
             //  个代走线上付款

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

@@ -47,6 +47,7 @@ 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.dao.PartnerRuleMapper;
 import com.ydtech.modules.partner.dao.PartnerUserGradeMapper;
@@ -2012,32 +2013,40 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         QueryWrapper<PartnerUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", sysUser.getId());
         List<String> gradeList = sysUser.getGradeList();
-
-        List<String> sortedAsc = gradeList.stream()
-                .map(Integer::parseInt)
-                .sorted()
-                .map(String::valueOf)
-                .collect(Collectors.toList());
-
+        if (CollectionUtils.isEmpty(gradeList)){
+            return;
+        }
         List<PartnerUser> partnerUsers = partnerUserMapper.selectList(queryWrapper);
         if (CollectionUtils.isEmpty(partnerUsers)){
-            if (CollectionUtils.isEmpty(gradeList)){
-                String userId = sysUser.getId();
-                for (String s : sortedAsc) {
-//                    PartnerUser partnerUser = new PartnerUser();
-//                    partnerUser.setUserId(sysUser.getId());
-//                    partnerUser.setName(sysUser.getName());
-//                    partnerUser.setDeptId(sysUser.getDeptId());
-//                    partnerUser.
-//                    partnerUser.setDeptName(sysUser.getDeptName());
-//                    partnerUser.setGrade(Integer.valueOf(s));
-                }
+            return;
+        }
+        List<String> list = partnerUsers.stream()
+                .map(user -> String.valueOf(user.getGrade()))
+                .collect(Collectors.toList());
+
+        boolean listsEqual = ListComparator.areListsEqual(gradeList, list);
+        if (!listsEqual){
+            List<String> sortedAsc = gradeList.stream()
+                    .map(Integer::parseInt)
+                    .sorted()
+                    .map(String::valueOf)
+                    .collect(Collectors.toList());
+//            partnerUserMapper.deleteByUserId(sysUser.getId());
+//            for (String s : sortedAsc) {
+//                PartnerUser partnerUser = new PartnerUser();
+//                partnerUser.setUserId(sysUser.getId());
+//                partnerUser.setName(sysUser.getName());
+//                partnerUser.setDeptId(sysUser.getDeptId());
+//                partnerUser.setMobile(sysUser.getMobile());
+//                partnerUser.setGrade(Integer.valueOf(s));
+//                partnerUser.setGrade(Integer.valueOf(s));
+//            }
 
-            }
         }
     }
 
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult updateUserInfo1(String userId, SysUser2Vo sysUserVo) {

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

@@ -0,0 +1,31 @@
+package com.ydtech.modules.partner;
+
+import java.util.*;
+
+public class ListComparator {
+    public static <T> boolean areListsEqual(List<T> list1, List<T> list2) {
+        if (list1 == null || list2 == null) {
+            return list1 == list2;
+        }
+        if (list1.size() != list2.size()) {
+            return false;
+        }
+        Map<T, Integer> frequencyMap = new HashMap<>();
+        for (T item : list1) {
+            frequencyMap.put(item, frequencyMap.getOrDefault(item, 0) + 1);
+        }
+        for (T item : list2) {
+            if (!frequencyMap.containsKey(item)) {
+                return false;
+            }
+            int count = frequencyMap.get(item);
+            if (count == 1) {
+                frequencyMap.remove(item);
+            } else {
+                frequencyMap.put(item, count - 1);
+            }
+        }
+
+        return frequencyMap.isEmpty();
+    }
+}

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

@@ -83,20 +83,6 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUser> {
 
     Integer selectNumber3(@Param("userId") String userId, @Param("number") String number,@Param("period") CommissionValidityPeriod period);
 
-    @Select("SELECT referrer_id FROM partner_user WHERE user_id = #{userId} ")
-    String queryReferrerId(String userId);
-
-    @Select("SELECT   " +
-            "   COUNT( p.user_id )    " +
-            "FROM   " +
-            "   partner_user p   " +
-            "   LEFT JOIN sys_user u ON u.id = p.user_id    " +
-            "WHERE   " +
-            "   u.`status` = 1    " +
-            "   AND p.referrer_id = #{userId}    " +
-            "   AND p.grade = #{number}")
-    Integer selectNumberGzs(@Param("userId") String userId,@Param("number") String number);
-
 
     @Select("SELECT assessment_time FROM partner_user WHERE user_id = #{userId} AND grade = #{grade}")
     Date selectAssessmentTime(@Param("userId") String userId, @Param("grade")String grade);
@@ -121,16 +107,12 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUser> {
     Integer selectByUserIdNumber(@Param("userId") String userId,@Param("number")  String number, @Param("period") CommissionValidityPeriod period);
 
 
-
     String queryManager(String issuerId);
 
     String getGzsList(String issuerId);
 
     String getTdList(String issuerId);
 
-    @Select("SELECT * FROM partner_user WHERE user_id = #{issuerId} ")
-    PartnerUser selectByIssuerId(String issuerId);
-
     PartnerUser queryUser(@Param("referrerId")String referrerId,@Param("grade") Integer grade);
 
     Integer selectNumber4(@Param("userId") String userId,@Param("number") String number,@Param("period") CommissionValidityPeriod period);