From d6196e6d1beb3e4e8de4d22da0fae8067c30dc5d Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 16 Oct 2025 16:00:34 +0800 Subject: [PATCH] =?UTF-8?q?10-16=20=E6=94=B6=E6=AC=BE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?= 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 | 3 ++- .../serviceImpl/cash/CashAuditServiceImpl.java | 23 ++++++++++++++++++++- .../cash/CashCollectionServiceImpl.java | 4 ++++ .../resources/cashMapper/CashCollectionMapper.xml | 24 ++++++++++++---------- 5 files changed, 42 insertions(+), 13 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 7d9ced0..8e1c351 100644 --- a/src/main/java/com/example/demo/domain/entity/CashRecord.java +++ b/src/main/java/com/example/demo/domain/entity/CashRecord.java @@ -61,6 +61,7 @@ public class CashRecord implements Serializable { private String rejectReason; // 驳回理由 private Integer auditId; //审核人Id private String receivedRemark; // 到账备注 + private Integer cashRoleId; //角色id(0客服，1地区财务/负责人，2总部) // 退款专用字段 private String refundReason; // 退款原因（客服填写） 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 0883df3..e24b68c 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 @@ -59,7 +59,8 @@ public class CashCollection implements Serializable { private String receivedRemark; //到账备注 private String rejectReason; // 驳回理由 private String auditId; //审核人id - private String auditName; //审核人id + private String auditName; //审核人id + private Integer cashRoleId; //角色id(0客服，1地区财务/负责人，2总部) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") 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 5db9dac..60b82ae 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java @@ -33,7 +33,8 @@ public class CashAuditServiceImpl implements CashAuditService { public boolean auditCollection(String token,Integer auditId, String orderCode, Integer action, String rejectReason) { CashRecord order = cashCollectionMapper.selectUnAuditByOrderCode(orderCode); - if (order==null || order.getStatus()!=0){ + if (order==null || order.getStatus()!=0 + ){ throw new IllegalArgumentException("订单不存在或已被审核"); } CashRecord updateOrder = new CashRecord(); @@ -43,6 +44,26 @@ public class CashAuditServiceImpl implements CashAuditService { updateOrder.setOrderCode(orderCode); if (action==1){ //通过 updateOrder.setStatus(1); + + //往金币订单表加一条充值记录 + UserGoldRecord rechargeOrder = new UserGoldRecord(); + rechargeOrder.setOrderCode(orderCode.replaceFirst("^XJ_", "XJCZ_")); + rechargeOrder.setJwcode(order.getJwcode()); + rechargeOrder.setActivity(order.getActivity()); + rechargeOrder.setPermanentGold(order.getPermanentGold()); + // 获取当前月份（1-12） + int currentMonth = LocalDate.now().getMonthValue(); + // 根据当前月份设置对应字段 + if (currentMonth >= 1 && currentMonth <= 6) { + // 1-6月：设置6月额度，12月保持默认值 + rechargeOrder.setFreeJune(0); + rechargeOrder.setFreeDecember(order.getFreeGold()); + } else { + // 7-12月：设置12月额度，6月保持默认值 + rechargeOrder.setFreeJune(order.getFreeGold()); + rechargeOrder.setFreeDecember(0); + } + rechargeOrder.setSumGold(order.getPermanentGold()); } 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 cecc5b2..94f924d 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -175,6 +175,10 @@ public class CashCollectionServiceImpl implements CashCollectionService { if (markets.contains("9") || markets.contains("9999")){ markets=null; } + if (cashCollection.getCashRoleId()==2) + { + cashCollection.setStatus(134); + } cashCollection.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List cashCollections = cashCollectionMapper.selectCollection1(pageNum, pageSize, cashCollection); diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index b3ad910..05fff33 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -84,14 +84,6 @@ left join admin a2 on cr.audit_id = a2.id 1 = 1 - /*判断market 是否不为总部且 markets 不为空*/ - - AND ( - - cr.market = #{market} - - ) - AND cr.market = #{cashCollection.market} @@ -101,18 +93,28 @@ AND cr.name like concat('%',#{cashCollection.name},'%') + + AND cr.submitter_id = #{cashCollection.submitterId} + + + AND cr.received_market = #{cashCollection.receivedMarket} + AND cr.activity like concat('%',#{cashCollection.activity},'%') + AND cr.goods_name like concat('%',#{cashCollection.goodsName},'%') AND cr.pay_type = #{cashCollection.payType} - - AND cr.status = #{cashCollection.status} - + + AND cr.status IN + + #{digit} + + AND cr.pay_time between #{cashCollection.startTime} and #{cashCollection.endTime}