diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardDailyLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardDailyLog.java index 15cb1a709..85b74c283 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardDailyLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardDailyLog.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; +import java.util.List; @TableName(value = "wx_card_daily_log") @Data @@ -47,4 +48,8 @@ public class WxCardDailyLog extends TenantEntity { @TableField(exist = false) private String title; + private List couponIds; + + private Date startTime; + private Date endTime; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index f0b1c9de1..52e13fdd2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -310,5 +310,5 @@ public interface WxCouponService { void delManyCouponMerchants(TenantEntity tenantInfo, List couponIds, List merchantIds); - List getByIdList(List collect, String tenantId); + List getByIdListOrTitle(List couponIds, String tenantId, String title); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java index 116f77e58..6381f4c7d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.*; import com.iformall.mapper.*; import com.iformall.service.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -29,12 +30,20 @@ public class WxCardDailyLogServiceImpl implements WxCardDailyLogService { @Override public PageInfo listAsPage(WxCardDailyLog record, Integer pageIndex, Integer pageSize) { + if (StringUtils.isNotBlank(record.getTitle())){ + List title = wxCouponService.getByIdListOrTitle(new ArrayList<>(), record.getTenantId(), record.getTitle()); + if (!CollectionUtils.isEmpty(title)){ + List couponIds = title.parallelStream().map(WxCoupon::getId).collect(Collectors.toList()); + record.setCouponIds(couponIds); + } + } + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardDailyLogMapper.findList(record)); if (CollectionUtils.isEmpty(pageInfo.getList())){ return pageInfo; } List couponIds = pageInfo.getList().parallelStream().map(WxCardDailyLog::getCouponId).collect(Collectors.toList()); - List list = wxCouponService.getByIdList(couponIds, record.getTenantId()); + List list = wxCouponService.getByIdListOrTitle(couponIds, record.getTenantId(), null); if (CollectionUtils.isEmpty(list)){ return pageInfo; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index f942c8cf9..7a4f10ee0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -2106,10 +2106,11 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public List getByIdList(List couponIds, String tenantId) { + public List getByIdListOrTitle(List couponIds, String tenantId, String title) { return wxCouponMapper.selectList(new LambdaQueryWrapper() .eq(WxCoupon::getIsDel, 0) - .in(WxCoupon::getId, couponIds) + .in(CollectionUtils.isNotEmpty(couponIds), WxCoupon::getId, couponIds) + .like(StringUtils.isNotBlank(title), WxCoupon::getTitle, title) .eq(TenantEntity::getTenantId, tenantId)); } diff --git a/mallinkService/src/main/resources/mapper/WxCardDailyLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCardDailyLogMapper.xml index d43cab031..e92ad1ac5 100644 --- a/mallinkService/src/main/resources/mapper/WxCardDailyLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardDailyLogMapper.xml @@ -37,13 +37,13 @@ and `parent_tenant_id` = #{parentTenantId} - and `card_password_id` = #{cardPasswordId} + and `card_password_id` like concat('%', #{cardPasswordId},'%') - and `coupon_id` = #{couponId} + and `coupon_id` like concat('%', #{couponId},'%') - and `card_info_id` = #{cardInfoId} + and `card_info_id` like concat('%', #{cardInfoId},'%') and `type` = #{type} @@ -54,12 +54,24 @@ and `operator_user` like concat('%', #{operatorUser},'%') + + and `create_date` >= #{startTime} + + + and `create_date` <= #{endTime} + and id in #{idItem} + + and coupon_id in + + #{idItem} + + order by ${sortColumns}