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

update

Browse Source
This commit is contained in:
Guoqs
2025-04-16 11:57:59 +08:00
parent 6e8cd51cb4
commit 21772ca796
3 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderUnsplitRecord.java
View File

@@ -17,42 +17,47 @@ import lombok.experimental.SuperBuilder;
@NoArgsConstructor @NoArgsConstructor
public class OrderUnsplitRecord { public class OrderUnsplitRecord {
/** /**
* 主键 * 主键
*/ */
private Integer id; private Integer id;
/** /**
* 支付id * 支付id
*/ */
private String paymentId; private String paymentId;
/** /**
* 状态 * 状态
*/ */
private String status; private String status;
/** /**
* 订单编号 * 订单编号
*/ */
private String orderCode; private String orderCode;
/** /**
* 支付金额 * 支付金额
*/ */
private BigDecimal payAmount; private BigDecimal payAmount;
/** /**
* 结算金额 * 退款金额
*/ */
private BigDecimal refundAmount;
/**
* 结算金额
*/
private BigDecimal settleAmount; private BigDecimal settleAmount;
/** /**
* 订单时间 * 订单时间
*/ */
private Date orderTime; private Date orderTime;
/** /**
* 记录添加时间 * 记录添加时间
*/ */
private Date createTime; private Date createTime;
} }

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderUnsplitRecordMapper.java
View File

