From 072afb22969c30d6e0ded061ca29a3136b63a256 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 21 Oct 2025 16:41:49 +0800 Subject: [PATCH] =?UTF-8?q?10-21=20=E6=94=B6=E6=AC=BE=EF=BC=9A=E5=9C=B0?= =?UTF-8?q?=E5=8C=BA=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9=EF=BC=88=E5=9C=B0?= =?UTF-8?q?=E6=96=B9=E8=B4=A2=E5=8A=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/domain/entity/CashRecord.java | 1 + .../demo/domain/vo/cash/CashCollection.java | 1 + .../cash/CashCollectionServiceImpl.java | 23 +++++++++----- .../resources/cashMapper/CashCollectionMapper.xml | 37 +++++++++++++++++----- 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/example/demo/domain/entity/CashRecord.java b/src/main/java/com/example/demo/domain/entity/CashRecord.java index 8e1c351..958f5bb 100644 --- a/src/main/java/com/example/demo/domain/entity/CashRecord.java +++ b/src/main/java/com/example/demo/domain/entity/CashRecord.java @@ -56,6 +56,7 @@ public class CashRecord implements Serializable { // 状态 & 操作人 private Integer status; // 订单状态 private Integer submitterId; // 提交人 id + private String submitterMarket; //提交人地区 private String voucher; // 转账凭证 private String remark; // 备注 private String rejectReason; // 驳回理由 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 451bba9..bfdccd3 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 @@ -54,6 +54,7 @@ public class CashCollection implements Serializable { //状态 操作人 private Integer status; // 订单状态 private Integer submitterId; // 提交人 id + private String submitterMarket; //提交人地区 private String submitterName; // 提交人 姓名 private String voucher; // 转账凭证 private String remark; // 备注 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 cd583ab..209fde2 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -102,6 +102,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { cashRecord.setRemark(cashCollection.getRemark()); //备注 cashRecord.setStatus(0); //订单状态：付款线下财务待审核 cashRecord.setSubmitterId(cashCollection.getSubmitterId()); //提交人ID + cashRecord.setSubmitterMarket(cashCollection.getSubmitterMarket()); cashRecord.setOrderType(1); //订单类型：1-收款 cashRecord.setMarket(cashCollection.getMarket()); //地区，根据jwcode插入 @@ -185,25 +186,31 @@ public class CashCollectionServiceImpl implements CashCollectionService { if (markets.contains("9") || markets.contains("9999")){ markets=null; } - cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket())); + // cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket())); if (cashCollection.getCashRoleId()==2) { //角色是总部时，传1346，sql处理为（1，3，4，6）筛选， cashCollection.setStatus(1346); cashCollection.setSubmitterId(null); cashCollection.setReceivedMarket(null); - }if (cashCollection.getCashRoleId()==1){ + cashCollection.setSubmitterMarket(null); + } + if (cashCollection.getCashRoleId()==1){ //角色是地方财务，提交人置空不设筛选条件,仅按地区筛选，查看 - if(cashCollection.getStatus()==null){ - cashCollection.setStatus(123460); - } + if(cashCollection.getStatus()==null){ + cashCollection.setStatus(123460);} + if (cashCollection.getStatus()==0||cashCollection.getStatus()==2){ + cashCollection.setReceivedMarket(null);} + if (cashCollection.getStatus()==1||cashCollection.getStatus()==3){ + cashCollection.setSubmitterMarket(null);} cashCollection.setSubmitterId(null); - }if (cashCollection.getCashRoleId()==0){ + + } + if (cashCollection.getCashRoleId()==0){ //角色是地方财务，提交人置空不设筛选条件---仅当角色是0 地方客服时，按提交人筛选 if(cashCollection.getStatus()==null){ - cashCollection.setStatus(1234560); - } + cashCollection.setStatus(1234560);} cashCollection.setSubmitterId(cashCollection.getSubmitterId()); cashCollection.setReceivedMarket(null); } diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index e53cbff..25d247b 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -9,12 +9,12 @@ cash_record(order_type,jwcode,name,market,activity, order_code,goods_name,good_num,permanent_gold,free_gold, payment_currency,payment_amount,received_market, - pay_type,pay_time,status,submitter_id, + pay_type,pay_time,status,submitter_id,submtter_market, voucher,remark) values(#{orderType},#{jwcode},#{name},#{market},#{activity}, #{orderCode},#{goodsName},#{goodNum},#{permanentGold},#{freeGold},#{paymentCurrency}, #{paymentAmount},#{receivedMarket},#{payType},#{payTime}, - #{status},#{submitterId},#{voucher},#{remark}) + #{status},#{submitterId},#{submitterMarket},#{voucher},#{remark}) + + + AND cr.received_market = #{cashCollection.receivedMarket} + + + AND cr.submitter_market = #{cashCollection.submitterMarket} + + AND cr.activity like concat('%',#{cashCollection.activity},'%')