合伙人升级bug修改

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

@@ -448,11 +448,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         referrerInfo.put("userName",partnerUser.getName());
         HashMap<String, Object> map = new HashMap<>();
         List<JSONObject> list = new ArrayList<>();
-
         buildUserHierarchyResult(partnerUser.getUserId(),partnerUser.getGrade(),null,getRule(),list);
-
-
-        //getLevelData(partnerUser.getUserId(),partnerUser.getGrade(),list, getRule());
         map.put("list",list);
         map.put("referrer",referrerInfo);
         return HttpResult.ok(map);
@@ -903,7 +899,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
 //        Map<String, Integer> mergedMap = arrayList.stream()
 //                .flatMap(map -> map.entrySet().stream())
-//                .collect(Collectors.toMap(
+//                .collect(Collectors.toMap(qw
 //                        Map.Entry::getKey,
 //                        Map.Entry::getValue,
 //                        Integer::sum

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

@@ -266,15 +266,10 @@ select grade,grade_name from  partner_rule
             p.grade = 3
             AND p.referrer_id = #{params.userId}
             )),0) v4,
-            ifnull(
-                (
-                SELECT SUM(db.sumpremium) FROM (
-                SELECT sumpremium FROM partner_premium_details WHERE  to_days(create_time) = to_days(now()) AND user_id = #{params.userId} and source = #{params.grade}
-                GROUP BY issuer_id,sumpremium ) db
-                ),0
+            ifnull((SELECT sumpremium FROM partner_premium_details WHERE  to_days(create_time) = to_days(now()) AND user_id = #{params.userId} and source = #{grade}),0
             ) v5,
             ifnull(
-                (SELECT SUM(extract_fee) FROM partner_premium_details WHERE  to_days(create_time) = to_days(now()) AND user_id = #{params.userId}),0
+                (SELECT SUM(extract_fee) FROM partner_premium_details WHERE source = #{grade} AND to_days(create_time) = to_days(now()) AND user_id = #{params.userId}),0
             ) v6
         </if>
         <if test="grade == 3">
@@ -325,14 +320,10 @@ select grade,grade_name from  partner_rule
                 AND p.referrer_id = #{params.userId}
                 )),0
             ) v4,
-            ifnull((
-                SELECT SUM(db.sumpremium) FROM (
-                SELECT sumpremium FROM partner_premium_details WHERE  to_days(create_time) = to_days(now()) AND user_id = #{params.userId} and source = #{params.grade}
-                GROUP BY issuer_id,sumpremium ) db
-                ),0
+            ifnull((SELECT sumpremium FROM partner_premium_details WHERE  to_days(create_time) = to_days(now()) AND user_id = #{params.userId} and source = #{grade} ),0
             ) v5,
             ifnull(
-            (SELECT SUM(extract_fee) FROM partner_premium_details WHERE  to_days(create_time) = to_days(now()) AND user_id = #{params.userId}),0
+            (SELECT SUM(extract_fee) FROM partner_premium_details WHERE source = #{grade} and to_days(create_time) = to_days(now()) AND user_id = #{params.userId}),0
             ) v6
         </if>
         <if test="grade == 4">
@@ -385,8 +376,8 @@ select grade,grade_name from  partner_rule
             AND p.referrer_id = #{params.userId}
             )),0
             ) v4,
-            ifnull( (SELECT SUM(sumpremium) FROM partner_premium_details WHERE user_id = #{params.userId} AND to_days(create_time) = to_days(now())),0 ) v5,
-            ifnull( (SELECT SUM(extract_fee) FROM partner_premium_details WHERE user_id = #{params.userId} AND to_days(create_time) = to_days(now())),0 ) v6
+            ifnull( (SELECT SUM(sumpremium) FROM partner_premium_details WHERE source = #{grade} and user_id = #{params.userId} AND to_days(create_time) = to_days(now())),0 ) v5,
+            ifnull( (SELECT SUM(extract_fee) FROM partner_premium_details WHERE source = #{grade} and user_id = #{params.userId} AND to_days(create_time) = to_days(now())),0 ) v6
         </if>
     </select>