修改查询代理商团练宝销售总数逻辑

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantProxyDividendDao.java

@@ -30,5 +30,7 @@ public interface TenantProxyDividendDao extends BaseMapper<TenantProxyDividend>
      */
     <T> IPage<T> queryProxyDividendInfo(Page<T> page, @Param("param") Map<String, Object> param);
 
+   int queryProxyDividendCount(@Param("param") Map<String, Object> param);
+
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantProxyDividendServiceImpl.java

@@ -76,14 +76,15 @@ public class TenantProxyDividendServiceImpl extends ServiceImpl<TenantProxyDivid
             long count = preJoinsList.stream().filter(a -> a.getState() == 1).count();
             result.setPreTenant((int) count);
         }
+
+        //团练宝销售数
+        int count = baseMapper.queryProxyDividendCount(param);
+        result.setMemberCount(count);
+
         //分页查询分润记录
         Page<ProxyDividendVo.ProxyDividendInfoVo> pageInfo = PageUtil.getPageInfo(param);
         pageInfo.setAsc("a.active_time_");
         IPage<ProxyDividendVo.ProxyDividendInfoVo> tiPage = baseMapper.queryProxyDividendInfo(pageInfo, param);
-        Integer reduce = tiPage.getRecords().stream()
-                .map(ProxyDividendVo.ProxyDividendInfoVo::getActiveCount)
-                .reduce(0, Integer::sum);
-        result.setMemberCount(reduce);
         result.setPageData(PageUtil.pageInfo(tiPage));
         return result;
     }

mec-biz/src/main/resources/config/mybatis/TenantProxyDividendMapper.xml

@@ -52,4 +52,26 @@
         </where>
     </select>
 
+    <select id="queryProxyDividendCount" resultType="int" parameterType="map">
+        select SUM(IFNULL(a.total_month_,0)) as activeCount
+        from tenant_proxy_dividend as a
+        left join tenant_proxy_info as b on a.proxy_id_ = b.id_
+        left join tenant_info as c on a.tenant_id_ = c.id_
+        left join sys_user as d on c.recommender_ = d.id_
+        <where>
+            <if test="param.proxyId != null">
+                AND a.proxy_id_ = #{param.proxyId}
+            </if>
+            <if test="param.recommenderId != null">
+                AND c.recommender_ = #{param.recommenderId}
+            </if>
+            <if test="param.startDate != null">
+                AND a.active_time_ <![CDATA[ >= ]]> #{param.startDate}
+            </if>
+            <if test="param.endDate != null">
+                AND a.active_time_ <![CDATA[ <= ]]> #{param.endDate}
+            </if>
+        </where>
+    </select>
+
 </mapper>