Просмотр исходного кода

[交易对账单][修改]:统计修改,添加退款

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
16408b6c8c
1 измененных файлов: 6 добавлений и 13 удалений
  1. +6
    -13
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 6
- 13
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Просмотреть файл

@@ -1093,49 +1093,42 @@ 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); result.put("allRefundOrderSummary", allRefundOrderSummary);
Long allOrderSummary = allPayOrderSummary - allRefundOrderSummary; Long allOrderSummary = allPayOrderSummary - allRefundOrderSummary;
result.put("allOrderSummary",allOrderSummary);
result.put("allOrderSummary",allPayOrderSummary);
//今日 //今日
params.put("startdate", systemTime + " 00:00:00"); params.put("startdate", systemTime + " 00:00:00");
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); result.put("todayRefundOrderSummary", todayRefundOrderSummary);
Long todayOrderSummary=todayPayOrderSummary-todayRefundOrderSummary;
result.put("todayOrderSummary",todayOrderSummary);
result.put("todayOrderSummary",todayPayOrderSummary);
//昨日 //昨日
String yesterday = DateUtils.getTimeBefore(1, new Date()); String yesterday = DateUtils.getTimeBefore(1, new Date());
params.put("startdate", yesterday + " 00:00:00"); params.put("startdate", yesterday + " 00:00:00");
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); result.put("yesterdayRefundOrderSummary", yesterdayRefundOrderSummary);
Long yesterdayOrderSummary = yesterdayPayOrderSummary - yesterdayRefundOrderSummary;
result.put("yesterdayOrderSummary",yesterdayOrderSummary);
result.put("yesterdayOrderSummary",yesterdayPayOrderSummary);
//上周 //上周
String lastweek = DateUtils.getTimeBefore(7, new Date()); String lastweek = DateUtils.getTimeBefore(7, new Date());
params.put("startdate", lastweek + " 00:00:00"); params.put("startdate", lastweek + " 00:00:00");
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); result.put("lastweekRefundOrderSummary", lastweekRefundOrderSummary);
Long lastweekOrderSummary=lastweekPayOrderSummary - lastweekRefundOrderSummary;
result.put("lastweekOrderSummary",lastweekOrderSummary);
result.put("lastweekOrderSummary",lastweekPayOrderSummary);
//商户数日环比 //商户数日环比
if (yesterdayOrderSummary > 0) {
if (yesterdayPayOrderSummary > 0) {
double hbd = (double) (todayPayOrderSummary - yesterdayPayOrderSummary) / yesterdayPayOrderSummary * 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+"%");
@@ -1143,7 +1136,7 @@ public class WxOrderServiceImpl implements WxOrderService {
result.put("increasedPercentSummary", "--"); result.put("increasedPercentSummary", "--");
} }
//商户数周同比 //商户数周同比
if (lastweekOrderSummary > 0) {
if (lastweekPayOrderSummary > 0) {
double hbd = (double) (todayPayOrderSummary - lastweekPayOrderSummary) / lastweekPayOrderSummary * 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+"%");


Загрузка…
Отмена
Сохранить