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

Merge remote-tracking branch 'origin/master' into dev

Browse Source 
# Conflicts:
#	smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java
#	smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
This commit is contained in:
墨大叔 2024-09-13 16:04:46 +08:00
commit c2b9367442
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java
View File

@ -17,6 +17,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
* 普通用户信息对象 sm_user
@ -167,6 +168,17 @@ public class SmUser extends BaseEntity
@JsonView(JsonViewProfile.App.class)
private Boolean isReal;
@Excel(name = "是否限制提现")
@ApiModelProperty("是否限制提现")
@JsonView(JsonViewProfile.App.class)
private Boolean limitWithdraw;
@Excel(name = "限制提现原因")
@ApiModelProperty("限制提现原因")
@JsonView(JsonViewProfile.App.class)
@Size(max = 200, message = "限制提现原因长度不能超过200个字符")
private String limitWithdrawReason;
@ApiModelProperty("用户类型")
private String type;
}

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

@ -411,6 +411,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
ServiceUtil.assertion(user == null, "用户不存在");
ServiceUtil.assertion(user.getIsReal() == null || !user.getIsReal(), "用户未实名认证，无法提现");
ServiceUtil.assertion(user.getLimitWithdraw() != null && user.getLimitWithdraw(), "您被限制提现：" + user.getLimitWithdrawReason());
// 判断今天提现成功和正在审核中的提现是否超过限额
String dailyLimitStr = sysConfigService.selectConfigByKey(ConfigKey.DAILY_WITHDRAW_AMOUNT.getKey());

9
smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
View File

@ -45,6 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
su.real_id_card,
su.real_phone,
su.is_real,
su.limit_withdraw,
su.limit_withdraw_reason,
if(su.is_real, su.real_name, su.user_name) as real_or_user_name,
(select sum(stb.money) from sm_transaction_bill stb where stb.user_id = su.user_id and stb.type = '1' and stb.status = '2') as recharge_amount,
(select sum(stb.arrival_amount) from sm_transaction_bill stb where stb.user_id = su.user_id and stb.type = '2' and stb.status = '14') as with_drawl_amount,
@ -67,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null and remark != ''"> and su.remark like concat('%', #{remark}, '%')</if>
<if test="withdrawServiceType != null and withdrawServiceType != ''"> and withdraw_service_type = #{withdrawServiceType}</if>
<if test="serviceType != null and serviceType != ''"> and service_type = #{serviceType}</if>
<if test="limitWithdraw != null "> and limit_withdraw = #{limitWithdraw}</if>
<if test="tenantDeviceId != null">
and su.user_id in (
select sdt.tenant_id
@ -160,6 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="realIdCard != null">real_id_card,</if>
<if test="realPhone != null">real_phone,</if>
<if test="isReal != null">is_real,</if>
<if test="limitWithdraw != null">limit_withdraw,</if>
<if test="limitWithdrawReason != null">limit_withdraw_reason,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userName != null and userName != ''">#{userName},</if>
@ -193,6 +198,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="realIdCard != null">#{realIdCard},</if>
<if test="realPhone != null">#{realPhone},</if>
<if test="isReal != null">#{isReal},</if>
<if test="limitWithdraw != null">#{limitWithdraw},</if>
<if test="limitWithdrawReason != null">#{limitWithdrawReason},</if>
</trim>
</insert>
@ -236,6 +243,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="realIdCard != null">real_id_card = #{realIdCard},</if>
<if test="realPhone != null">real_phone = #{realPhone},</if>
<if test="isReal != null">is_real = #{isReal},</if>
<if test="limitWithdraw != null">limit_withdraw = #{limitWithdraw},</if>
<if test="limitWithdrawReason != null">limit_withdraw_reason = #{limitWithdrawReason},</if>
</trim>
where user_id = #{userId}
</update>