crm

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

@@ -583,25 +583,25 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          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 c.type>1 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.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( ? )  ");
          selSql.append("  ) AS init_3, ");
          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.end_sign_time )< TO_DAYS( ? )  ");
+         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( ? )  ");
          selSql.append("  ) AS init_4,");
          selSql.append("  ( ");
          selSql.append("  	SELECT IFNULL( SUM( o.price ), 0 ) FROM fx_merchant_meal_order o  WHERE o.merchant_id = t.id AND TO_DAYS( o.create_time )< TO_DAYS( ? ) ");
          selSql.append("  ) AS ir_1, ");
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL(o.price/(o.buy_month+o.give_month)*count(1), 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("  	SELECT IFNULL(o.price/(o.buy_month+o.give_month)*count(1), 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_2, ");
          selSql.append("  ( ");
          selSql.append("  	SELECT IFNULL( SUM( o.price ), 0 ) FROM fx_merchant_sign_order o  WHERE o.merchant_id = t.id  AND TO_DAYS( o.create_time )< TO_DAYS( ? ) ");
          selSql.append("  ) AS ir_3, ");
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL(o.price/o.num*count(1), 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.end_sign_time )< TO_DAYS( ? )  ");
+         selSql.append("  	SELECT IFNULL(o.price/o.num*count(1), 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( ? )  ");
          selSql.append("  ) AS ir_4, ");
          selSql.append("  ( ");
          selSql.append("  	SELECT IFNULL(SUM( c.price ), 0 ) FROM fx_merchant_plat_order c WHERE c.merchant_id = t.id AND TO_DAYS( c.create_time )< TO_DAYS( ? )  ");
@@ -614,25 +614,25 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          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 c.type>1  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.sign_time )>= TO_DAYS( ? ) AND TO_DAYS( c.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(? ) ");
          selSql.append("  ) AS count_3, ");
          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.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_sign 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("  ) AS count_4,");
          selSql.append("  ( ");
          selSql.append("  	SELECT IFNULL( SUM( o.price ), 0 ) FROM fx_merchant_meal_order o  WHERE o.merchant_id = t.id AND TO_DAYS( o.create_time )>= TO_DAYS( ? ) AND TO_DAYS( o.create_time )<= TO_DAYS(? ) ");
          selSql.append("  ) AS pr_1, ");
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL(o.price/(o.buy_month+o.give_month)*count(1), 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("  	SELECT IFNULL(o.price/(o.buy_month+o.give_month)*count(1), 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_2, ");
          selSql.append("  ( ");
          selSql.append("  	SELECT IFNULL( SUM( o.price ), 0 ) FROM fx_merchant_sign_order o WHERE o.merchant_id = t.id  AND TO_DAYS( o.create_time )>= TO_DAYS( ? ) AND TO_DAYS( o.create_time )<= TO_DAYS(? ) ");
          selSql.append("  ) AS pr_3, ");
          selSql.append("  ( ");
-         selSql.append("  	SELECT IFNULL(o.price/o.num*count(1), 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.end_sign_time )>= TO_DAYS( ? ) AND TO_DAYS( c.end_sign_time )<= TO_DAYS(? ) ");
+         selSql.append("  	SELECT IFNULL(o.price/o.num*count(1), 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(? ) ");
          selSql.append("  ) AS pr_4, ");
          selSql.append("  ( ");
          selSql.append("  	SELECT IFNULL(SUM( c.price ), 0 ) FROM fx_merchant_plat_order c WHERE c.merchant_id = t.id AND TO_DAYS( c.create_time )>= TO_DAYS( ? ) AND TO_DAYS( c.create_time )<= TO_DAYS(? ) ");

src/main/resources/templates/sys/fx/merchantBalanceList.html

@@ -24,7 +24,7 @@
 	<span>位置：</span>
 	<ul class="placeul">
 		<li><a href="#">结存管理</a></li>
-		<li><a href="#">塾币商户结存流水</a></li>
+		<li><a href="#">端口商户结存流水</a></li>
 	</ul>
 </div>
 <div class="rightinfo">