结算问题修复

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

@@ -641,7 +641,7 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          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*count(1)/(o.buy_month+o.give_month), 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 <>'开始计费期' AND TO_DAYS( c.sign_time )>= TO_DAYS( ?) AND TO_DAYS( c.sign_time )<= TO_DAYS(?) ");
+         selSql.append("  	SELECT IFNULL(sum(o.price/( o.buy_month + o.give_month)), 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  <> '开始计费期'  or 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(? ) ");

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

@@ -339,8 +339,8 @@
 							<a href="javascript:;" th:if="${item.signType!=0 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'platServiceAdd(\''+${item.id}+'\')'" class="tablelink">管理费</a>
 						
 							<a href="javascript:;" th:if="${item.posType==1 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'joinServiceEdit(\''+${item.id}+'\')'" class="tablelink">塾&nbsp;&nbsp;&nbsp;币</a>
-							<a href="javascript:;" th:if="${item.posType==2 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'libServiceAdd(\''+${item.id}+'\')'" class="tablelink">服务包</a>
-							<a href="javascript:;" th:if="${item.posType==3 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'libServiceScAdd(\''+${item.id}+'\')'" class="tablelink">服务包</a>
+							<a href="javascript:;" th:if="${item.posType==2 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) || item.type eq '4') }"  th:onclick="'libServiceAdd(\''+${item.id}+'\')'" class="tablelink">服务包</a>
+							<a href="javascript:;" th:if="${item.posType==3 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) || item.type eq '4') }"  th:onclick="'libServiceScAdd(\''+${item.id}+'\')'" class="tablelink">服务包</a>
 							
 							<a href="javascript:;" th:if="${item.signType!=0 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'signServiceAdd(\''+${item.id}+'\')'" class="tablelink">加油包</a>
 							<a href="javascript:;" th:onclick="'openNew2(\''+${item.libId}+'\')'" th:if="${item.status!=1 && item.libId != null}"   class="tablelink">设置</a>