diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 43ac1ebfc..2d7fec2b8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -70,5 +70,14 @@ public class WxMerchantTradeDailyController extends BaseController { return wxMerchantTradeDailyService.updateYesterday(wxMerchantTradeDaily); } + @ApiOperation("查询解单数据") + @GetMapping("/queryTradeDaily") + public ResultData queryTradeDaily(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily) { + logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::queryTradeDaily"); + wxMerchantTradeDaily.setTenantId(getTenantId()); + return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily); + } + + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java index 240393e2c..1dd9e0aec 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java @@ -84,4 +84,6 @@ public interface WxMerchantTradeDailyService { ResultData updateYesterday(WxMerchantTradeDailyVo tradeDailyVo); + ResultData queryTradeDaily(WxMerchantTradeDailyVo wxMerchantTradeDaily); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 46f462c35..4b7aba5bf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -152,6 +152,16 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ return new ResultData(Result.SUCCESS, "操作成功"); } + @Override + public ResultData queryTradeDaily(WxMerchantTradeDailyVo tradeDailyVo) { + WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); + wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); + wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate()); + List tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); + wxMerchantTradeDaily = tradeList.size() > 0 ? tradeList.get(0) : null; + return new ResultData(wxMerchantTradeDaily); + } + @Override public ResultData getVolumeOfMonth(Long merchantId) {