From 98e6c04cad3c2be1bcd932cdeb038c09141962cc Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 13 Apr 2023 18:48:10 +0800 Subject: [PATCH] fix trade daily --- .../WxMerchantTradeDailyController.java | 2 +- .../domain/po/WxMerchantTradeDaily.java | 2 ++ .../po/WxMerchantTradeDailyHistory.java | 2 +- .../domain/vo/WxMerchantTradeDailyVo.java | 2 +- .../service/WxMerchantTradeDailyService.java | 2 +- .../impl/WxMerchantTradeDailyServiceImpl.java | 24 +++++++++++++------ .../mapper/WxMerchantTradeDailyMapper.xml | 4 ++++ 7 files changed, 27 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index a42114e7a..35c79a895 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -122,7 +122,7 @@ public class WxMerchantTradeDailyController extends BaseController { public ResultData queryTradeDailyHistory(@ModelAttribute WxMerchantTradeDailyHistory wxMerchantTradeDailyHistory, Integer pageNum, Integer pageSize) { wxMerchantTradeDailyHistory.updateTenantInfo(getTenantInfo()); wxMerchantTradeDailyHistory.setSortColumns(SortField.CreateDate_ASC); - PageInfo page = wxMerchantTradeDailyService.listHistoryAsPageVo(wxMerchantTradeDailyHistory, pageNum, pageSize); + PageInfo page = wxMerchantTradeDailyService.listHistoryAsPageVo(wxMerchantTradeDailyHistory, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java index 7a0afbb2c..0242ca2ec 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -52,6 +52,8 @@ public class WxMerchantTradeDaily extends TenantEntity { protected String reportDate; @TableField(exist = false) private String reportDateLike; + @TableField(exist = false) + private String reportDateOrMonthLike; @io.swagger.annotations.ApiModelProperty(value = "解单日期类型EnumTradeDailyDateType", name = "dateType") protected Integer dateType; @io.swagger.annotations.ApiModelProperty(value = "交易笔数", name = "tradeCount") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDailyHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDailyHistory.java index d4d8146c7..3b74c0c1d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDailyHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDailyHistory.java @@ -18,5 +18,5 @@ public class WxMerchantTradeDailyHistory extends WxMerchantTradeDaily { protected Long id; @io.swagger.annotations.ApiModelProperty(value = "tradeDailyId", name = "tradeDailyId") - private Long tradeDailyId; + protected Long tradeDailyId; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index af40f9ef9..0077440df 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -66,7 +66,7 @@ public class WxMerchantTradeDailyVo extends TenantEntity { this.bUserName = bUserName; } - @Excel(name = "提交商户名", width = 20, orderNum = "6") + @Excel(name = "提交B端用户名", width = 20, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value = "b端用户姓名", name = "bUserName") private String bUserName; diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java index 8efd63a62..d8b241bd7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java @@ -87,7 +87,7 @@ public interface WxMerchantTradeDailyService { */ PageInfo listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize); - PageInfo listHistoryAsPageVo(WxMerchantTradeDailyHistory record, Integer pageIndex, Integer pageSize); + PageInfo listHistoryAsPageVo(WxMerchantTradeDailyHistory record, Integer pageIndex, Integer pageSize); ResultData add(WxMerchantTradeDaily tradeDailyVo,MallUserInfo mallUserInfo); ResultData update(WxMerchantTradeDaily tradeDailyVo,MallUserInfo mallUserInfo); 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 2fd0ade55..afe5d2cc0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -76,10 +76,17 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ } @Override - public PageInfo listHistoryAsPageVo(WxMerchantTradeDailyHistory record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyHistoryMapper.findList(record)); + public PageInfo listHistoryAsPageVo(WxMerchantTradeDailyHistory record, Integer pageIndex, Integer pageSize) { + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyHistoryMapper.findList(record)); + PageInfo retPageInfo = new PageInfo(); + retPageInfo.setPageNum(pageIndex); + retPageInfo.setPageSize(pageSize); + retPageInfo.setPages(pageInfo.getPages()); + retPageInfo.setTotal(pageInfo.getTotal()); + retPageInfo.setList(toVoList(pageInfo.getList(), record)); + return retPageInfo; } - + @Override public WxMerchantTradeDaily getById(Long id) { return wxMerchantTradeDailyMapper.selectById(id); @@ -196,7 +203,9 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ } } - private List toVoList(List list,TenantEntity tenantEntity) { + + + private List toVoList(List list,TenantEntity tenantEntity) { if (null == list || list.size() <= 0 ){ return null; } @@ -344,11 +353,12 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId()); String errormsg = "解单数据已存在"; if (tradeDaily.getDateType().intValue() == EnumTradeDailyDateType.DAY.getCode().intValue()) { - wxMerchantTradeDaily.setReportDate(tradeDaily.getReportDate()); - errormsg = "当天解单数据已存在"; + //按日还要查询按月的有没有 + wxMerchantTradeDaily.setReportDateOrMonthLike(tradeDaily.getReportDate()); + errormsg = "已存在当天或者当月的解单数据"; }else if (tradeDaily.getDateType().intValue() == EnumTradeDailyDateType.MONTH.getCode().intValue()) { wxMerchantTradeDaily.setReportDateLike(tradeDaily.getReportDate()); - errormsg = "当前月已存在解单数据或者已存在当前月按天提报的解单数据"; + errormsg = "已存在当月的解单数据"; } List tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index 11d5fb0ff..858f67b9d 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -59,6 +59,10 @@ and `report_date` = #{reportDate} + + + and (`report_date` = #{reportDateOrMonthLike} or report_date like concat('', date_format(#{reportDateOrMonthLike},'%Y-%m'),'-%')) + and date_format(create_date,'%Y-%m')=#{month}