From 82d61197daa28adf12ff159c6f0cc191664003ed Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Wed, 4 Mar 2026 14:01:47 +0800 Subject: [PATCH] =?UTF-8?q?20260304=E9=92=B1=E5=8C=85=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RegionWallet.java => DTO/RegionWalletDTO.java} | 5 ++-- .../com/example/demo/domain/entity/Wallet.java | 23 ++++++++++++++++ .../example/demo/mapper/coin/ConsumeMapper.java | 8 +++--- .../demo/serviceImpl/coin/ConsumeServiceImpl.java | 17 ++++-------- src/main/resources/application-test.yml | 10 +++---- src/main/resources/mapper/ConsumeMapper.xml | 31 ++++++++++++++-------- 6 files changed, 61 insertions(+), 33 deletions(-) rename src/main/java/com/example/demo/domain/{entity/RegionWallet.java => DTO/RegionWalletDTO.java} (91%) create mode 100644 src/main/java/com/example/demo/domain/entity/Wallet.java diff --git a/src/main/java/com/example/demo/domain/entity/RegionWallet.java b/src/main/java/com/example/demo/domain/DTO/RegionWalletDTO.java similarity index 91% rename from src/main/java/com/example/demo/domain/entity/RegionWallet.java rename to src/main/java/com/example/demo/domain/DTO/RegionWalletDTO.java index 4bcce7e..93c99c5 100644 --- a/src/main/java/com/example/demo/domain/entity/RegionWallet.java +++ b/src/main/java/com/example/demo/domain/DTO/RegionWalletDTO.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.entity; +package com.example.demo.domain.DTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; @@ -20,7 +20,7 @@ import java.util.Date; @Data @NoArgsConstructor @AllArgsConstructor -public class RegionWallet { +public class RegionWalletDTO { private Integer id; //钱包id private Integer jwcode; // 精网号 private Integer walletId; // 钱包id @@ -32,4 +32,5 @@ public class RegionWallet { private Date createTime; // 创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date updateTime; // 更新时间 + private Integer priority; } diff --git a/src/main/java/com/example/demo/domain/entity/Wallet.java b/src/main/java/com/example/demo/domain/entity/Wallet.java new file mode 100644 index 0000000..dd3e69b --- /dev/null +++ b/src/main/java/com/example/demo/domain/entity/Wallet.java @@ -0,0 +1,23 @@ +package com.example.demo.domain.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @program: gold-java + * @ClassName Wallet + * @description: + * @author: Double + * @create: 2026−03-04 11:57 + * @Version 1.0 + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Wallet { + private Integer id; //钱包id + private Integer walletName; // 钱包名称 + private Integer priority; // 优先级 +} diff --git a/src/main/java/com/example/demo/mapper/coin/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/coin/ConsumeMapper.java index 5275411..90f9010 100644 --- a/src/main/java/com/example/demo/mapper/coin/ConsumeMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/ConsumeMapper.java @@ -1,7 +1,8 @@ package com.example.demo.mapper.coin; -import com.example.demo.domain.entity.RegionWallet; +import com.example.demo.domain.DTO.RegionWalletDTO; import com.example.demo.domain.entity.UserGoldRecord; +import com.example.demo.domain.entity.Wallet; import com.example.demo.domain.vo.coin.ConsumeUser; import com.example.demo.domain.vo.coin.Gold; import com.example.demo.domain.vo.coin.RefundUser; @@ -46,7 +47,8 @@ public interface ConsumeMapper { Gold sumGold(ConsumeUser consumeUser); - RegionWallet selectRegionWalletByJwcode(Integer jwcode); - + //查询钱包 + List selectRegionWalletByJwcode(Integer jwcode); + List selectWallet(); void createRegionWallet(Integer jwcode); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java index 9729513..61ba77e 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -2,7 +2,7 @@ package com.example.demo.serviceImpl.coin; import com.example.demo.Util.GoldTistV2; import com.example.demo.Util.SimpleIdGenerator; -import com.example.demo.domain.entity.RegionWallet; +import com.example.demo.domain.DTO.RegionWalletDTO; import com.example.demo.domain.entity.User; import com.example.demo.domain.entity.UserGoldRecord; import com.example.demo.domain.vo.coin.*; @@ -12,7 +12,6 @@ import com.example.demo.mapper.coin.MarketMapper; import com.example.demo.mapper.coin.UserMapper; import com.example.demo.service.Temporary.RedService; import com.example.demo.service.coin.ConsumeService; -import com.example.demo.service.coin.MarketService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -23,8 +22,6 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -151,6 +148,10 @@ public class ConsumeServiceImpl implements ConsumeService { if (goldUser == null) { return Result.error("用户不存在"); } + List regionWallets = consumeMapper.selectRegionWalletByJwcode(consumeUser.getJwcode()); + if(regionWallets == null || regionWallets.isEmpty()){ + return Result.error("用户钱包不存在"); + } UserGoldRecord userGoldRecord = new UserGoldRecord(); String orderNumber = UUID.randomUUID().toString().replaceAll("-", ""); @@ -226,14 +227,6 @@ public class ConsumeServiceImpl implements ConsumeService { else if (consumeUser.getPermanentGold().compareTo(BigDecimal.ZERO)==0&&consumeUser.getFreeGold().compareTo(BigDecimal.ZERO)==0&&consumeUser.getTaskGold().compareTo(BigDecimal.ZERO)==0){ GoldTistV2.addCoinRecordNew(String.valueOf(consumeUser.getJwcode()), consumeUser.getRemark(),consumeUser.getAdminName(),consumeUser.getGoodsName());} - RegionWallet wallet = consumeMapper.selectRegionWalletByJwcode(consumeUser.getJwcode()); - if(wallet == null){ - - } - - - - consumeMapper.add(userGoldRecord); consumeMapper.updateUserGold(userGoldRecord); User user = new User(); diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 90ae516..a8c3cb2 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: diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index c465f97..6c41a3d 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -342,17 +342,26 @@ - + + INSERT INTO user_region_wallet (jwcode, wallet_id, current_permanent_gold, current_free_june, current_free_december, current_task_gold) SELECT #{jwcode}, 1, u.current_permanent_gold, u.current_free_june, u.current_free_december, u.current_task_gold