Просмотр исходного кода

[储值卡][新增]:卡信息修改

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
12584dcd74
2 измененных файлов: 8 добавлений и 17 удалений
  1. +4
    -9
      mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java
  2. +4
    -8
      mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml

+ 4
- 9
mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java Просмотреть файл

@@ -3,7 +3,6 @@ package com.iformall.domain.po;
import lombok.Data;
import javax.persistence.*;
import java.util.*;
import java.math.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;
@@ -15,16 +14,13 @@ public class WxCardInfo implements Serializable {
private static final long serialVersionUID = 1L;
@Id
protected Long id;
protected Long id; /**主键ID-与coupon_order_id一致*/
@Transient
protected List<Long> ids;
@Transient
protected String sortColumns;
/**卡券ID*/
@io.swagger.annotations.ApiModelProperty(value="卡券ID",name="cardId")
private Long cardId;
/**微信订单号-购买类储值卡时的订单号*/
@io.swagger.annotations.ApiModelProperty(value="微信订单号-购买类储值卡时的订单号",name="transactionId")
private String transactionId;
@@ -41,8 +37,8 @@ public class WxCardInfo implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="分账总金额",name="shareFeeAmount")
private Integer shareFeeAmount;
/**分账剩余总金额*/
@io.swagger.annotations.ApiModelProperty(value="分账剩余总金额",name="remaingShareFeeAmount")
private Integer remaingShareFeeAmount;
@io.swagger.annotations.ApiModelProperty(value="分账剩余总金额",name="remainingShareFeeAmount")
private Integer remainingShareFeeAmount;
/**创建时间*/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
@@ -55,13 +51,12 @@ public class WxCardInfo implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,CardId_ASC("`card_id` ASC"),CardId_DESC("`card_id` DESC")
,TransactionId_ASC("`transaction_id` ASC"),TransactionId_DESC("`transaction_id` DESC")
,Amount_ASC("`amount` ASC"),Amount_DESC("`amount` DESC")
,RemainingAmount_ASC("`remaining_amount` ASC"),RemainingAmount_DESC("`remaining_amount` DESC")
,ServiceFeeAmount_ASC("`service_fee_amount` ASC"),ServiceFeeAmount_DESC("`service_fee_amount` DESC")
,ShareFeeAmount_ASC("`share_fee_amount` ASC"),ShareFeeAmount_DESC("`share_fee_amount` DESC")
,RemaingShareFeeAmount_ASC("`remaing_share_fee_amount` ASC"),RemaingShareFeeAmount_DESC("`remaing_share_fee_amount` DESC")
,RemainingShareFeeAmount_ASC("`remaining_share_fee_amount` ASC"),RemainingShareFeeAmount_DESC("`remaining_share_fee_amount` DESC")
,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC")
,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC")
;


+ 4
- 8
mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml Просмотреть файл

@@ -3,29 +3,25 @@
<mapper namespace="com.iformall.mapper.WxCardInfoMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxCardInfo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="card_id" jdbcType="BIGINT" property="cardId" />
<result column="transaction_id" jdbcType="VARCHAR" property="transactionId" />
<result column="amount" jdbcType="INTEGER" property="amount" />
<result column="remaining_amount" jdbcType="INTEGER" property="remainingAmount" />
<result column="service_fee_amount" jdbcType="INTEGER" property="serviceFeeAmount" />
<result column="share_fee_amount" jdbcType="INTEGER" property="shareFeeAmount" />
<result column="remaing_share_fee_amount" jdbcType="INTEGER" property="remaingShareFeeAmount" />
<result column="remaining_share_fee_amount" jdbcType="INTEGER" property="remainingShareFeeAmount" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
</resultMap>
<sql id="allColumns">
`id`,`card_id`,`transaction_id`,`amount`,`remaining_amount`,`service_fee_amount`,`share_fee_amount`,`remaing_share_fee_amount`,`create_date`,`update_date`
`id`,`transaction_id`,`amount`,`remaining_amount`,`service_fee_amount`,`share_fee_amount`,`remaining_share_fee_amount`,`create_date`,`update_date`
</sql>

<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != cardId ">
and `card_id` = #{cardId}
</if>
</if>
<if test=" null != transactionId ">
and `transaction_id` like concat('%', #{transactionId},'%')
</if>
@@ -42,7 +38,7 @@
and `share_fee_amount` = #{shareFeeAmount}
</if>
<if test=" null != remaingShareFeeAmount ">
and `remaing_share_fee_amount` = #{remaingShareFeeAmount}
and `remaining_share_fee_amount` = #{remainingShareFeeAmount}
</if>
<if test=" null != createDate ">
and `create_date` = #{createDate}


Загрузка…
Отмена
Сохранить