|
|
|
@@ -1095,8 +1095,9 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
Long allPayOrderSummary=wxOrderMapper.queryOrderForSum(params); |
|
|
|
params.put("order_status", "4"); |
|
|
|
Long allRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); |
|
|
|
result.put("allRefundOrderSummary", allRefundOrderSummary); |
|
|
|
Long allOrderSummary = allPayOrderSummary - allRefundOrderSummary; |
|
|
|
result.put("allOrderSummary",allOrderSummary); |
|
|
|
result.put("allOrderSummary",allPayOrderSummary); |
|
|
|
//今日 |
|
|
|
params.put("startdate", systemTime + " 00:00:00"); |
|
|
|
params.put("enddate", systemTime + " 23:59:59"); |
|
|
|
@@ -1104,8 +1105,8 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
Long todayPayOrderSummary=wxOrderMapper.queryOrderForSum(params); |
|
|
|
params.put("order_status", "4"); |
|
|
|
Long todayRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); |
|
|
|
Long todayOrderSummary=todayPayOrderSummary-todayRefundOrderSummary; |
|
|
|
result.put("todayOrderSummary",todayOrderSummary); |
|
|
|
result.put("todayRefundOrderSummary", todayRefundOrderSummary); |
|
|
|
result.put("todayOrderSummary",todayPayOrderSummary); |
|
|
|
//昨日 |
|
|
|
String yesterday = DateUtils.getTimeBefore(1, new Date()); |
|
|
|
params.put("startdate", yesterday + " 00:00:00"); |
|
|
|
@@ -1114,8 +1115,8 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
Long yesterdayPayOrderSummary=wxOrderMapper.queryOrderForSum(params); |
|
|
|
params.put("order_status", "4"); |
|
|
|
Long yesterdayRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); |
|
|
|
Long yesterdayOrderSummary = yesterdayPayOrderSummary - yesterdayRefundOrderSummary; |
|
|
|
result.put("yesterdayOrderSummary",yesterdayOrderSummary); |
|
|
|
result.put("yesterdayRefundOrderSummary", yesterdayRefundOrderSummary); |
|
|
|
result.put("yesterdayOrderSummary",yesterdayPayOrderSummary); |
|
|
|
//上周 |
|
|
|
String lastweek = DateUtils.getTimeBefore(7, new Date()); |
|
|
|
params.put("startdate", lastweek + " 00:00:00"); |
|
|
|
@@ -1124,19 +1125,19 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
Long lastweekPayOrderSummary=wxOrderMapper.queryOrderForSum(params); |
|
|
|
params.put("order_status", "4"); |
|
|
|
Long lastweekRefundOrderSummary=wxOrderMapper.queryOrderForSum(params); |
|
|
|
Long lastweekOrderSummary=lastweekPayOrderSummary - lastweekRefundOrderSummary; |
|
|
|
result.put("lastweekOrderSummary",lastweekOrderSummary); |
|
|
|
result.put("lastweekRefundOrderSummary", lastweekRefundOrderSummary); |
|
|
|
result.put("lastweekOrderSummary",lastweekPayOrderSummary); |
|
|
|
//商户数日环比 |
|
|
|
if (yesterdayOrderSummary > 0) { |
|
|
|
double hbd = (double) (todayOrderSummary - yesterdayOrderSummary) / yesterdayOrderSummary * 100; |
|
|
|
if (yesterdayPayOrderSummary > 0) { |
|
|
|
double hbd = (double) (todayPayOrderSummary - yesterdayPayOrderSummary) / yesterdayPayOrderSummary * 100; |
|
|
|
double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); |
|
|
|
result.put("increasedPercentSummary", hb+"%"); |
|
|
|
} else { |
|
|
|
result.put("increasedPercentSummary", "--"); |
|
|
|
} |
|
|
|
//商户数周同比 |
|
|
|
if (lastweekOrderSummary > 0) { |
|
|
|
double hbd = (double) (todayOrderSummary - lastweekOrderSummary) / lastweekOrderSummary * 100; |
|
|
|
if (lastweekPayOrderSummary > 0) { |
|
|
|
double hbd = (double) (todayPayOrderSummary - lastweekPayOrderSummary) / lastweekPayOrderSummary * 100; |
|
|
|
double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); |
|
|
|
result.put("increasedPercentWeekSummary", hb+"%"); |
|
|
|
} else { |
|
|
|
|