qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.资金流水手机号

Browse Source
This commit is contained in:
邱贞招 2024-09-24 16:24:24 +08:00
parent 418b358b06
commit 276ff65520
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java
View File

@ -34,6 +34,9 @@ public class EtCapitalFlow extends BaseEntity
@Excel(name = "所属人")
private Long ownerId;
@Excel(name = "所属人电话")
private String ownerPhone;
@Excel(name = "所属人类型")
private String ownerType;

6
electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java
View File

@ -691,6 +691,7 @@ public class CallbackServiceImpl implements CallbackService {
capitalFlow.setBusType(busType);
capitalFlow.setOwnerType(ownerType);
capitalFlow.setOwnerId(sysDept.getDeptId());
capitalFlow.setOwnerPhone(sysDept.getPhone());
capitalFlow.setOwner(sysDept.getDeptName());
capitalFlow.setAmount(order.getPayFee());
String handlingCharge1 = sysDept.getHandlingCharge();
@ -796,6 +797,7 @@ public class CallbackServiceImpl implements CallbackService {
capitalFlow.setBusType(busType);
capitalFlow.setOwnerType(ownerType);
capitalFlow.setOwnerId(user.getUserId());
capitalFlow.setOwnerPhone(user.getPhonenumber());
capitalFlow.setOwner(user.getUserName());
capitalFlow.setAmount(order.getPayFee());
capitalFlow.setHandlingCharge(BigDecimal.ZERO);//手续费 0
@ -858,6 +860,7 @@ public class CallbackServiceImpl implements CallbackService {
capitalFlow.setBusType(busType);
capitalFlow.setOwnerType(ownerType);
capitalFlow.setOwnerId(sysDept.getDeptId());
capitalFlow.setOwnerPhone(sysDept.getPhone());
capitalFlow.setOwner(sysDept.getDeptName());
capitalFlow.setAmount(order.getPayFee());
String handlingCharge1 = sysDept.getHandlingCharge();
@ -963,6 +966,7 @@ public class CallbackServiceImpl implements CallbackService {
capitalFlow.setBusType(busType);
capitalFlow.setOwnerType(ownerType);
capitalFlow.setOwnerId(user.getUserId());
capitalFlow.setOwnerPhone(user.getPhonenumber());
capitalFlow.setOwner(user.getUserName());
capitalFlow.setAmount(order.getPayFee());
capitalFlow.setHandlingCharge(BigDecimal.ZERO);//手续费 0
@ -1022,6 +1026,7 @@ public class CallbackServiceImpl implements CallbackService {
capitalFlow.setBusType(busType);
capitalFlow.setOwnerType(ownerType);
capitalFlow.setOwnerId(sysDept.getDeptId());
capitalFlow.setOwnerPhone(sysDept.getPhone());
capitalFlow.setOwner(sysDept.getDeptName());
String handlingChargeType = sysDept.getHandlingChargeType();
@ -1083,6 +1088,7 @@ public class CallbackServiceImpl implements CallbackService {
capitalFlow.setBusType(busType);
capitalFlow.setOwnerType(ownerType);
capitalFlow.setOwnerId(sysDept.getDeptId());
capitalFlow.setOwnerPhone(sysDept.getPhone());
capitalFlow.setOwner(sysDept.getDeptName());
String handlingChargeType = sysDept.getHandlingChargeType();

9
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java
View File

@ -69,14 +69,7 @@ public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
@DataScope(deptAlias = "d")
public List<EtCapitalFlow> selectEtCapitalFlowList(EtCapitalFlow etCapitalFlow)
{
List<EtCapitalFlow> etCapitalFlows = etCapitalFlowMapper.selectEtCapitalFlowList(etCapitalFlow);
for (EtCapitalFlow flow : etCapitalFlows) {
if(flow.getOwnerType().equals("1")){
// flow.getOwnerId()
}
}
return etCapitalFlows;
return etCapitalFlowMapper.selectEtCapitalFlowList(etCapitalFlow);
}
/**

8
electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml
View File

@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="areaId" column="area_id" />
<result property="owner" column="owner" />
<result property="ownerId" column="owner_id" />
<result property="ownerPhone" column="owner_phone" />
<result property="ownerType" column="owner_type" />
<result property="areaName" column="area_name" />
<result property="orderNo" column="order_no" />
@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectEtCapitalFlowVo">
select flow_id, area_id, owner, owner_id, owner_type, order_no, out_trade_no, type, bus_type, status, amount, handling_charge, platform_service_fee, operator_dividend, operator_balance, partner_dividend, pay_type, create_time, model_id from et_capital_flow
select flow_id, area_id, owner, owner_id, owner_phone, owner_type, order_no, out_trade_no, type, bus_type, status, amount, handling_charge, platform_service_fee, operator_dividend, operator_balance, partner_dividend, pay_type, create_time, model_id from et_capital_flow
</sql>
<select id="selectEtCapitalFlowList" parameterType="EtCapitalFlow" resultMap="EtCapitalFlowResult">
@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
cf.area_id,
cf.owner,
cf.owner_id,
cf.owner_phone,
cf.owner_type,
cf.order_no,
cf.out_trade_no,
@ -64,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaId != null "> and cf.area_id = #{areaId}</if>
<if test="orderNo != null and orderNo != ''"> and cf.order_no = #{orderNo}</if>
<if test="ownerId != null and ownerId != ''"> and cf.owner_id = #{ownerId}</if>
<if test="ownerPhone != null and ownerPhone != ''"> and cf.owner_phone like concat('%', #{ownerPhone}, '%')</if>
<if test="ownerType != null and ownerType != ''"> and cf.owner_type = #{ownerType}</if>
<if test="outTradeNo != null and outTradeNo != ''"> and cf.out_trade_no = #{outTradeNo}</if>
<if test="type != null and type != ''"> and cf.type = #{type}</if>
@ -181,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaId != null">area_id,</if>
<if test="owner != null">owner,</if>
<if test="ownerId != null">owner_id,</if>
<if test="ownerPhone != null">owner_phone,</if>
<if test="ownerType != null">owner_type,</if>
<if test="orderNo != null">order_no,</if>
<if test="outTradeNo != null">out_trade_no,</if>
@ -202,6 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaId != null">#{areaId},</if>
<if test="owner != null">#{owner},</if>
<if test="ownerId != null">#{ownerId},</if>
<if test="ownerPhone != null">#{ownerPhone},</if>
<if test="ownerType != null">#{ownerType},</if>
<if test="orderNo != null">#{orderNo},</if>
<if test="outTradeNo != null">#{outTradeNo},</if>
@ -226,6 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaId != null">area_id = #{areaId},</if>
<if test="owner != null">owner = #{owner},</if>
<if test="ownerId != null">owner_id = #{ownerId},</if>
<if test="ownerPhone != null">owner_phone = #{ownerPhone},</if>
<if test="ownerType != null">owner_type = #{ownerType},</if>
<if test="orderNo != null">order_no = #{orderNo},</if>
<if test="outTradeNo != null">out_trade_no = #{outTradeNo},</if>