Browse Source

fix card

release_toaliyun_real
lin 3 years ago
parent
commit
8cf6f55d31
2 changed files with 35 additions and 1 deletions
  1. +19
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java
  2. +16
    -0
      mallinkService/src/main/java/com/iformall/utils/DateUtils.java

+ 19
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java View File

@@ -19,6 +19,8 @@ import com.iformall.service.WxCardInfoService;
import com.iformall.service.WxCardSpendService;
import com.iformall.service.WxMerchantService;
import com.iformall.service.WxOrderService;
import com.iformall.utils.DateUtils;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -34,6 +36,8 @@ import javax.servlet.http.HttpServletResponse;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -157,9 +161,23 @@ public class WxCardPayController extends BaseController {
if (wxCardSpend == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空");
}
Date currentDate = new Date();
wxCardSpend.updateTenantInfo(getTenantInfo());
Map retMap = new HashMap();
//总
final Map<String, BigDecimal> mapList = wxCardSpendService.sumCardSpend(wxCardSpend);
return new ResultData(mapList);
retMap.put("total", mapList);
//当月
wxCardSpend.setStartdate(DateUtils.getFirstDayForCurrMonth());
wxCardSpend.setEnddate(DateUtils.getLastDayForMonth(currentDate));
final Map<String, BigDecimal> monthMapList = wxCardSpendService.sumCardSpend(wxCardSpend);
retMap.put("month", monthMapList);
//当日
wxCardSpend.setStartdate(DateUtils.getDayBegin(currentDate));
wxCardSpend.setEnddate(DateUtils.getDayEnd(currentDate));
final Map<String, BigDecimal> dayMapList = wxCardSpendService.sumCardSpend(wxCardSpend);
retMap.put("day", dayMapList);
return new ResultData(retMap);
}
@ApiOperation("商户储值卡交易流水导出")


+ 16
- 0
mallinkService/src/main/java/com/iformall/utils/DateUtils.java View File

@@ -1019,6 +1019,22 @@ public class DateUtils {
return false;
}
}
public static Date getDayBegin(Date date) {
Calendar cale = Calendar.getInstance();
cale.setTime(date);
cale.set(Calendar.HOUR_OF_DAY, 0); //将小时至0
cale.set(Calendar.MINUTE, 0); //将分钟至0
cale.set(Calendar.SECOND,0); //将秒至0
cale.set(Calendar.MILLISECOND, 0); //将毫秒至0
return cale.getTime();
}
public static Date getDayEnd(Date date) {
Calendar cale = Calendar.getInstance();
cale.setTime(date);
return DateUtils.getDateFromString(DateUtils.date2String(cale.getTime(),"yyyy-MM-dd")+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime();
}

/**
* 获取当前月的第一天


Loading…
Cancel
Save