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 7e0fca77b..1ddf6ea68 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java @@ -77,12 +77,13 @@ 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; + @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") + private Date starttime; @Transient - @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") - private Date endTime; + @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") + private Date endtime; @Transient @io.swagger.annotations.ApiModelProperty(value="清算方向 1商场结款 2商户结款",name="settleWay") diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml index 6bb84d8a2..576cf13ea 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml @@ -27,11 +27,11 @@ and tt.`id` = #{id} and tt.`tenant_id` = #{tenantId} and tt.merchantName like concat('%', #{merchantName},'%') - - and tt.createtime >= #{startTime} + + and tt.createtime >= #{starttime} - - and tt.createtime <= #{endTime} + + and tt.createtime <= #{endtime} and tt.`settle_number` = #{settleNumber} and tt.`status` = #{status}