autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-03 01:20:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

清分账单加字段 交易日期

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-22 17:06:20 +08:00
parent 3394fdc753
commit ce7e2fc6f9
3 changed files with 75 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingBillInfo.java
View File

@@ -6,8 +6,8 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* 清分账单表
*/
* 清分账单表
*/
@Getter
@Setter
@Builder
@@ -15,87 +15,92 @@ import java.util.Date;
@NoArgsConstructor
public class ClearingBillInfo {
/**
* 主键
*/
* 主键
*/
private Integer id;
/**
* 账单状态（0-未清分；1-清分在途；2-可提现；3-提现申请中；4-已提现；5等待处理；6-线下结算）
*/
* 账单状态（0-未清分；1-清分在途；2-可提现；3-提现申请中；4-已提现；5等待处理；6-线下结算）
*/
private String billStatus;
/**
* 清分账单编号
*/
* 账单交易日期
*/
private String tradeDate;
/**
* 清分账单编号
*/
private String clearingBillCode;
/**
* 清分时间
*/
* 清分时间
*/
private Date clearingTime;
/**
* 运营商id
*/
* 运营商id
*/
private String merchantId;
/**
* 订单来源（1-万车充平台）
*/
* 订单来源（1-有电充平台）
*/
private String orderSource;
/**
* 应收金额
*/
* 应收金额
*/
private BigDecimal receivableAmount;
/**
* 应清分金额
*/
* 应清分金额
*/
private BigDecimal shouldClearingAmount;
/**
* 实际清分金额
*/
* 实际清分金额
*/
private BigDecimal actualClearingAmount;
/**
* 手续费
*/
* 手续费
*/
private BigDecimal feeAmount;
/**
* 可提现金额
*/
* 可提现金额
*/
private BigDecimal withdrawableAmount;
/**
* 提现单号
*/
* 提现单号
*/
private String withdrawCode;
/**
* 创建人
*/
* 创建人
*/
private String createBy;
/**
* 创建时间
*/
* 创建时间
*/
private Date createTime;
/**
* 更新人
*/
* 更新人
*/
private String updateBy;
/**
* 更新时间
*/
* 更新时间
*/
private Date updateTime;
/**
* 删除标识（0-正常；1-删除）
*/
* 删除标识（0-正常；1-删除）
*/
private String delFlag;
}

6
jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java
View File

