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

保存提现金额信息

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-22 15:25:21 +08:00
parent 098768249b
commit 6319856269
3 changed files with 116 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java
View File

@@ -700,6 +700,9 @@ public class AdapayService {
record.setWithdrawCode(id); record.setWithdrawCode(id);
record.setOrderNo(orderNo); record.setOrderNo(orderNo);
record.setWithdrawStatus(Constants.ZERO); record.setWithdrawStatus(Constants.ZERO);
record.setWithdrawAmt(adapayAccountBalanceVO.getAvlBalance()); // 申请提现金额
record.setFeeAmt(feeAmt); // 提现手续费
record.setCreditedAmt(cashAmt); // 到账金额
Date now = new Date(); Date now = new Date();
record.setApplicationTime(now); record.setApplicationTime(now);
record.setCreateTime(now); record.setCreateTime(now);

16
jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingWithdrawInfo.java
View File

@@ -2,6 +2,7 @@ package com.jsowell.pile.domain;
import lombok.*; import lombok.*;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
@@ -38,6 +39,21 @@ public class ClearingWithdrawInfo {
*/ */
private String withdrawStatus; private String withdrawStatus;
/**
* 提现金额
*/
private BigDecimal withdrawAmt;
/**
* 提现手续费
*/
private BigDecimal feeAmt;
/**
* 到账金额
*/
private BigDecimal creditedAmt;
/** /**
* 申请时间 * 申请时间
*/ */

105
jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml
View File

@@ -9,6 +9,9 @@
<result column="order_no" jdbcType="VARCHAR" property="orderNo" /> <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
<result column="withdraw_code" jdbcType="VARCHAR" property="withdrawCode" /> <result column="withdraw_code" jdbcType="VARCHAR" property="withdrawCode" />
<result column="withdraw_status" jdbcType="VARCHAR" property="withdrawStatus" /> <result column="withdraw_status" jdbcType="VARCHAR" property="withdrawStatus" />
<result column="withdraw_amt" jdbcType="DECIMAL" property="withdrawAmt" />
<result column="fee_amt" jdbcType="DECIMAL" property="feeAmt" />
<result column="credited_amt" jdbcType="DECIMAL" property="creditedAmt" />
<result column="application_time" jdbcType="TIMESTAMP" property="applicationTime" /> <result column="application_time" jdbcType="TIMESTAMP" property="applicationTime" />
<result column="arrival_time" jdbcType="TIMESTAMP" property="arrivalTime" /> <result column="arrival_time" jdbcType="TIMESTAMP" property="arrivalTime" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" /> <result column="create_by" jdbcType="VARCHAR" property="createBy" />
@@ -19,8 +22,9 @@
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated--> <!--@mbg.generated-->
id, merchant_id, order_no, withdraw_code, withdraw_status, application_time, arrival_time, id, merchant_id, order_no, withdraw_code, withdraw_status, withdraw_amt, fee_amt,
create_by, create_time, update_by, update_time, del_flag credited_amt, application_time, arrival_time, create_by, create_time, update_by,
update_time, del_flag
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!--@mbg.generated--> <!--@mbg.generated-->
@@ -37,11 +41,13 @@
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.ClearingWithdrawInfo" useGeneratedKeys="true"> <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.ClearingWithdrawInfo" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into clearing_withdraw_info (merchant_id, order_no, withdraw_code, insert into clearing_withdraw_info (merchant_id, order_no, withdraw_code,
withdraw_status, application_time, arrival_time, withdraw_status, withdraw_amt, fee_amt,
credited_amt, application_time, arrival_time,
create_by, create_time, update_by, create_by, create_time, update_by,
update_time, del_flag) update_time, del_flag)
values (#{merchantId,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, #{withdrawCode,jdbcType=VARCHAR}, values (#{merchantId,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, #{withdrawCode,jdbcType=VARCHAR},
#{withdrawStatus,jdbcType=VARCHAR}, #{applicationTime,jdbcType=TIMESTAMP}, #{arrivalTime,jdbcType=TIMESTAMP}, #{withdrawStatus,jdbcType=VARCHAR}, #{withdrawAmt,jdbcType=DECIMAL}, #{feeAmt,jdbcType=DECIMAL},
#{creditedAmt,jdbcType=DECIMAL}, #{applicationTime,jdbcType=TIMESTAMP}, #{arrivalTime,jdbcType=TIMESTAMP},
#{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
#{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=VARCHAR}) #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=VARCHAR})
</insert> </insert>
@@ -61,6 +67,15 @@
<if test="withdrawStatus != null"> <if test="withdrawStatus != null">
withdraw_status, withdraw_status,
</if> </if>
<if test="withdrawAmt != null">
withdraw_amt,
</if>
<if test="feeAmt != null">
fee_amt,
</if>
<if test="creditedAmt != null">
credited_amt,
</if>
<if test="applicationTime != null"> <if test="applicationTime != null">
application_time, application_time,
</if> </if>
@@ -96,6 +111,15 @@
<if test="withdrawStatus != null"> <if test="withdrawStatus != null">
#{withdrawStatus,jdbcType=VARCHAR}, #{withdrawStatus,jdbcType=VARCHAR},
</if> </if>
<if test="withdrawAmt != null">
#{withdrawAmt,jdbcType=DECIMAL},
</if>
<if test="feeAmt != null">
#{feeAmt,jdbcType=DECIMAL},
</if>
<if test="creditedAmt != null">
#{creditedAmt,jdbcType=DECIMAL},
</if>
<if test="applicationTime != null"> <if test="applicationTime != null">
#{applicationTime,jdbcType=TIMESTAMP}, #{applicationTime,jdbcType=TIMESTAMP},
</if> </if>
@@ -135,6 +159,15 @@
<if test="withdrawStatus != null"> <if test="withdrawStatus != null">
withdraw_status = #{withdrawStatus,jdbcType=VARCHAR}, withdraw_status = #{withdrawStatus,jdbcType=VARCHAR},
</if> </if>
<if test="withdrawAmt != null">
withdraw_amt = #{withdrawAmt,jdbcType=DECIMAL},
</if>
<if test="feeAmt != null">
fee_amt = #{feeAmt,jdbcType=DECIMAL},
</if>
<if test="creditedAmt != null">
credited_amt = #{creditedAmt,jdbcType=DECIMAL},
</if>
<if test="applicationTime != null"> <if test="applicationTime != null">
application_time = #{applicationTime,jdbcType=TIMESTAMP}, application_time = #{applicationTime,jdbcType=TIMESTAMP},
</if> </if>
@@ -166,6 +199,9 @@
order_no = #{orderNo,jdbcType=VARCHAR}, order_no = #{orderNo,jdbcType=VARCHAR},
withdraw_code = #{withdrawCode,jdbcType=VARCHAR}, withdraw_code = #{withdrawCode,jdbcType=VARCHAR},
withdraw_status = #{withdrawStatus,jdbcType=VARCHAR}, withdraw_status = #{withdrawStatus,jdbcType=VARCHAR},
withdraw_amt = #{withdrawAmt,jdbcType=DECIMAL},
fee_amt = #{feeAmt,jdbcType=DECIMAL},
credited_amt = #{creditedAmt,jdbcType=DECIMAL},
application_time = #{applicationTime,jdbcType=TIMESTAMP}, application_time = #{applicationTime,jdbcType=TIMESTAMP},
arrival_time = #{arrivalTime,jdbcType=TIMESTAMP}, arrival_time = #{arrivalTime,jdbcType=TIMESTAMP},
create_by = #{createBy,jdbcType=VARCHAR}, create_by = #{createBy,jdbcType=VARCHAR},
@@ -199,6 +235,21 @@
when id = #{item.id,jdbcType=INTEGER} then #{item.withdrawStatus,jdbcType=VARCHAR} when id = #{item.id,jdbcType=INTEGER} then #{item.withdrawStatus,jdbcType=VARCHAR}
</foreach> </foreach>
</trim> </trim>
<trim prefix="withdraw_amt = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.withdrawAmt,jdbcType=DECIMAL}
</foreach>
</trim>
<trim prefix="fee_amt = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.feeAmt,jdbcType=DECIMAL}
</foreach>
</trim>
<trim prefix="credited_amt = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.creditedAmt,jdbcType=DECIMAL}
</foreach>
</trim>
<trim prefix="application_time = case" suffix="end,"> <trim prefix="application_time = case" suffix="end,">
<foreach collection="list" index="index" item="item"> <foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.applicationTime,jdbcType=TIMESTAMP} when id = #{item.id,jdbcType=INTEGER} then #{item.applicationTime,jdbcType=TIMESTAMP}
@@ -243,12 +294,14 @@
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true"> <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into clearing_withdraw_info insert into clearing_withdraw_info
(merchant_id, order_no, withdraw_code, withdraw_status, application_time, arrival_time, (merchant_id, order_no, withdraw_code, withdraw_status, withdraw_amt, fee_amt, credited_amt,
create_by, create_time, update_by, update_time, del_flag) application_time, arrival_time, create_by, create_time, update_by, update_time,
del_flag)
values values
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
(#{item.merchantId,jdbcType=VARCHAR}, #{item.orderNo,jdbcType=VARCHAR}, #{item.withdrawCode,jdbcType=VARCHAR}, (#{item.merchantId,jdbcType=VARCHAR}, #{item.orderNo,jdbcType=VARCHAR}, #{item.withdrawCode,jdbcType=VARCHAR},
#{item.withdrawStatus,jdbcType=VARCHAR}, #{item.applicationTime,jdbcType=TIMESTAMP}, #{item.withdrawStatus,jdbcType=VARCHAR}, #{item.withdrawAmt,jdbcType=DECIMAL},
#{item.feeAmt,jdbcType=DECIMAL}, #{item.creditedAmt,jdbcType=DECIMAL}, #{item.applicationTime,jdbcType=TIMESTAMP},
#{item.arrivalTime,jdbcType=TIMESTAMP}, #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.arrivalTime,jdbcType=TIMESTAMP}, #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
#{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=VARCHAR} #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=VARCHAR}
) )
@@ -265,6 +318,9 @@
order_no, order_no,
withdraw_code, withdraw_code,
withdraw_status, withdraw_status,
withdraw_amt,
fee_amt,
credited_amt,
application_time, application_time,
arrival_time, arrival_time,
create_by, create_by,
@@ -282,6 +338,9 @@
#{orderNo,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR},
#{withdrawCode,jdbcType=VARCHAR}, #{withdrawCode,jdbcType=VARCHAR},
#{withdrawStatus,jdbcType=VARCHAR}, #{withdrawStatus,jdbcType=VARCHAR},
#{withdrawAmt,jdbcType=DECIMAL},
#{feeAmt,jdbcType=DECIMAL},
#{creditedAmt,jdbcType=DECIMAL},
#{applicationTime,jdbcType=TIMESTAMP}, #{applicationTime,jdbcType=TIMESTAMP},
#{arrivalTime,jdbcType=TIMESTAMP}, #{arrivalTime,jdbcType=TIMESTAMP},
#{createBy,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
@@ -299,6 +358,9 @@
order_no = #{orderNo,jdbcType=VARCHAR}, order_no = #{orderNo,jdbcType=VARCHAR},
withdraw_code = #{withdrawCode,jdbcType=VARCHAR}, withdraw_code = #{withdrawCode,jdbcType=VARCHAR},
withdraw_status = #{withdrawStatus,jdbcType=VARCHAR}, withdraw_status = #{withdrawStatus,jdbcType=VARCHAR},
withdraw_amt = #{withdrawAmt,jdbcType=DECIMAL},
fee_amt = #{feeAmt,jdbcType=DECIMAL},
credited_amt = #{creditedAmt,jdbcType=DECIMAL},
application_time = #{applicationTime,jdbcType=TIMESTAMP}, application_time = #{applicationTime,jdbcType=TIMESTAMP},
arrival_time = #{arrivalTime,jdbcType=TIMESTAMP}, arrival_time = #{arrivalTime,jdbcType=TIMESTAMP},
create_by = #{createBy,jdbcType=VARCHAR}, create_by = #{createBy,jdbcType=VARCHAR},
@@ -327,6 +389,15 @@
<if test="withdrawStatus != null"> <if test="withdrawStatus != null">
withdraw_status, withdraw_status,
</if> </if>
<if test="withdrawAmt != null">
withdraw_amt,
</if>
<if test="feeAmt != null">
fee_amt,
</if>
<if test="creditedAmt != null">
credited_amt,
</if>
<if test="applicationTime != null"> <if test="applicationTime != null">
application_time, application_time,
</if> </if>
@@ -366,6 +437,15 @@
<if test="withdrawStatus != null"> <if test="withdrawStatus != null">
#{withdrawStatus,jdbcType=VARCHAR}, #{withdrawStatus,jdbcType=VARCHAR},
</if> </if>
<if test="withdrawAmt != null">
#{withdrawAmt,jdbcType=DECIMAL},
</if>
<if test="feeAmt != null">
#{feeAmt,jdbcType=DECIMAL},
</if>
<if test="creditedAmt != null">
#{creditedAmt,jdbcType=DECIMAL},
</if>
<if test="applicationTime != null"> <if test="applicationTime != null">
#{applicationTime,jdbcType=TIMESTAMP}, #{applicationTime,jdbcType=TIMESTAMP},
</if> </if>
@@ -405,6 +485,15 @@
<if test="withdrawStatus != null"> <if test="withdrawStatus != null">
withdraw_status = #{withdrawStatus,jdbcType=VARCHAR}, withdraw_status = #{withdrawStatus,jdbcType=VARCHAR},
</if> </if>
<if test="withdrawAmt != null">
withdraw_amt = #{withdrawAmt,jdbcType=DECIMAL},
</if>
<if test="feeAmt != null">
fee_amt = #{feeAmt,jdbcType=DECIMAL},
</if>
<if test="creditedAmt != null">
credited_amt = #{creditedAmt,jdbcType=DECIMAL},
</if>
<if test="applicationTime != null"> <if test="applicationTime != null">
application_time = #{applicationTime,jdbcType=TIMESTAMP}, application_time = #{applicationTime,jdbcType=TIMESTAMP},
</if> </if>
@@ -464,7 +553,7 @@
left join order_basic_info t5 on t5.order_code = t2.order_code and t5.del_flag = '0' left join order_basic_info t5 on t5.order_code = t2.order_code and t5.del_flag = '0'
where t1.del_flag = '0' where t1.del_flag = '0'
and t2.order_code in and t2.order_code in
<foreach collection="orderCodeList" item="orderCode" open="(" separator="," close=")"> <foreach close=")" collection="orderCodeList" item="orderCode" open="(" separator=",">
#{orderCode,jdbcType=VARCHAR} #{orderCode,jdbcType=VARCHAR}
</foreach> </foreach>
</select> </select>