结算

src/main/java/com/ssj/dao/sys/fx/dao/impl/FinanceQueryDaoImpl.java

@@ -431,7 +431,7 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          }
          selSql.append(" ) AS cons_count");
          selSql.append(",( ");
-         selSql.append(" 	SELECT IFNULL(SUM(c.lib_service),0) from tb_lib_join_consume c where c.from_merchant_id=t.id AND c.type=3 ");
+         selSql.append(" 	SELECT IFNULL(SUM(c.lib_service),0) from tb_lib_join_consume c,fx_merchant d where d.org_code like concat(t.org_code,'%') and c.from_merchant_id = d.id AND c.type=3 ");
          if(!StringUtil.isEmpty(params.get("startMonth"))){
         	 selSql.append(" AND DATE_FORMAT(c.create_time,'%Y-%m')=?  ");
              queryParams.add(params.get("startMonth"));