@@ -8,6 +8,7 @@ import java.util.List;
public interface ClearingBillInfoMapper {
/**
* delete by primary key
*
* @param id primaryKey
* @return deleteCount
*/
@@ -15,6 +16,7 @@ public interface ClearingBillInfoMapper {
/**
* insert record to table
*
* @param record the record
* @return insert count
*/
@@ -22,6 +24,7 @@ public interface ClearingBillInfoMapper {
/**
* insert record to table selective
*
* @param record the record
* @return insert count
*/
@@ -29,6 +32,7 @@ public interface ClearingBillInfoMapper {
/**
* select by primary key
*
* @param id primary key
* @return object by primary key
*/
@@ -36,6 +40,7 @@ public interface ClearingBillInfoMapper {
/**
* update record selective
*
* @param record the updated record
* @return update count
*/
@@ -43,6 +48,7 @@ public interface ClearingBillInfoMapper {
/**
* update record
*
* @param record the updated record
* @return update count
*/

43
jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
View File

@@ -6,6 +6,7 @@
<!--@Table clearing_bill_info-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="bill_status" jdbcType="VARCHAR" property="billStatus" />
<result column="trade_date" jdbcType="VARCHAR" property="tradeDate" />
<result column="clearing_bill_code" jdbcType="VARCHAR" property="clearingBillCode" />
<result column="clearing_time" jdbcType="TIMESTAMP" property="clearingTime" />
<result column="merchant_id" jdbcType="VARCHAR" property="merchantId" />
@@ -24,8 +25,8 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, bill_status, clearing_bill_code, clearing_time, merchant_id, order_source, receivable_amount,
should_clearing_amount, actual_clearing_amount, fee_amount, withdrawable_amount,
id, bill_status, trade_date, clearing_bill_code, clearing_time, merchant_id, order_source,
receivable_amount, should_clearing_amount, actual_clearing_amount, fee_amount, withdrawable_amount,
withdraw_code, create_by, create_time, update_by, update_time, del_flag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -42,18 +43,20 @@
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.ClearingBillInfo" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into clearing_bill_info (bill_status, clearing_bill_code, clearing_time,
merchant_id, order_source, receivable_amount,
should_clearing_amount, actual_clearing_amount,
fee_amount, withdrawable_amount, withdraw_code,
create_by, create_time, update_by,
update_time, del_flag)
values (#{billStatus,jdbcType=VARCHAR}, #{clearingBillCode,jdbcType=VARCHAR}, #{clearingTime,jdbcType=TIMESTAMP},
#{merchantId,jdbcType=VARCHAR}, #{orderSource,jdbcType=VARCHAR}, #{receivableAmount,jdbcType=DECIMAL},
#{shouldClearingAmount,jdbcType=DECIMAL}, #{actualClearingAmount,jdbcType=DECIMAL},
#{feeAmount,jdbcType=DECIMAL}, #{withdrawableAmount,jdbcType=DECIMAL}, #{withdrawCode,jdbcType=VARCHAR},
#{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
#{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=VARCHAR})
insert into clearing_bill_info (bill_status, trade_date, clearing_bill_code,
clearing_time, merchant_id, order_source,
receivable_amount, should_clearing_amount,
actual_clearing_amount, fee_amount, withdrawable_amount,
withdraw_code, create_by, create_time,
update_by, update_time, del_flag
)
values (#{billStatus,jdbcType=VARCHAR}, #{tradeDate,jdbcType=VARCHAR}, #{clearingBillCode,jdbcType=VARCHAR},
#{clearingTime,jdbcType=TIMESTAMP}, #{merchantId,jdbcType=VARCHAR}, #{orderSource,jdbcType=VARCHAR},
#{receivableAmount,jdbcType=DECIMAL}, #{shouldClearingAmount,jdbcType=DECIMAL},
#{actualClearingAmount,jdbcType=DECIMAL}, #{feeAmount,jdbcType=DECIMAL}, #{withdrawableAmount,jdbcType=DECIMAL},
#{withdrawCode,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.ClearingBillInfo" useGeneratedKeys="true">
<!--@mbg.generated-->
@@ -62,6 +65,9 @@
<if test="billStatus != null">
bill_status,
</if>
<if test="tradeDate != null">
trade_date,
</if>
<if test="clearingBillCode != null">
clearing_bill_code,
</if>
@@ -112,6 +118,9 @@
<if test="billStatus != null">
#{billStatus,jdbcType=VARCHAR},
</if>
<if test="tradeDate != null">
#{tradeDate,jdbcType=VARCHAR},
</if>
<if test="clearingBillCode != null">
#{clearingBillCode,jdbcType=VARCHAR},
</if>
@@ -166,6 +175,9 @@
<if test="billStatus != null">
bill_status = #{billStatus,jdbcType=VARCHAR},
</if>
<if test="tradeDate != null">
trade_date = #{tradeDate,jdbcType=VARCHAR},
</if>
<if test="clearingBillCode != null">
clearing_bill_code = #{clearingBillCode,jdbcType=VARCHAR},
</if>
@@ -218,6 +230,7 @@
<!--@mbg.generated-->
update clearing_bill_info
set bill_status = #{billStatus,jdbcType=VARCHAR},
trade_date = #{tradeDate,jdbcType=VARCHAR},
clearing_bill_code = #{clearingBillCode,jdbcType=VARCHAR},
clearing_time = #{clearingTime,jdbcType=TIMESTAMP},
merchant_id = #{merchantId,jdbcType=VARCHAR},
@@ -251,7 +264,7 @@
update clearing_bill_info
set bill_status = #{billStatus,jdbcType=VARCHAR}
where id in
<foreach collection="clearingBillIds" item="item" open="(" separator="," close=")">
<foreach close=")" collection="clearingBillIds" item="item" open="(" separator=",">
#{item,jdbcType=INTEGER}
</foreach>
</update>