From 27b0ee53a79504332069a1d84db9ad57492fefdd Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 8 Jul 2025 11:46:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=AE=A1=E6=A0=B8=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=A9=B3=E5=9B=9E=E4=BB=8D=E5=8A=A0=E9=87=91=E5=B8=81?= =?UTF-8?q?bug=EF=BC=8C=E9=87=91=E5=B8=81=E6=98=8E=E7=BB=86=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=85=85=E5=80=BC=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=9C=AA=E7=AD=9B=E9=80=89=E9=A9=B3=E5=9B=9E=E4=B8=8E?= =?UTF-8?q?=E6=9C=AA=E5=AE=A1=E6=A0=B8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/serviceImpl/AuditServiceImpl.java | 98 +++++++++++----------- src/main/resources/application.yml | 6 +- src/main/resources/mapper/GoldDetailMapper.xml | 1 + src/main/resources/mapper/RechargeMapper.xml | 4 +- src/main/resources/mapper/RefundMapper.xml | 4 +- 5 files changed, 58 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 62c3838..851fc95 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -47,7 +47,8 @@ public class AuditServiceImpl implements AuditService { updateOrder.setAuditStatus(2); updateOrder.setRejectReason(rejectReason); updateOrder.setAuditTime(new Date()); - + // 执行审核更新 + auditMapper.updateOrder(updateOrder); if (order.getType()==2) { //退款 //2.获取对应的消费订单（退款订单号去掉开头"TK"即为对应消费订单） String consumeOrderCode = order.getOrderCode().replaceFirst("TK", ""); @@ -62,55 +63,56 @@ public class AuditServiceImpl implements AuditService { }else if (action==1) { //通过 updateOrder.setAuditStatus(1); updateOrder.setAuditTime(new Date()); - } - // 执行审核更新 - auditMapper.updateOrder(updateOrder); - //判断是充值还是退款 - if (order.getType()==0){ //充值 - //更新用户余额 - User update = new User(); - update.setJwcode(order.getJwcode()); //精网号 - update.setSumPermanentGold(order.getPermanentGold()); //历史永久金币 - update.setSumFreeJune(order.getFreeJune()); //历史六月免费金币 - update.setSumFreeDecember(order.getFreeDecember()); //历史十二月免费金币 - update.setSumTaskGold(order.getTaskGold()); //历史任务金币 - update.setCurrentPermanentGold(order.getPermanentGold()); //当前永久金币 - update.setCurrentFreeJune(order.getFreeJune()); //当前六月免费金币 - update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币 - update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币 - auditMapper.updateUserGold(update); - //erp增加充值数据 - if(update.getJwcode().equals(94226013)){ - GoldTistV2.addCoinNew(order.getJwcode().toString(), 64, //充值永久金币 - (double) (order.getPermanentGold() ) /100, - order.getRemark(),0, order.getPayPlatform(), "金币充值"); - GoldTistV2.addCoinNew(order.getJwcode().toString(), 63, //充值免费 - (double) (order.getFreeDecember()+order.getFreeJune() ) /100, - order.getRemark(),0, order.getPayPlatform(), "金币充值"); - } - }else if (order.getType()==2) { //退款 - //更新用户余额 - User update = new User(); - update.setJwcode(order.getJwcode()); - update.setCurrentPermanentGold(order.getPermanentGold()); //当前永久金币 - update.setCurrentFreeJune(order.getFreeJune()); //当前六月免费金币 - update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币 - update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币 - auditMapper.updateUserGold(update); - //erp增加退款数据 - if(update.getJwcode().equals(94226013)){ - GoldTistV2.addCoinNew(order.getJwcode().toString(), 56, //退款永久金币 - (double) (order.getPermanentGold() ) /100, - order.getRemark(),0, order.getPayPlatform(), "退款商品"+order.getGoodsName()); - GoldTistV2.addCoinNew(order.getJwcode().toString(), 55, //退款免费 - (double) (order.getFreeDecember()+order.getFreeJune() ) /100, - order.getRemark(),0, order.getPayPlatform(), "退款商品"+order.getGoodsName()); - GoldTistV2.addCoinNew(order.getJwcode().toString(), 57, //退款任务 - (double) (order.getTaskGold() ) /100, - order.getRemark(),0, order.getPayPlatform(), "退款商品"+order.getGoodsName()); - } + // 执行审核更新 + auditMapper.updateOrder(updateOrder); + //判断是充值还是退款 + if (order.getType()==0){ //充值 + //更新用户余额 + User update = new User(); + update.setJwcode(order.getJwcode()); //精网号 + update.setSumPermanentGold(order.getPermanentGold()); //历史永久金币 + update.setSumFreeJune(order.getFreeJune()); //历史六月免费金币 + update.setSumFreeDecember(order.getFreeDecember()); //历史十二月免费金币 + update.setSumTaskGold(order.getTaskGold()); //历史任务金币 + update.setCurrentPermanentGold(order.getPermanentGold()); //当前永久金币 + update.setCurrentFreeJune(order.getFreeJune()); //当前六月免费金币 + update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币 + update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币 + auditMapper.updateUserGold(update); + //erp增加充值数据 + if(update.getJwcode().equals(94226013)){ + GoldTistV2.addCoinNew(order.getJwcode().toString(), 64, //充值永久金币 + (double) (order.getPermanentGold() ) /100, + order.getRemark(),0, order.getPayPlatform(), "金币充值"); + GoldTistV2.addCoinNew(order.getJwcode().toString(), 63, //充值免费 + (double) (order.getFreeDecember()+order.getFreeJune() ) /100, + order.getRemark(),0, order.getPayPlatform(), "金币充值"); + } + }else if (order.getType()==2) { //退款 + //更新用户余额 + User update = new User(); + update.setJwcode(order.getJwcode()); + update.setCurrentPermanentGold(order.getPermanentGold()); //当前永久金币 + update.setCurrentFreeJune(order.getFreeJune()); //当前六月免费金币 + update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币 + update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币 + auditMapper.updateUserGold(update); + //erp增加退款数据 + if(update.getJwcode().equals(94226013)){ + GoldTistV2.addCoinNew(order.getJwcode().toString(), 56, //退款永久金币 + (double) (order.getPermanentGold() ) /100, + order.getRemark(),0, order.getPayPlatform(), "退款商品"+order.getGoodsName()); + GoldTistV2.addCoinNew(order.getJwcode().toString(), 55, //退款免费 + (double) (order.getFreeDecember()+order.getFreeJune() ) /100, + order.getRemark(),0, order.getPayPlatform(), "退款商品"+order.getGoodsName()); + GoldTistV2.addCoinNew(order.getJwcode().toString(), 57, //退款任务 + (double) (order.getTaskGold() ) /100, + order.getRemark(),0, order.getPayPlatform(), "退款商品"+order.getGoodsName()); + } + } } + return true; } /* diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index bb5201b..c069a50 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: fail-on-unknown-properties: false datasource: mysql1: - jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgoldc?serverTimezone=Asia/Shanghai - username: hwgoldc - password: zB48T55wCsHC8KPz + jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgold?serverTimezone=Asia/Shanghai + username: hwgold + password: aDiw7MERSATdfGta driver-class-name: com.mysql.cj.jdbc.Driver hikari: pool-name: mysql1HikariCP diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml index fe5b351..5961ff2 100644 --- a/src/main/resources/mapper/GoldDetailMapper.xml +++ b/src/main/resources/mapper/GoldDetailMapper.xml @@ -13,6 +13,7 @@ left join `user` on `user`.jwcode = `ugr`.jwcode left join `admin` on `admin`.id = `ugr`.admin_id + ugr.audit_status IN (1,3) and ugr.jwcode = #{jwcode} diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml index e8405f8..3358e7a 100644 --- a/src/main/resources/mapper/RechargeMapper.xml +++ b/src/main/resources/mapper/RechargeMapper.xml @@ -24,7 +24,7 @@ JOIN user_gold_record ugr ON u.jwcode = ugr.jwcode JOIN admin a ON ugr.admin_id = a.id JOIN rate r ON ugr.rate_id = r.id - WHERE ugr.type = 0 + WHERE ugr.type = 0 AND ugr.audit_status IN (1,3) @@ -84,7 +84,7 @@ JOIN admin a ON ugr.admin_id = a.id JOIN rate r ON ugr.rate_id = r.id - ugr.type = 0 + ugr.type = 0 AND ugr.audit_status IN (1,3) AND ugr.jwcode = #{jwcode} diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index 032593d..df4aaea 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -23,7 +23,7 @@ user_gold_record ugr ON u.jwcode = ugr.jwcode JOIN admin a ON ugr.admin_id = a.id - WHERE ugr.type = 2 + WHERE ugr.type = 2 AND ugr.audit_status IN (1,3) @@ -82,7 +82,7 @@ JOIN admin a ON ugr.admin_id = a.id - ugr.type = 2 + ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.jwcode = #{jwcode}