From 697a96518e8fe22b4307606ffa59e131c8b6a0f7 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 17 Oct 2025 13:28:10 +0800 Subject: [PATCH] =?UTF-8?q?10-17=20=E6=94=B6=E6=AC=BE=E7=AD=9B=E9=80=89?= =?UTF-8?q?=EF=BC=9A=E7=94=A8=E6=88=B7=E5=9C=B0=E5=8C=BA=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/domain/vo/cash/CashCollection.java | 1 + .../com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java | 9 ++++++++- .../example/demo/serviceImpl/cash/CashCollectionServiceImpl.java | 5 +++-- src/main/resources/cashMapper/CashCollectionMapper.xml | 4 +++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index e24b68c..5b45e35 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -30,6 +30,7 @@ public class CashCollection implements Serializable { private Integer jwcode; // 精网号 private String name; // 姓名 private String market; // 所属地区 + private String marketName; // 所属地区名称 private String activity; // 活动名称 private String orderCode; // 金币订单号 private String bankCode; // 银行流水订单号 diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java index 60b82ae..8511647 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java @@ -63,7 +63,14 @@ public class CashAuditServiceImpl implements CashAuditService { rechargeOrder.setFreeJune(order.getFreeGold()); rechargeOrder.setFreeDecember(0); } - rechargeOrder.setSumGold(order.getPermanentGold()); + rechargeOrder.setSumGold(order.getPermanentGold()+order.getFreeGold()); + //todo 缺汇率id、money、备注 10-17 11：30 + rechargeOrder.setPayModel(order.getPayType()); + rechargeOrder.setVoucher(order.getVoucher()); + rechargeOrder.setPayPlatform("金币系统"); + + + } else if (action==2){ //驳回 updateOrder.setStatus(2); diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index d1691d7..b86f02e 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -176,11 +176,12 @@ public class CashCollectionServiceImpl implements CashCollectionService { markets=null; } cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket())); - if (cashCollection.getCashRoleId()==2) - { + if (cashCollection.getCashRoleId()==2) { + //角色是总部时，传134，sql处理为（1，3，4）筛选，提交人置空不设筛选条件 cashCollection.setStatus(134); cashCollection.setSubmitterId(null); }if (cashCollection.getCashRoleId()==1){ + //角色是地方财务，提交人置空不设筛选条件---仅当角色是0 地方客服时，按提交人筛选 cashCollection.setSubmitterId(null); } cashCollection.setMarkets(markets); diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 05fff33..95c78ec 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -70,7 +70,8 @@