Sfoglia il codice sorgente

[积分历史][修改][添加小票号及显示]

release_toaliyun_real
gongbiao 6 anni fa
parent
commit
0b2909a26f
4 ha cambiato i file con 18 aggiunte e 2 eliminazioni
  1. +1
    -0
      mallinkAdmin/src/main/resources/db/migration/V201907301005__G_ALTER_CREDIT_HISTORY.sql
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java
  4. +11
    -2
      mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml

+ 1
- 0
mallinkAdmin/src/main/resources/db/migration/V201907301005__G_ALTER_CREDIT_HISTORY.sql Vedi File

@@ -0,0 +1 @@
alter table wx_credit_history add column ticket_number varchar(50) DEFAULT '' COMMENT '小票号';

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java Vedi File

@@ -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;
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java Vedi File

@@ -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;

}

+ 11
- 2
mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml Vedi File

@@ -17,10 +17,12 @@
<result column="business_id" jdbcType="BIGINT" property="businessId" />
<result column="spend" jdbcType="INTEGER" property="spend" />
<result column="change_purpose" jdbcType="VARCHAR" property="changePurpose" />
<result column="ticket_number" jdbcType="VARCHAR" property="ticketNumber"/>
</resultMap>
<sql id="allColumns">
`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`
</sql>

<sql id="dynamicWhereConditions">
@@ -64,6 +66,9 @@
<if test=" null != changePurpose ">
and `change_purpose` = #{changePurpose}
</if>
<if test=" null != ticketNumber and ''!=ticketNumber ">
and ticket_number like concat('%', #{ticketNumber},'%')
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -108,6 +113,9 @@
<if test=" null != merchantName and ''!=merchantName ">
and merchant.name like concat('%', #{merchantName},'%')
</if>
<if test=" null != ticketNumber and ''!=ticketNumber ">
and credit.ticket_number like concat('%', #{ticketNumber},'%')
</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxCreditHistory" resultMap="BaseResultMap">
@@ -131,7 +139,8 @@
credit.operator_type operatorType,
credit.operator_id operatorId,
merchant.NAME merchantName,
credit.merchant_id merchantId
credit.merchant_id merchantId,
credit.ticket_number ticketNumber
FROM
wx_c_user_basic_info basic
INNER JOIN wx_credit_history credit ON basic.id = credit.c_user_id


Caricamento…
Annulla
Salva