diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java index 69f3c16..2d9e8b8 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -137,7 +137,7 @@ public class AuditServiceImpl implements AuditService { auditMapper.updateFirstRecharge(order.getJwcode());//设置首充时间为当前时间 } auditMapper.updateUserGold(update); - //累充 + /* //累充 try { BigDecimal sum = BigDecimal.valueOf( order.getPermanentGold()) @@ -152,7 +152,7 @@ public class AuditServiceImpl implements AuditService { log.info("精网号发送成功 | jwcode={}", order.getJwcode()); } catch (Exception e) { log.warn("精网号发送失败,主流程继续 | jwcode={}", order.getJwcode(), e); - } + }*/ //erp增加充值数据 @@ -165,7 +165,7 @@ public class AuditServiceImpl implements AuditService { } else if (order.getType() == 2) { //退款 - //对非强制退款订单进行退红包校验 + /* //对非强制退款订单进行退红包校验 if (order.getAuditStatus() != 4) { try { String result = redService.checkRed(price, linkId); @@ -189,7 +189,7 @@ public class AuditServiceImpl implements AuditService { log.error("红包接口调用异常", e); throw new RuntimeException(e); } - } + }*/ //2.获取对应的订单(退款订单号去掉开头"TK"即为对应原始订单) String oldOrderCode = order.getOrderCode().replaceFirst("TK_", ""); UserGoldRecord oldOrder = auditMapper.selectAllOrderByOrderCode(oldOrderCode); @@ -205,7 +205,7 @@ public class AuditServiceImpl implements AuditService { //商品消费退款 //erp增加退款数据 if (oldOrder.getType() == 1) { - int type = 2; + /* int type = 2; //额外扣金币抵扣红包 if (order.getAuditStatus() == 4) { @@ -268,7 +268,7 @@ public class AuditServiceImpl implements AuditService { } // 执行审核更新 redMapper.update(order.getJwcode(), type, price.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); - +*/ if (order.getPermanentGold() != 0 || order.getFreeJune() != 0 || order.getFreeDecember() != 0 || order.getTaskGold() != 0) { GoldTistV2.addCoinNew(order.getJwcode().toString(), 55, //退款免费-商品 (double) (order.getFreeDecember() + order.getFreeJune()) / 100, SimpleIdGenerator.generateId(), @@ -295,7 +295,7 @@ public class AuditServiceImpl implements AuditService { throw new IllegalArgumentException("用户余额不足,无法退款"); } - int type = 1; //红包充值累计 + /* int type = 1; //红包充值累计 //额外扣金币抵扣红包 if (order.getAuditStatus() == 4) { @@ -358,7 +358,7 @@ public class AuditServiceImpl implements AuditService { } // 执行审核更新 redMapper.update(order.getJwcode(), type, price.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); - +*/ if (order.getTaskGold() == 0) { //无任务金币统一走免费+永久 GoldTistV2.addCoinNew(order.getJwcode().toString(), 58, //退款免费+永久金币-充值 (double) (order.getFreeDecember() + order.getFreeJune() + order.getPermanentGold()) / 100, SimpleIdGenerator.generateId(),