@@ -1,7 +1,9 @@
package com.jsowell.pile.mapper; package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.OrderUnsplitRecord; import com.jsowell.pile.domain.OrderUnsplitRecord;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface OrderUnsplitRecordMapper { public interface OrderUnsplitRecordMapper {

45
jsowell-pile/src/main/resources/mapper/pile/OrderUnsplitRecordMapper.xml
View File

@@ -9,13 +9,15 @@
<result column="status" jdbcType="VARCHAR" property="status" /> <result column="status" jdbcType="VARCHAR" property="status" />
<result column="order_code" jdbcType="VARCHAR" property="orderCode" /> <result column="order_code" jdbcType="VARCHAR" property="orderCode" />
<result column="pay_amount" jdbcType="DECIMAL" property="payAmount" /> <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
<result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
<result column="settle_amount" jdbcType="DECIMAL" property="settleAmount" /> <result column="settle_amount" jdbcType="DECIMAL" property="settleAmount" />
<result column="order_time" jdbcType="TIMESTAMP" property="orderTime" /> <result column="order_time" jdbcType="TIMESTAMP" property="orderTime" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated--> <!--@mbg.generated-->
id, payment_id, `status`, order_code, pay_amount, settle_amount, order_time, create_time id, payment_id, `status`, order_code, pay_amount, refund_amount, settle_amount, order_time,
create_time
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!--@mbg.generated--> <!--@mbg.generated-->
@@ -45,6 +47,9 @@
<if test="payAmount != null"> <if test="payAmount != null">
pay_amount, pay_amount,
</if> </if>
<if test="refundAmount != null">
refund_amount,
</if>
<if test="settleAmount != null"> <if test="settleAmount != null">
settle_amount, settle_amount,
</if> </if>
@@ -68,6 +73,9 @@
<if test="payAmount != null"> <if test="payAmount != null">
#{payAmount,jdbcType=DECIMAL}, #{payAmount,jdbcType=DECIMAL},
</if> </if>
<if test="refundAmount != null">
#{refundAmount,jdbcType=DECIMAL},
</if>
<if test="settleAmount != null"> <if test="settleAmount != null">
#{settleAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL},
</if> </if>
@@ -95,6 +103,9 @@
<if test="payAmount != null"> <if test="payAmount != null">
pay_amount = #{payAmount,jdbcType=DECIMAL}, pay_amount = #{payAmount,jdbcType=DECIMAL},
</if> </if>
<if test="refundAmount != null">
refund_amount = #{refundAmount,jdbcType=DECIMAL},
</if>
<if test="settleAmount != null"> <if test="settleAmount != null">
settle_amount = #{settleAmount,jdbcType=DECIMAL}, settle_amount = #{settleAmount,jdbcType=DECIMAL},
</if> </if>
@@ -131,6 +142,11 @@
when id = #{item.id,jdbcType=INTEGER} then #{item.payAmount,jdbcType=DECIMAL} when id = #{item.id,jdbcType=INTEGER} then #{item.payAmount,jdbcType=DECIMAL}
</foreach> </foreach>
</trim> </trim>
<trim prefix="refund_amount = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.refundAmount,jdbcType=DECIMAL}
</foreach>
</trim>
<trim prefix="settle_amount = case" suffix="end,"> <trim prefix="settle_amount = 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.settleAmount,jdbcType=DECIMAL} when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL}
@@ -184,6 +200,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="refund_amount = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.refundAmount != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.refundAmount,jdbcType=DECIMAL}
</if>
</foreach>
</trim>
<trim prefix="settle_amount = case" suffix="end,"> <trim prefix="settle_amount = case" suffix="end,">
<foreach collection="list" index="index" item="item"> <foreach collection="list" index="index" item="item">
<if test="item.settleAmount != null"> <if test="item.settleAmount != null">
@@ -214,13 +237,13 @@
<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 order_unsplit_record insert into order_unsplit_record
(payment_id, `status`, order_code, pay_amount, settle_amount, order_time, create_time (payment_id, `status`, order_code, pay_amount, refund_amount, settle_amount, order_time,
) create_time)
values values
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
(#{item.paymentId,jdbcType=VARCHAR}, #{item.status,jdbcType=VARCHAR}, #{item.orderCode,jdbcType=VARCHAR}, (#{item.paymentId,jdbcType=VARCHAR}, #{item.status,jdbcType=VARCHAR}, #{item.orderCode,jdbcType=VARCHAR},
#{item.payAmount,jdbcType=DECIMAL}, #{item.settleAmount,jdbcType=DECIMAL}, #{item.orderTime,jdbcType=TIMESTAMP}, #{item.payAmount,jdbcType=DECIMAL}, #{item.refundAmount,jdbcType=DECIMAL}, #{item.settleAmount,jdbcType=DECIMAL},
#{item.createTime,jdbcType=TIMESTAMP}) #{item.orderTime,jdbcType=TIMESTAMP}, #{item.createTime,jdbcType=TIMESTAMP})
</foreach> </foreach>
</insert> </insert>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderUnsplitRecord" useGeneratedKeys="true"> <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderUnsplitRecord" useGeneratedKeys="true">
@@ -234,6 +257,7 @@
`status`, `status`,
order_code, order_code,
pay_amount, pay_amount,
refund_amount,
settle_amount, settle_amount,
order_time, order_time,
create_time, create_time,
@@ -247,6 +271,7 @@
#{status,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
#{orderCode,jdbcType=VARCHAR}, #{orderCode,jdbcType=VARCHAR},
#{payAmount,jdbcType=DECIMAL}, #{payAmount,jdbcType=DECIMAL},
#{refundAmount,jdbcType=DECIMAL},
#{settleAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL},
#{orderTime,jdbcType=TIMESTAMP}, #{orderTime,jdbcType=TIMESTAMP},
#{createTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
@@ -260,6 +285,7 @@
`status` = #{status,jdbcType=VARCHAR}, `status` = #{status,jdbcType=VARCHAR},
order_code = #{orderCode,jdbcType=VARCHAR}, order_code = #{orderCode,jdbcType=VARCHAR},
pay_amount = #{payAmount,jdbcType=DECIMAL}, pay_amount = #{payAmount,jdbcType=DECIMAL},
refund_amount = #{refundAmount,jdbcType=DECIMAL},
settle_amount = #{settleAmount,jdbcType=DECIMAL}, settle_amount = #{settleAmount,jdbcType=DECIMAL},
order_time = #{orderTime,jdbcType=TIMESTAMP}, order_time = #{orderTime,jdbcType=TIMESTAMP},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -284,6 +310,9 @@
<if test="payAmount != null"> <if test="payAmount != null">
pay_amount, pay_amount,
</if> </if>
<if test="refundAmount != null">
refund_amount,
</if>
<if test="settleAmount != null"> <if test="settleAmount != null">
settle_amount, settle_amount,
</if> </if>
@@ -311,6 +340,9 @@
<if test="payAmount != null"> <if test="payAmount != null">
#{payAmount,jdbcType=DECIMAL}, #{payAmount,jdbcType=DECIMAL},
</if> </if>
<if test="refundAmount != null">
#{refundAmount,jdbcType=DECIMAL},
</if>
<if test="settleAmount != null"> <if test="settleAmount != null">
#{settleAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL},
</if> </if>
@@ -338,6 +370,9 @@
<if test="payAmount != null"> <if test="payAmount != null">
pay_amount = #{payAmount,jdbcType=DECIMAL}, pay_amount = #{payAmount,jdbcType=DECIMAL},
</if> </if>
<if test="refundAmount != null">
refund_amount = #{refundAmount,jdbcType=DECIMAL},
</if>
<if test="settleAmount != null"> <if test="settleAmount != null">
settle_amount = #{settleAmount,jdbcType=DECIMAL}, settle_amount = #{settleAmount,jdbcType=DECIMAL},
</if> </if>