|
|
|
@@ -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("商户储值卡交易流水导出") |
|
|
|
|