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
This commit is contained in:
墨大叔 2024-07-30 14:24:19 +08:00
commit 6696ade7d3
8 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smart-switch-service/src/main/java/com/ruoyi/common/constants/ChannelConstants.java
View File

@ -18,4 +18,8 @@ public class ChannelConstants {
// 余额
public static final Long BALANCE_ID = 4L;
// 收款码
public static final Long QR_CODE_ID = 5L;
}

2
smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java
View File

@ -19,7 +19,7 @@ public enum AccountType {
BANK_CARD("1", "个人银行卡", ChannelConstants.BANK_CARD_ID),
WECHAT("2", "微信", ChannelConstants.WECHAT_ID),
ALIPAY("3", "支付宝", ChannelConstants.ALIPAY_ID),
OFFLINE_IMAGE("4", "线下图片", null);
OFFLINE_IMAGE("4", "线下图片", ChannelConstants.QR_CODE_ID);
private final String type;

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

@ -38,7 +38,6 @@ public class Channel extends BaseEntity
/** 服务费费率% */
@Excel(name = "服务费费率%")
@Min(value = 0, message = "服务费费率不允许低于0", groups = {ValidGroup.Update.class})
@JsonView(JsonViewProfile.App.class)
private BigDecimal serviceRate;
/** 成本率% */
@ -66,4 +65,8 @@ public class Channel extends BaseEntity
@ApiModelProperty("提现成本率%")
private BigDecimal withdrawCostRate;
@ApiModelProperty("渠道图片")
@JsonView(JsonViewProfile.App.class)
private String picture;
}

24
smart-switch-service/src/main/java/com/ruoyi/ss/channel/mapper/ChannelMapper.xml
View File

@ -13,16 +13,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectSmChannelVo">
select
channel_id,
name,
enabled,
service_rate,
cost_rate,
service_type,
withdraw_enabled,
withdraw_service_type,
withdraw_service_rate,
withdraw_cost_rate
sc.channel_id,
sc.name,
sc.enabled,
sc.service_rate,
sc.cost_rate,
sc.service_type,
sc.withdraw_enabled,
sc.withdraw_service_type,
sc.withdraw_service_rate,
sc.withdraw_cost_rate,
sc.picture
from sm_channel sc
</sql>
@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="withdrawServiceType != null">withdraw_service_type,</if>
<if test="withdrawServiceRate != null">withdraw_service_rate,</if>
<if test="withdrawCostRate != null">withdraw_cost_rate,</if>
<if test="picture != null">picture,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="channelId != null">#{channelId},</if>
@ -77,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="withdrawServiceType != null">#{withdrawServiceType},</if>
<if test="withdrawServiceRate != null">#{withdrawServiceRate},</if>
<if test="withdrawCostRate != null">#{withdrawCostRate},</if>
<if test="picture != null">#{picture},</if>
</trim>
</insert>
@ -92,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.withdrawServiceType != null">withdraw_service_type = #{data.withdrawServiceType},</if>
<if test="data.withdrawServiceRate != null">withdraw_service_rate = #{data.withdrawServiceRate},</if>
<if test="data.withdrawCostRate != null">withdraw_cost_rate = #{data.withdrawCostRate},</if>
<if test="data.picture != null">picture = #{data.picture},</if>
</trim>
where channel_id = #{data.channelId}
</update>

6
smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ChannelService.java
View File

@ -78,4 +78,10 @@ public interface ChannelService
* @param keyMapper 映射函数
*/
<K> Map<K, ChannelVO> selectMap(ChannelQuery query, Function<? super Channel, ? extends K> keyMapper);
/**
* 查询启用的提现渠道列表
*/
List<ChannelVO> selectEnabledWithdrawList();
}

7
smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelServiceImpl.java
View File

@ -106,6 +106,13 @@ public class ChannelServiceImpl implements ChannelService
return this.selectSmChannelList(dto);
}
@Override
public List<ChannelVO> selectEnabledWithdrawList() {
ChannelQuery dto = new ChannelQuery();
dto.setWithdrawEnabled(true);
return this.selectSmChannelList(dto);
}
/**
* 查询充值渠道映射表
*

11
smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppChannelController.java
View File

@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.JsonViewProfile;
import com.ruoyi.ss.channel.service.ChannelService;
import com.ruoyi.ss.transactionBill.service.TransactionBillService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -22,6 +23,9 @@ public class AppChannelController extends BaseController {
@Autowired
private ChannelService channelService;
@Autowired
private TransactionBillService transactionBillService;
@ApiOperation("获取充值渠道列表")
@JsonView(JsonViewProfile.App.class)
@GetMapping("/recharge/enabledList")
@ -29,4 +33,11 @@ public class AppChannelController extends BaseController {
return success(channelService.selectEnabledRechargeList());
}
@ApiOperation("获取提现渠道列表")
@JsonView(JsonViewProfile.App.class)
@GetMapping("/recharge/enabledWithdrawList")
public AjaxResult getWithdrawEnabledList() {
return success(channelService.selectEnabledWithdrawList());
}
}

1
smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmChannelController.java
View File

@ -91,6 +91,7 @@ public class SmChannelController extends BaseController
channel.setWithdrawServiceType(form.getWithdrawServiceType());
channel.setWithdrawServiceRate(form.getWithdrawServiceRate());
channel.setWithdrawCostRate(form.getWithdrawCostRate());
channel.setPicture(form.getPicture());
return toAjax(smChannelService.updateSmChannel(channel));
}