From 0aade1b7c4b43456fb61d143ecde6e680f269116 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 12 Dec 2025 15:34:47 +0800 Subject: [PATCH] =?UTF-8?q?12-12=20=E6=96=B0=E5=A2=9E=E7=8E=B0=E9=87=91?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=89=8D=E6=94=AF=E4=BB=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/domain/entity/CashRecord.java | 7 +++-- .../demo/domain/vo/cash/CashCollection.java | 6 ++-- .../serviceImpl/cash/CashAuditServiceImpl.java | 34 +++++++++++----------- .../cash/CashCollectionServiceImpl.java | 17 ++++++----- .../resources/cashMapper/CashCollectionMapper.xml | 6 ++-- 5 files changed, 39 insertions(+), 31 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 2e4a895..0a7fbf7 100644 --- a/src/main/java/com/example/demo/domain/entity/CashRecord.java +++ b/src/main/java/com/example/demo/domain/entity/CashRecord.java @@ -1,5 +1,6 @@ package com.example.demo.domain.entity; +import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; @@ -42,8 +43,10 @@ public class CashRecord implements Serializable { private String payload; //平台 // 金额信息 - private String paymentCurrency; // 付款币种 - private BigDecimal paymentAmount; // 付款金额 + private String paymentCurrencyOrig; // 原始付款币种 + private BigDecimal paymentAmountOrig; // 原始付款金额 + private String paymentCurrency; // 付款币种 转换后 + private BigDecimal paymentAmount; // 付款金额 转换后 private String receivedCurrency; // 到账币种 private BigDecimal receivedAmount; // 到账金额 private BigDecimal handlingCharge; // 手续费 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 7d06b5e..2d6b952 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,10 +59,12 @@ public class CashCollection implements Serializable { @ExcelProperty("免费金币数量") private Integer freeGold; // 免费金币数量 //金额信息 + private String paymentCurrencyOrig; // 原始付款币种 + private BigDecimal paymentAmountOrig; // 原始付款金额 @ExcelProperty("付款币种") - private String paymentCurrency; // 付款币种 + private String paymentCurrency; // 付款币种(转换后) @ExcelProperty("付款金额") - private BigDecimal paymentAmount; // 付款金额 + private BigDecimal paymentAmount; // 付款金额(转换后) @ExcelProperty("到账币种") private String receivedCurrency; // 到账币种 @ExcelProperty("到账金额") 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 0189379..c719594 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java @@ -78,13 +78,13 @@ public class CashAuditServiceImpl implements CashAuditService { int currentMonth = LocalDate.now().getMonthValue(); // 根据当前月份设置对应字段 if (currentMonth >= 1 && currentMonth <= 6) { - // 1-6月：设置6月额度，12月保持默认值 - rechargeOrder.setFreeJune(order.getFreeGold()); - rechargeOrder.setFreeDecember(0); - } else { - // 7-12月：设置12月额度，6月保持默认值 + // 1-6月：设置12月额度，6月保持默认值 rechargeOrder.setFreeJune(0); rechargeOrder.setFreeDecember(order.getFreeGold()); + } else { + // 7-12月：设置6月额度，12月保持默认值 + rechargeOrder.setFreeJune(order.getFreeGold()); + rechargeOrder.setFreeDecember(0); } rechargeOrder.setSumGold(order.getPermanentGold() + order.getFreeGold()); rechargeOrder.setRateId(Integer.valueOf(order.getPaymentCurrency())); @@ -140,13 +140,13 @@ public class CashAuditServiceImpl implements CashAuditService { int currentMonth = LocalDate.now().getMonthValue(); // 根据当前月份设置对应字段 if (currentMonth >= 1 && currentMonth <= 6) { - // 1-6月：设置6月额度，12月保持默认值 - rechargeOrder.setFreeJune(order.getFreeGold()); - rechargeOrder.setFreeDecember(0); - } else { - // 7-12月：设置12月额度，6月保持默认值 + // 1-6月：设置12月额度，6月保持默认值 rechargeOrder.setFreeJune(0); rechargeOrder.setFreeDecember(order.getFreeGold()); + } else { + // 7-12月：设置6月额度，12月保持默认值 + rechargeOrder.setFreeJune(order.getFreeGold()); + rechargeOrder.setFreeDecember(0); } rechargeOrder.setSumGold(order.getFreeGold()); rechargeOrder.setRemark(order.getRemark()); @@ -167,15 +167,15 @@ public class CashAuditServiceImpl implements CashAuditService { user.setSumConsumePermanent(BigDecimal.valueOf(0)); // 根据当前月份设置对应字段 if (currentMonth >= 1 && currentMonth <= 6) { - // 1-6月：设置6月额度，12月保持默认值 - user.setSumFreeJune(BigDecimal.valueOf(order.getFreeGold())); - user.setSumFreeJune(BigDecimal.valueOf(order.getFreeGold())); - user.setCurrentFreeDecember(BigDecimal.valueOf(0)); - } else { - // 7-12月：设置12月额度，6月保持默认值 + // 1-6月：设置12月额度，6月保持默认值 user.setSumFreeJune(BigDecimal.valueOf(0)); user.setSumFreeDecember(BigDecimal.valueOf(order.getFreeGold())); - user.setSumFreeDecember(BigDecimal.valueOf(order.getFreeGold())); + user.setCurrentFreeDecember(BigDecimal.valueOf(order.getFreeGold())); + } else { + // 7-12月：设置6月额度，12月保持默认值 + user.setSumFreeJune(BigDecimal.valueOf(order.getFreeGold())); + user.setCurrentFreeJune(BigDecimal.valueOf(order.getFreeGold())); + user.setSumFreeDecember(BigDecimal.valueOf(0)); } user.setCurrentPermanentGold(BigDecimal.valueOf(0)); user.setRechargeNum(1); //充值次数加一 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 98e177e..a1fc31e 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -29,6 +29,7 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.UUID; import java.util.stream.Collectors; @@ -84,10 +85,10 @@ public class CashCollectionServiceImpl implements CashCollectionService { throw new IllegalArgumentException("数量单位不能为空"); } } - if (cashCollection.getPaymentCurrency() == null || cashCollection.getPaymentCurrency().isEmpty()) { + if (cashCollection.getPaymentCurrencyOrig() == null || cashCollection.getPaymentCurrencyOrig().isEmpty()) { throw new IllegalArgumentException("支付币种不能为空"); } - if (cashCollection.getPaymentAmount() == null || cashCollection.getPaymentAmount().compareTo(BigDecimal.ZERO) == 0) { + if (cashCollection.getPaymentAmountOrig() == null || cashCollection.getPaymentAmountOrig().compareTo(BigDecimal.ZERO) == 0) { throw new IllegalArgumentException("支付金额不能为空"); } if (cashCollection.getPayType() == null|| cashCollection.getPayType().isEmpty()) { @@ -112,8 +113,8 @@ public class CashCollectionServiceImpl implements CashCollectionService { cashRecord.setNumUnit(cashCollection.getNumUnit()); //数量单位 cashRecord.setPermanentGold(cashCollection.getPermanentGold()); //永久金币 cashRecord.setFreeGold(cashCollection.getFreeGold()); //免费金币 - cashRecord.setPaymentCurrency(cashCollection.getPaymentCurrency()); //付款币种 - cashRecord.setPaymentAmount(cashCollection.getPaymentAmount()); //付款金额 + cashRecord.setPaymentCurrencyOrig(cashCollection.getPaymentCurrencyOrig()); //付款币种 + cashRecord.setPaymentAmountOrig(cashCollection.getPaymentAmountOrig()); //付款金额 cashRecord.setReceivedMarket(cashCollection.getReceivedMarket()); //到账地区 cashRecord.setPayType(cashCollection.getPayType()); //支付方式 cashRecord.setPayTime(cashCollection.getPayTime()); //付款时间 @@ -338,7 +339,9 @@ public class CashCollectionServiceImpl implements CashCollectionService { //补全手续费等内容 @Override public String complete(CashRecord cashRecord) { - + if (!Objects.equals(cashRecord.getPaymentCurrency(), cashRecord.getReceivedCurrency())){ + throw new IllegalArgumentException("支付币种(转换后)和到账币种不一致"); + } int rows = cashCollectionMapper.complete(cashRecord); @@ -429,7 +432,7 @@ public User getNameAndMarket(Integer jwcode) { cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(gOrder.getJwcode())); if (gOrder.getType().equals("gold")){ //充金豆 - cashRecord.setActivity("Link日常充值"); + cashRecord.setActivity("99"); cashRecord.setGoodsName("Link充值金豆"); cashRecord.setRemark("Link充值金豆"); cashRecord.setNumUnit("个"); @@ -438,7 +441,7 @@ public User getNameAndMarket(Integer jwcode) { } if (gOrder.getType().equals("gold_coin")){//充金币 - cashRecord.setActivity("Link日常充值"); + cashRecord.setActivity("98"); cashRecord.setGoodsName("Link充值金币"); cashRecord.setRemark("Link充值金币"); cashRecord.setPermanentGold(gOrder.getCount()*100); diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 8fe3aeb..c9295b6 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -8,12 +8,12 @@ insert into cash_record_collection(order_type,jwcode,name,market,activity, order_code,bank_code,goods_name,good_num,num_unit,permanent_gold,free_gold, - payment_currency,payment_amount,received_market, + payment_currency_orig,payment_amount_orig,received_market, pay_type,pay_time,status,submitter_id,submitter_market,payload, voucher,remark) values(#{orderType},#{jwcode},#{name},#{market},#{activity}, - #{orderCode},#{bankCode},#{goodsName},#{goodNum},#{numUnit},#{permanentGold},#{freeGold},#{paymentCurrency}, - #{paymentAmount},#{receivedMarket},#{payType},#{payTime}, + #{orderCode},#{bankCode},#{goodsName},#{goodNum},#{numUnit},#{permanentGold},#{freeGold},#{paymentCurrencyOrig}, + #{paymentAmountOrig},#{receivedMarket},#{payType},#{payTime}, #{status},#{submitterId},#{submitterMarket},#{payload},#{voucher},#{remark})