From 276ff65520b4067d95d25c734ef28f61e0386484 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Tue, 24 Sep 2024 16:24:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/system/domain/EtCapitalFlow.java | 3 +++ .../ruoyi/system/service/impl/CallbackServiceImpl.java | 6 ++++++ .../system/service/impl/EtCapitalFlowServiceImpl.java | 9 +-------- .../main/resources/mapper/system/EtCapitalFlowMapper.xml | 8 +++++++- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java index 00f42a3..6f1fe1f 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java @@ -34,6 +34,9 @@ public class EtCapitalFlow extends BaseEntity @Excel(name = "所属人") private Long ownerId; + @Excel(name = "所属人电话") + private String ownerPhone; + @Excel(name = "所属人类型") private String ownerType; diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java index 049e37d..c63622d 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java @@ -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(); diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java index 78f2fea..fc064f7 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java @@ -69,14 +69,7 @@ public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService @DataScope(deptAlias = "d") public List selectEtCapitalFlowList(EtCapitalFlow etCapitalFlow) { - List etCapitalFlows = etCapitalFlowMapper.selectEtCapitalFlowList(etCapitalFlow); - for (EtCapitalFlow flow : etCapitalFlows) { - if(flow.getOwnerType().equals("1")){ -// flow.getOwnerId() - } - } - - return etCapitalFlows; + return etCapitalFlowMapper.selectEtCapitalFlowList(etCapitalFlow); } /** diff --git a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml index 0b54bfe..b8d7bc3 100644 --- a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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