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 743f996e9..7a0afbb2c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.Date; +import java.util.List; @TableName(value = "wx_merchant_trade_daily") @Data @@ -19,6 +20,8 @@ public class WxMerchantTradeDaily extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") protected Long merchantId; + @TableField(exist = false) + private List merchantIdList; public Long getbUserId() { return bUserId; diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 86cdd8872..1829970a9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -96,6 +96,7 @@ public interface WxMerchantService { * @return */ List findList(WxMerchant record); + List findIdList(WxMerchant record); /** * 根据商管商户 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 3cdef0c75..eb98b76f9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -283,6 +283,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { public List findList(WxMerchant record) { return wxMerchantMapper.findList(record); } + + @Override + public List findIdList(WxMerchant record) { + return wxMerchantMapper.findIdList(record); + } @Override public List findAdminList(TenantEntity tenantEntity) { 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 52e91ddde..41564fe27 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -156,6 +156,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ @Override public PageInfo listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) { + handleQueryParam(record); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findList(record)); PageInfo retPageInfo = new PageInfo(); retPageInfo.setPageNum(pageIndex); @@ -166,6 +167,20 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ return retPageInfo; } + private void handleQueryParam(WxMerchantTradeDaily record) { + if (!StringUtils.isBlank(record.getMerchantName())) { + WxMerchant m = new WxMerchant(); + m.updateTenantInfo(record); + m.setName(StringUtils.trimToNull(record.getMerchantName())); + List merchantIdList = wxMerchantService.findIdList(m); + if (null != merchantIdList && merchantIdList.size() > 0 ) { + record.setMerchantIdList(merchantIdList); + }else { + record.setId(-999L); + } + } + } + private List toVoList(List list,TenantEntity tenantEntity) { if (null == list || list.size() <= 0 ){ return null; diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index 296847ad9..f461a4a17 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -72,6 +72,17 @@ and id != #{ignoreId} + + and mtd.report_date >= date_format(#{startTime},'%Y-%m-%d') + and mtd.report_date <= date_format(#{endTime},'%Y-%m-%d') + + + + and merchant_id in + + #{midItem} + +