商户

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

@@ -465,8 +465,12 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          List<Object> queryParams = new ArrayList<Object>();
          
          selSql.append(" SELECT t.*, ");
-         selSql.append(" IFNULL((SELECT SUM(c.lib_service) from tb_lib_join_consume c WHERE c.from_merchant_id=t.id AND c.type=7 AND DATE_FORMAT(c.create_time,'%Y-%m')=? ),0) as sum_1, ");
-         selSql.append(" IFNULL((SELECT SUM(c.lib_service) from tb_lib_join_consume c WHERE c.from_merchant_id=t.id AND c.type in (8,11) AND DATE_FORMAT(c.create_time,'%Y-%m')=? ),0) as sum_2, ");
+         selSql.append(" (IFNULL((SELECT MAX(c.lib_service) from tb_lib_join_consume c WHERE c.from_merchant_id=t.id AND c.type=7 AND DATE_FORMAT(c.create_time,'%Y-%m')=? ),0)+  ");
+         selSql.append(" IFNULL((SELECT SUM(c.lib_service) from tb_lib_join_consume c WHERE c.from_merchant_id=t.id AND c.type=10 AND DATE_FORMAT(c.create_time,'%Y-%m')=? ),0)) ");
+         selSql.append(" as sum_1,  ");
+         selSql.append(" (IFNULL((SELECT MAX(c.lib_service) from tb_lib_join_consume c WHERE c.from_merchant_id=t.id AND c.type=8 AND DATE_FORMAT(c.create_time,'%Y-%m')=? ),0)+ ");
+         selSql.append(" IFNULL((SELECT SUM(c.lib_service) from tb_lib_join_consume c WHERE c.from_merchant_id=t.id AND c.type=11 AND DATE_FORMAT(c.create_time,'%Y-%m')=? ),0)) ");
+         selSql.append(" as sum_2,  ");
          selSql.append(" IFNULL((SELECT SUM(c.lib_service) from tb_lib_join_consume c WHERE c.from_merchant_id=t.id AND c.type=10 AND DATE_FORMAT(c.create_time,'%Y-%m')=? ),0) as sum_3, ");
          selSql.append(" IFNULL((SELECT SUM(c.lib_service) from tb_lib_join_consume c WHERE c.from_merchant_id=t.id AND c.type=11 AND DATE_FORMAT(c.create_time,'%Y-%m')=? ),0) as sum_4, ");
          selSql.append(" (SELECT COUNT(*) from tb_lib_join_consume c WHERE c.from_merchant_id=t.id AND c.type=7 AND DATE_FORMAT(c.create_time,'%Y-%m')=? ) as count_1, ");
@@ -477,6 +481,8 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          queryParams.add(params.get("startMonth"));
          queryParams.add(params.get("startMonth"));
          queryParams.add(params.get("startMonth"));
+         queryParams.add(params.get("startMonth"));
+         queryParams.add(params.get("startMonth"));
          
          queryParams.add(params.get("startMonth"));
          queryParams.add(params.get("startMonth"));