Merge branch 'master' of http://47.112.200.206:3000/shenhao/sys

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"));

src/main/java/com/ssj/sys/controller/FinanceReportController.java

@@ -433,7 +433,11 @@ public class FinanceReportController extends BaseController {
         Page<Map<String,Object>> page = financeService.balanceConsumeDetailList_New(params, initPage(pageNo, pageSize));
         List<Map<String,Object>> list=page.getContent();
         for (Map<String, Object> map : list) {
-        	map.put("price_1", "350");
+        	if(Integer.parseInt(map.get("meal_type").toString())==4) {
+        		map.put("price_1", "0");
+        	}else {
+        		map.put("price_1", "350");
+        	}
           	map.put("sum_price_1", "0");
         	map.put("sum_price_2", "0");
         	map.put("sum_price_3", "0");
@@ -466,6 +470,8 @@ public class FinanceReportController extends BaseController {
         					new BigDecimal(map.get("count_2").toString()).intValue()
         					*0.4 
         					: 0);
+        		}else {
+        			map.put("price_1", "0");
         		}
         	}
         	
@@ -579,7 +585,11 @@ public class FinanceReportController extends BaseController {
             
             List<Map<String,Object>> list=page.getContent();
             for (Map<String, Object> map : list) {
-            	map.put("price_1", "350");
+            	if(Integer.parseInt(map.get("meal_type").toString())==4) {
+            		map.put("price_1", "0");
+            	}else {
+            		map.put("price_1", "350");
+            	}
               	map.put("sum_price_1", "0");
             	map.put("sum_price_2", "0");
             	map.put("sum_price_3", "0");

src/main/resources/templates/sys/finance/allList6.html

@@ -106,7 +106,7 @@
 					<td th:text="${item.get('count_1')>0 ? item.get('balance_month') : ''   }"></td>
 					<td th:text="${item.get('sum_price_1')}"></td>
 	
-					<td th:text="${item.get('count_2')>0 ? '350' : '0' }"></td>
+					<td th:text="${item.get('price_1')}"></td>
 <!-- 					<td th:text="${item.get('sum_3')}"></td> -->
 <!-- 					<td th:text="${item.get('sum_4')}"></td> -->
 					<td th:text="${item.get('count_2')>0 ? item.get('balance_month') : ''   }"></td>