| @@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | |||||
| @TableName(value = "wx_merchant_trade_daily") | @TableName(value = "wx_merchant_trade_daily") | ||||
| @Data | @Data | ||||
| @@ -19,6 +20,8 @@ public class WxMerchantTradeDaily extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") | @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") | ||||
| protected Long merchantId; | protected Long merchantId; | ||||
| @TableField(exist = false) | |||||
| private List<Long> merchantIdList; | |||||
| public Long getbUserId() { | public Long getbUserId() { | ||||
| return bUserId; | return bUserId; | ||||
| @@ -96,6 +96,7 @@ public interface WxMerchantService { | |||||
| * @return | * @return | ||||
| */ | */ | ||||
| List<WxMerchant> findList(WxMerchant record); | List<WxMerchant> findList(WxMerchant record); | ||||
| List<Long> findIdList(WxMerchant record); | |||||
| /** | /** | ||||
| * 根据商管商户 | * 根据商管商户 | ||||
| @@ -283,6 +283,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| public List<WxMerchant> findList(WxMerchant record) { | public List<WxMerchant> findList(WxMerchant record) { | ||||
| return wxMerchantMapper.findList(record); | return wxMerchantMapper.findList(record); | ||||
| } | } | ||||
| @Override | |||||
| public List<Long> findIdList(WxMerchant record) { | |||||
| return wxMerchantMapper.findIdList(record); | |||||
| } | |||||
| @Override | @Override | ||||
| public List<WxMerchant> findAdminList(TenantEntity tenantEntity) { | public List<WxMerchant> findAdminList(TenantEntity tenantEntity) { | ||||
| @@ -156,6 +156,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ | |||||
| @Override | @Override | ||||
| public PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) { | ||||
| handleQueryParam(record); | |||||
| PageInfo<WxMerchantTradeDaily> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findList(record)); | PageInfo<WxMerchantTradeDaily> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findList(record)); | ||||
| PageInfo<WxMerchantTradeDailyVo> retPageInfo = new PageInfo<WxMerchantTradeDailyVo>(); | PageInfo<WxMerchantTradeDailyVo> retPageInfo = new PageInfo<WxMerchantTradeDailyVo>(); | ||||
| retPageInfo.setPageNum(pageIndex); | retPageInfo.setPageNum(pageIndex); | ||||
| @@ -166,6 +167,20 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ | |||||
| return retPageInfo; | 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<Long> merchantIdList = wxMerchantService.findIdList(m); | |||||
| if (null != merchantIdList && merchantIdList.size() > 0 ) { | |||||
| record.setMerchantIdList(merchantIdList); | |||||
| }else { | |||||
| record.setId(-999L); | |||||
| } | |||||
| } | |||||
| } | |||||
| private List<WxMerchantTradeDailyVo> toVoList(List<WxMerchantTradeDaily> list,TenantEntity tenantEntity) { | private List<WxMerchantTradeDailyVo> toVoList(List<WxMerchantTradeDaily> list,TenantEntity tenantEntity) { | ||||
| if (null == list || list.size() <= 0 ){ | if (null == list || list.size() <= 0 ){ | ||||
| return null; | return null; | ||||
| @@ -72,6 +72,17 @@ | |||||
| and id != #{ignoreId} | and id != #{ignoreId} | ||||
| </if> | </if> | ||||
| <if test=" null != startTime and null != endTime"> | |||||
| and mtd.report_date >= date_format(#{startTime},'%Y-%m-%d') | |||||
| and mtd.report_date <= date_format(#{endTime},'%Y-%m-%d') | |||||
| </if> | |||||
| <if test=" null != merchantIdList "> | |||||
| and merchant_id in | |||||
| <foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")"> | |||||
| #{midItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||