diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907301005__G_ALTER_CREDIT_HISTORY.sql b/mallinkAdmin/src/main/resources/db/migration/V201907301005__G_ALTER_CREDIT_HISTORY.sql new file mode 100644 index 000000000..bb40db683 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201907301005__G_ALTER_CREDIT_HISTORY.sql @@ -0,0 +1 @@ +alter table wx_credit_history add column ticket_number varchar(50) DEFAULT '' COMMENT '小票号'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index dd1345c6e..1545a1983 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -73,5 +73,8 @@ public class WxCreditHistory extends BaseEntity { @Transient @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") private String merchantName; + + @io.swagger.annotations.ApiModelProperty(value = "小票号", name = "ticketNumber") + private String ticketNumber; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java index 936531efb..6869cd9d2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java @@ -68,4 +68,7 @@ public class WxCreditHistoryVo { @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; + @io.swagger.annotations.ApiModelProperty(value = "小票号", name = "ticketNumber") + private String ticketNumber; + } diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index a02648645..77da884ae 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -17,10 +17,12 @@ + + - `id`,`tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose` + `id`,`tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose`,`ticket_number` @@ -64,6 +66,9 @@ and `change_purpose` = #{changePurpose} + + and ticket_number like concat('%', #{ticketNumber},'%') + and id in @@ -108,6 +113,9 @@ and merchant.name like concat('%', #{merchantName},'%') + + and credit.ticket_number like concat('%', #{ticketNumber},'%') +