diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index dc799737e..93782dc96 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -35,17 +35,18 @@ public class WxCardPayController extends BaseController { @Autowired WxCardSpendService wxCardSpendService; - @ApiOperation("C端扫B端储值卡交易流水列表接口") + @ApiOperation("C端扫B端储值卡交易流水(消费记录 + 补贴)列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData cardOrderList(@ModelAttribute WxCardSpend wxCardSpend, Integer pageNum, Integer pageSize) { + public ResultData cardSpendlist(@ModelAttribute WxCardSpend wxCardSpend, Integer pageNum, Integer pageSize) { String ipStr = getIpAddr(); - logger.info("saveCardPayOrder: " + ipStr + " :" + wxCardSpend.toString()); + logger.info("cardSpendlist: " + ipStr + " :" + wxCardSpend.toString()); if (wxCardSpend == null) wxCardSpend = new WxCardSpend(); WxMerchantBUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); + wxCardSpend.setMerchantId(user.getMerchantId()); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java new file mode 100644 index 000000000..9895b87f7 --- /dev/null +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -0,0 +1,58 @@ +package com.iformall.controller; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxMerchantBUser; +import com.iformall.domain.po.WxMerchantSubsidy; +import com.iformall.domain.vo.WxMerchantSubsidyVo; +import com.iformall.service.WxMerchantSubsidyService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.Map; + +@RestController +@RequestMapping("/api/subsidy") +public class WxMerchantSubsidyController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxMerchantSubsidyService wxMerchantSubsidyService; + + @ApiOperation("补贴记录汇总") + @GetMapping("sum") + public ResultData count(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy) { + String ipStr = getIpAddr(); + logger.info("subsidy/sum: " + ipStr + " :" + wxMerchantSubsidy.toString()); + if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy(); + WxMerchantBUser user = getUser(); + wxMerchantSubsidy.setTenantId(user.getTenantId()); + wxMerchantSubsidy.setMerchantId(user.getMerchantId()); + Map retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy); + return new ResultData(retMap); + } + + @ApiOperation("补贴记录") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData listMonth(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy, Integer pageNum, Integer pageSize) { + String ipStr = getIpAddr(); + logger.info("subsidy/list: " + ipStr + " :" + wxMerchantSubsidy.toString()); + if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy(); + WxMerchantBUser user = getUser(); + wxMerchantSubsidy.setTenantId(user.getTenantId()); + wxMerchantSubsidy.setMerchantId(user.getMerchantId()); + final PageInfo page = wxMerchantSubsidyService.listAsPage(wxMerchantSubsidy, pageNum, pageSize); + return new ResultData(page); + } + +}