crm

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

@@ -575,10 +575,10 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          selSql.append("  SELECT t.id,t.pos_code,t.unit_name,t.type, ");
          
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_meal c WHERE c.merchant_id = t.id AND TO_DAYS( c.sign_time )< TO_DAYS( ? ) ");
+         selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_meal c WHERE c.merchant_id = t.id AND c.type>1 AND TO_DAYS( c.sign_time )< TO_DAYS( ? ) ");
          selSql.append("  ) AS init_1, ");
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_meal c WHERE c.merchant_id = t.id AND TO_DAYS( c.end_sign_time )< TO_DAYS( ? )  ");
+         selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_meal c WHERE c.merchant_id = t.id AND c.type>1 AND TO_DAYS( c.end_sign_time )< TO_DAYS( ? )  ");
          selSql.append("  ) AS init_2, ");
          selSql.append("  ( ");
          selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_sign c WHERE c.merchant_id = t.id AND TO_DAYS( c.sign_time )< TO_DAYS( ? )  ");
@@ -587,10 +587,10 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_sign c WHERE c.merchant_id = t.id AND TO_DAYS( c.end_sign_time )< TO_DAYS( ? )  ");
          selSql.append("  ) AS init_4,");
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL( SUM( o.unit_price ), 0 ) FROM fx_merchant_meal c LEFT JOIN fx_merchant_meal_order o ON c.order_id=o.id WHERE c.merchant_id = t.id AND TO_DAYS( c.sign_time )< TO_DAYS( ? ) ");
+         selSql.append("  	SELECT IFNULL( SUM( o.unit_price ), 0 ) FROM fx_merchant_meal c LEFT JOIN fx_merchant_meal_order o ON c.order_id=o.id WHERE c.merchant_id = t.id AND c.type>1 AND c.remarks is NULL  AND TO_DAYS( c.sign_time )< TO_DAYS( ? ) ");
          selSql.append("  ) AS ir_1, ");
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL( SUM( o.unit_price ), 0 ) FROM fx_merchant_meal c LEFT JOIN fx_merchant_meal_order o ON c.order_id=o.id WHERE c.merchant_id = t.id AND TO_DAYS( c.end_sign_time )< TO_DAYS( ?)  ");
+         selSql.append("  	SELECT IFNULL( SUM( o.unit_price ), 0 ) FROM fx_merchant_meal c LEFT JOIN fx_merchant_meal_order o ON c.order_id=o.id WHERE c.merchant_id = t.id AND c.type>1 AND c.remarks is NULL AND TO_DAYS( c.end_sign_time )< TO_DAYS( ?)  ");
          selSql.append("  ) AS ir_2, ");
          selSql.append("  ( ");
          selSql.append("  	SELECT IFNULL( SUM( o.unit_price ), 0 ) FROM fx_merchant_sign c LEFT JOIN fx_merchant_sign_order o ON c.order_id=o.id WHERE c.merchant_id = t.id  AND TO_DAYS( c.sign_time )< TO_DAYS( ? ) ");
@@ -606,10 +606,10 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          selSql.append("  ) AS ir_6, ");
          
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_meal c WHERE c.merchant_id = t.id AND TO_DAYS( c.sign_time )>= TO_DAYS( ? ) AND TO_DAYS( c.sign_time )<= TO_DAYS(? ) ");
+         selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_meal c WHERE c.merchant_id = t.id AND c.type>1  AND TO_DAYS( c.sign_time )>= TO_DAYS( ? ) AND TO_DAYS( c.sign_time )<= TO_DAYS(? ) ");
          selSql.append("  ) AS count_1, ");
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_meal c WHERE c.merchant_id = t.id AND TO_DAYS( c.end_sign_time )>= TO_DAYS( ? ) AND TO_DAYS( c.end_sign_time )<= TO_DAYS(? ) ");
+         selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_meal c WHERE c.merchant_id = t.id AND c.type>1  AND TO_DAYS( c.end_sign_time )>= TO_DAYS( ? ) AND TO_DAYS( c.end_sign_time )<= TO_DAYS(? ) ");
          selSql.append("  ) AS count_2, ");
          selSql.append("  ( ");
          selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_sign c WHERE c.merchant_id = t.id AND TO_DAYS( c.sign_time )>= TO_DAYS( ? ) AND TO_DAYS( c.sign_time )<= TO_DAYS(? ) ");
@@ -618,10 +618,10 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          selSql.append("  	SELECT IFNULL( SUM( c.lib_service ), 0 ) FROM fx_merchant_sign c WHERE c.merchant_id = t.id AND TO_DAYS( c.end_sign_time )>= TO_DAYS( ? ) AND TO_DAYS( c.end_sign_time )<= TO_DAYS(? ) ");
          selSql.append("  ) AS count_4,");
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL( SUM( o.unit_price ), 0 ) FROM fx_merchant_meal c LEFT JOIN fx_merchant_meal_order o ON c.order_id=o.id WHERE c.merchant_id = t.id AND TO_DAYS( c.sign_time )>= TO_DAYS( ? ) AND TO_DAYS( c.sign_time )<= TO_DAYS(? ) ");
+         selSql.append("  	SELECT IFNULL( SUM( o.unit_price ), 0 ) FROM fx_merchant_meal c LEFT JOIN fx_merchant_meal_order o ON c.order_id=o.id WHERE c.merchant_id = t.id AND c.type>1 AND c.remarks is NULL AND TO_DAYS( c.sign_time )>= TO_DAYS( ? ) AND TO_DAYS( c.sign_time )<= TO_DAYS(? ) ");
          selSql.append("  ) AS pr_1, ");
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL( SUM( o.unit_price ), 0 ) FROM fx_merchant_meal c LEFT JOIN fx_merchant_meal_order o ON c.order_id=o.id WHERE c.merchant_id = t.id AND TO_DAYS( c.end_sign_time )>= TO_DAYS( ?) AND TO_DAYS( c.end_sign_time )<= TO_DAYS(?) ");
+         selSql.append("  	SELECT IFNULL( SUM( o.unit_price ), 0 ) FROM fx_merchant_meal c LEFT JOIN fx_merchant_meal_order o ON c.order_id=o.id WHERE c.merchant_id = t.id AND c.type>1 AND c.remarks is NULL AND TO_DAYS( c.end_sign_time )>= TO_DAYS( ?) AND TO_DAYS( c.end_sign_time )<= TO_DAYS(?) ");
          selSql.append("  ) AS pr_2, ");
          selSql.append("  ( ");
          selSql.append("  	SELECT IFNULL( SUM( o.unit_price ), 0 ) FROM fx_merchant_sign c LEFT JOIN fx_merchant_sign_order o ON c.order_id=o.id WHERE c.merchant_id = t.id  AND TO_DAYS( c.sign_time )>= TO_DAYS( ? ) AND TO_DAYS( c.sign_time )<= TO_DAYS(? ) ");