From 14946e57776b1e7da54b7a91812e4412da4d8404 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Mon, 9 Mar 2026 15:05:59 +0800 Subject: [PATCH] =?UTF-8?q?3.9=20=E9=92=B1=E5=8C=85=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/serviceImpl/cash/CashRefundServiceImpl.java | 20 ++++++++++++++++---- .../demo/serviceImpl/coin/AuditServiceImpl.java | 19 +++++++++++++++++++ src/main/resources/application-test.yml | 10 +++++----- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 1b8a28b..ced185b 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -2,13 +2,10 @@ package com.example.demo.serviceImpl.cash; import com.example.demo.Util.LanguageTranslationUtil; import com.example.demo.Util.SimpleIdGenerator; -import com.example.demo.domain.entity.Admin; +import com.example.demo.domain.entity.*; import com.example.demo.Util.BusinessException; import com.example.demo.Util.GoldTistV2; import com.example.demo.config.RabbitMQConfig; -import com.example.demo.domain.entity.Market; -import com.example.demo.domain.entity.User; -import com.example.demo.domain.entity.UserGoldRecord; import com.example.demo.domain.vo.bean.Region; import com.example.demo.domain.vo.cash.*; import com.example.demo.domain.vo.coin.Messages; @@ -20,6 +17,7 @@ import com.example.demo.mapper.coin.AuditMapper; import com.example.demo.mapper.coin.MarketMapper; import com.example.demo.mapper.coin.OperationLogMapper; import com.example.demo.mapper.coin.RefundMapper; +import com.example.demo.service.Wallet.WalletService; import com.example.demo.service.cash.RefundService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -67,6 +65,8 @@ public class CashRefundServiceImpl implements RefundService { private CashCollectionMapper cashCollectionMapper; @Autowired private LanguageTranslationUtil languageTranslationUtil; + @Autowired + private WalletService walletService; @Override public PageInfo select(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) { @@ -426,6 +426,18 @@ public class CashRefundServiceImpl implements RefundService { user.setCurrentFreeJune(BigDecimal.valueOf(-userGoldRecord.getFreeJune())); //当前六月免费金币 user.setCurrentFreeDecember(BigDecimal.valueOf(-userGoldRecord.getFreeDecember())); //当前十二月免费金币 auditMapper.updateUserGold(user); + + //钱包更新 + List userWalletList = walletService.selectUserWalletRecord(userGoldRecord.getJwcode(), orderCode); + UserRegionWallet userRegionWallet = new UserRegionWallet(); + for (UserWalletRecord userWalletRecord : userWalletList){ + userRegionWallet.setJwcode(userWalletRecord.getJwcode()); + userRegionWallet.setWalletId(userWalletRecord.getWalletId()); + userRegionWallet.setCurrentPermanentGold(BigDecimal.valueOf(userWalletRecord.getAmount())); + walletService.updateUserGoldRecord(userRegionWallet); + walletService.updateUserWalletRecord(userWalletRecord.getId()); + } + GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 58, //退款免费+永久金币-充值 (double) (userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getPermanentGold()) / 100, SimpleIdGenerator.generateId(), userGoldRecord.getRemark(), (double) userGoldRecord.getPermanentGold() / 100, auditName, "退款金币充值"); 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 2d9e8b8..6d93471 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -6,13 +6,17 @@ import com.example.demo.config.GlobalExceptionHandler; import com.example.demo.config.RabbitMQConfig; import com.example.demo.domain.entity.User; import com.example.demo.domain.entity.UserGoldRecord; +import com.example.demo.domain.entity.UserRegionWallet; +import com.example.demo.domain.entity.UserWalletRecord; import com.example.demo.domain.vo.coin.*; import com.example.demo.exception.RedCheckException; import com.example.demo.mapper.Temporary.RedMapper; import com.example.demo.mapper.coin.AuditMapper; import com.example.demo.mapper.coin.MarketMapper; import com.example.demo.mapper.coin.UserMapper; +import com.example.demo.mapper.coin.WalletMapper; import com.example.demo.service.Temporary.RedService; +import com.example.demo.service.Wallet.WalletService; import com.example.demo.service.coin.AdminService; import com.example.demo.service.coin.AuditService; import com.example.demo.service.coin.GeneralService; @@ -58,7 +62,11 @@ public class AuditServiceImpl implements AuditService { @Autowired private RedService redService; @Autowired + private WalletMapper walletMapper; + @Autowired private RabbitTemplate rabbitTemplate; + @Autowired + private WalletService walletService; /* 审核订单并修改用户余额等 @@ -202,6 +210,17 @@ public class AuditServiceImpl implements AuditService { update.setCurrentTaskGold(BigDecimal.valueOf(order.getTaskGold())); //当前任务金币 auditMapper.updateUserGold(update); + //钱包更新 + List userWalletList = walletService.selectUserWalletRecord(order.getJwcode(), oldOrderCode); + UserRegionWallet userRegionWallet = new UserRegionWallet(); + for (UserWalletRecord userWalletRecord : userWalletList){ + userRegionWallet.setJwcode(userWalletRecord.getJwcode()); + userRegionWallet.setWalletId(userWalletRecord.getWalletId()); + userRegionWallet.setCurrentPermanentGold(BigDecimal.valueOf(userWalletRecord.getAmount())); + walletService.updateUserGoldRecord(userRegionWallet); + walletService.updateUserWalletRecord(userWalletRecord.getId()); + } + //商品消费退款 //erp增加退款数据 if (oldOrder.getType() == 1) { diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index a8c3cb2..90ae516 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -79,11 +79,11 @@ spring: trusted-packages: com.example.demo.domain.DTO data: -# redis: -# database: 0 -# host: localhost -# port: 6379 -# password: 123456 + redis: + database: 0 + host: localhost + port: 6379 + password: 123456 lettuce: pool: