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