| @@ -1093,8 +1093,10 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| params.put("enddate", systemTime + " 23:59:59"); | params.put("enddate", systemTime + " 23:59:59"); | ||||
| params.put("order_status", "1"); | params.put("order_status", "1"); | ||||
| Long allPayOrderSummary=wxOrderMapper.queryOrderForSum(params); | Long allPayOrderSummary=wxOrderMapper.queryOrderForSum(params); | ||||
| result.put("allPayOrderSummary", allPayOrderSummary); | |||||
| params.put("order_status", "4"); | params.put("order_status", "4"); | ||||
| Long allRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); | Long allRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); | ||||
| result.put("allRefundOrderSummary", allRefundOrderSummary); | |||||
| Long allOrderSummary = allPayOrderSummary - allRefundOrderSummary; | Long allOrderSummary = allPayOrderSummary - allRefundOrderSummary; | ||||
| result.put("allOrderSummary",allOrderSummary); | result.put("allOrderSummary",allOrderSummary); | ||||
| //今日 | //今日 | ||||
| @@ -1102,8 +1104,10 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| params.put("enddate", systemTime + " 23:59:59"); | params.put("enddate", systemTime + " 23:59:59"); | ||||
| params.put("order_status", "1"); | params.put("order_status", "1"); | ||||
| Long todayPayOrderSummary=wxOrderMapper.queryOrderForSum(params); | Long todayPayOrderSummary=wxOrderMapper.queryOrderForSum(params); | ||||
| result.put("todayPayOrderSummary", todayPayOrderSummary); | |||||
| params.put("order_status", "4"); | params.put("order_status", "4"); | ||||
| Long todayRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); | Long todayRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); | ||||
| result.put("todayRefundOrderSummary", todayRefundOrderSummary); | |||||
| Long todayOrderSummary=todayPayOrderSummary-todayRefundOrderSummary; | Long todayOrderSummary=todayPayOrderSummary-todayRefundOrderSummary; | ||||
| result.put("todayOrderSummary",todayOrderSummary); | result.put("todayOrderSummary",todayOrderSummary); | ||||
| //昨日 | //昨日 | ||||
| @@ -1112,8 +1116,10 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| params.put("enddate", yesterday + " 23:59:59"); | params.put("enddate", yesterday + " 23:59:59"); | ||||
| params.put("order_status", "1"); | params.put("order_status", "1"); | ||||
| Long yesterdayPayOrderSummary=wxOrderMapper.queryOrderForSum(params); | Long yesterdayPayOrderSummary=wxOrderMapper.queryOrderForSum(params); | ||||
| result.put("yesterdayPayOrderSummary", yesterdayPayOrderSummary); | |||||
| params.put("order_status", "4"); | params.put("order_status", "4"); | ||||
| Long yesterdayRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); | Long yesterdayRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); | ||||
| result.put("yesterdayRefundOrderSummary", yesterdayRefundOrderSummary); | |||||
| Long yesterdayOrderSummary = yesterdayPayOrderSummary - yesterdayRefundOrderSummary; | Long yesterdayOrderSummary = yesterdayPayOrderSummary - yesterdayRefundOrderSummary; | ||||
| result.put("yesterdayOrderSummary",yesterdayOrderSummary); | result.put("yesterdayOrderSummary",yesterdayOrderSummary); | ||||
| //上周 | //上周 | ||||
| @@ -1122,13 +1128,15 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| params.put("enddate", lastweek + " 23:59:59"); | params.put("enddate", lastweek + " 23:59:59"); | ||||
| params.put("order_status", "1"); | params.put("order_status", "1"); | ||||
| Long lastweekPayOrderSummary=wxOrderMapper.queryOrderForSum(params); | Long lastweekPayOrderSummary=wxOrderMapper.queryOrderForSum(params); | ||||
| result.put("lastweekPayOrderSummary", lastweekPayOrderSummary); | |||||
| params.put("order_status", "4"); | params.put("order_status", "4"); | ||||
| Long lastweekRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); | Long lastweekRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); | ||||
| result.put("lastweekRefundOrderSummary", lastweekRefundOrderSummary); | |||||
| Long lastweekOrderSummary=lastweekPayOrderSummary - lastweekRefundOrderSummary; | Long lastweekOrderSummary=lastweekPayOrderSummary - lastweekRefundOrderSummary; | ||||
| result.put("lastweekOrderSummary",lastweekOrderSummary); | result.put("lastweekOrderSummary",lastweekOrderSummary); | ||||
| //商户数日环比 | //商户数日环比 | ||||
| if (yesterdayOrderSummary > 0) { | if (yesterdayOrderSummary > 0) { | ||||
| double hbd = (double) (todayOrderSummary - yesterdayOrderSummary) / yesterdayOrderSummary * 100; | |||||
| double hbd = (double) (todayPayOrderSummary - yesterdayPayOrderSummary) / yesterdayPayOrderSummary * 100; | |||||
| double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); | double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); | ||||
| result.put("increasedPercentSummary", hb+"%"); | result.put("increasedPercentSummary", hb+"%"); | ||||
| } else { | } else { | ||||
| @@ -1136,7 +1144,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| //商户数周同比 | //商户数周同比 | ||||
| if (lastweekOrderSummary > 0) { | if (lastweekOrderSummary > 0) { | ||||
| double hbd = (double) (todayOrderSummary - lastweekOrderSummary) / lastweekOrderSummary * 100; | |||||
| double hbd = (double) (todayPayOrderSummary - lastweekPayOrderSummary) / lastweekPayOrderSummary * 100; | |||||
| double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); | double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); | ||||
| result.put("increasedPercentWeekSummary", hb+"%"); | result.put("increasedPercentWeekSummary", hb+"%"); | ||||
| } else { | } else { | ||||