diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java index 029243497..8ce1db80a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java @@ -77,4 +77,10 @@ public class WxBillSettle extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "结单记录", name = "settleRecordList") private List settleRecordList; + @Transient + @io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime") + private Date starttime; + @Transient + @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") + private Date endtime; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillSettleService.java b/mallinkService/src/main/java/com/iformall/service/WxBillSettleService.java index 47baccd4b..bdfcfb01d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillSettleService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillSettleService.java @@ -14,7 +14,6 @@ import java.util.List; * @author luozukai */ public interface WxBillSettleService { - /** * 根据实体查询分页列表 * diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml index d33905470..859cc693e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml @@ -26,6 +26,16 @@ where 1=1 and s.`id` = #{id} and s.`tenant_id` = #{tenantId} + and m.name like concat('%', #{merchantName},'%') + + and day_date >= #{startTime} + + + and day_date <= #{endTime} + + and s.`settle_number` = #{settleNumber} + and s.`status` = #{status} + and s.`apply_status` = #{applyStatus} order by ${sortColumns}