chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化，提现展示账户信息

Browse Source
This commit is contained in:
磷叶 2025-02-21 11:16:58 +08:00
parent 8edf1c05fa
commit b7475591b2
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/typehandler/AccountJsonTypehandler.java Normal file
View File

@ -0,0 +1,8 @@
package com.ruoyi.ss.account.mapper.typehandler;
import com.ruoyi.ss.account.domain.AccountVO;
import com.ruoyi.system.mapper.typehandler.AbstractJsonTypeHandler;
public class AccountJsonTypehandler extends AbstractJsonTypeHandler<AccountVO> {
}

5
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBill.java
View File

@ -16,6 +16,7 @@ import com.ruoyi.common.constants.DictTypeConstants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.JsonViewProfile;
import com.ruoyi.common.core.domain.ValidGroup;
import com.ruoyi.ss.account.domain.AccountVO;
import com.ruoyi.system.valid.DictValid;
import io.swagger.annotations.ApiModelProperty;
@ -360,4 +361,8 @@ public class TransactionBill extends BaseEntity
@ApiModelProperty("优惠金额退款")
@JsonView(JsonViewProfile.App.class)
private BigDecimal discountRefundAmount;
@Excel(name = "提现账户")
@ApiModelProperty("提现账户")
private AccountVO withdrawAccount;
}

5
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
View File

@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="suitGearAmount" column="suit_gear_amount" typeHandler="com.ruoyi.system.mapper.typehandler.DecimalSplitListTypeHandler"/>
<result property="suitGearTime" column="suit_gear_time" typeHandler="com.ruoyi.system.mapper.typehandler.IntegerSplitListTypeHandler"/>
<result property="deviceTotalEle" column="device_total_ele" typeHandler="com.ruoyi.system.mapper.typehandler.NonNullDecimalTypeHandler"/>
<result property="withdrawAccount" column="withdraw_account" typeHandler="com.ruoyi.ss.account.mapper.typehandler.AccountJsonTypehandler"/>
</resultMap>
<sql id="BaseColumns">
@ -124,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectWithdrawVo">
select
<include refid="BaseColumns"/>
stb.withdraw_account,
if(su.is_real, su.real_name, su.user_name) as user_name,
if(su1.is_real, su1.real_name, su1.user_name) as mch_name,
su1.phonenumber as mch_mobile,
@ -652,6 +654,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="vipName != null">vip_name,</if>
<if test="discountAmount != null">discount_amount,</if>
<if test="discountRefundAmount != null">discount_refund_amount,</if>
<if test="withdrawAccount != null">withdraw_account,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="billNo != null">#{billNo},</if>
@ -728,6 +731,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="vipName != null">#{vipName},</if>
<if test="discountAmount != null">#{discountAmount},</if>
<if test="discountRefundAmount != null">#{discountRefundAmount},</if>
<if test="withdrawAccount != null">#{withdrawAccount,typeHandler=com.ruoyi.ss.account.mapper.typehandler.AccountJsonTypehandler},</if>
</trim>
</insert>
@ -820,6 +824,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.vipName != null">stb.vip_name = #{data.vipName},</if>
<if test="data.discountAmount != null">stb.discount_amount = #{data.discountAmount},</if>
<if test="data.discountRefundAmount != null">stb.discount_refund_amount = #{data.discountRefundAmount},</if>
<if test="data.withdrawAccount != null">stb.withdraw_account = #{data.withdrawAccount,typeHandler=com.ruoyi.ss.account.mapper.typehandler.AccountJsonTypehandler},</if>
</sql>
<update id="updateByQuery">

1
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
View File

@ -601,6 +601,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
bill.setChannelCost(channel.getCostRate().multiply(bill.getMoney()).divide(new BigDecimal(100), 2,
RoundingMode.HALF_UP)); // 渠道成本
bill.setAfterBalance(user.getBalance().subtract(dto.getMoney())); // 剩余金额
bill.setWithdrawAccount(account);
transactionTemplate.execute(status -> {
// 提现申请