diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index a0902d5a1..2ffd06c06 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -114,26 +114,8 @@ public class WxCardPayController extends BaseController { return new ResultData(page); } -// @ApiOperation("C端扫B端储值卡交易流水SUM") -// @GetMapping("sum") -// @SystemControllerLog(description = "储值卡支付-储值卡交易流水SUM") -// public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { -// String ipStr = getIpAddr(); -// logger.info("cardPay/sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); -// if (wxCardSpend == null) { -// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); -// } -// wxCardSpend.updateTenantInfo(getTenantInfo()); -// List sources = new ArrayList(); -// sources.add(EnumMerchantSubsidySource.CARD.getCode()); -// wxCardSpend.setSources(sources); -// wxCardSpend.setCardSpendListShow(1); -// final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); -// return new ResultData(mapList); -// } - @ApiOperation("储值卡交易流水SUM") - @GetMapping("sumCard") + @GetMapping("sum") @SystemControllerLog(description = "储值卡支付-储值卡交易流水SUM") public ResultData sumCard(@ModelAttribute WxCardSpendVo wxCardSpend) { if (wxCardSpend == null) { diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 8ae2b7b86..4d1d338f7 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -94,7 +94,7 @@ and `create_date` >= #{startdate} - and `create_date` <= and #{enddate} + and `create_date` <= #{enddate}