From 461e09daf68ec04fce05a29e68c4c03ee7fd6606 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Mon, 18 Aug 2025 11:05:19 +0800 Subject: [PATCH] =?UTF-8?q?8=E6=9C=8818=E6=97=A5=E9=87=91=E8=B1=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BB=9F=E8=AE=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/mapper/bean/BeanRechargeMapper2.java | 3 ++ .../demo/mapper/pay/BeanRechargeMapper3.java | 3 ++ .../serviceImpl/bean/BeanRechargeServiceImpl.java | 51 ++----------------- .../resources/jindouMapper/BeanRechargeMapper2.xml | 52 ++++++++++++++++++++ .../resources/paymapper/BeanRechargeMapper3.xml | 57 ++++++++++++++++++++++ 5 files changed, 120 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java b/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java index 8efcef8..a2f7c18 100644 --- a/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java +++ b/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java @@ -3,6 +3,7 @@ package com.example.demo.mapper.bean; import com.example.demo.domain.vo.bean.BeanSystemRechargeInfo; +import com.example.demo.domain.vo.bean.GoldBean; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -22,4 +23,6 @@ public interface BeanRechargeMapper2 { List selectBySystem(BeanSystemRechargeInfo beanSystemRechargeInfo); List systemMarket(); + + GoldBean selectSystemSum(BeanSystemRechargeInfo beanSystemRechargeInfo); } \ No newline at end of file diff --git a/src/main/java/com/example/demo/mapper/pay/BeanRechargeMapper3.java b/src/main/java/com/example/demo/mapper/pay/BeanRechargeMapper3.java index 9038f66..20344c2 100644 --- a/src/main/java/com/example/demo/mapper/pay/BeanRechargeMapper3.java +++ b/src/main/java/com/example/demo/mapper/pay/BeanRechargeMapper3.java @@ -2,6 +2,7 @@ package com.example.demo.mapper.pay; import com.example.demo.domain.vo.bean.BeanOnlineRechargeInfo; +import com.example.demo.domain.vo.bean.GoldBean; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -21,4 +22,6 @@ public interface BeanRechargeMapper3 { List selectByOnline(BeanOnlineRechargeInfo beanOnlineRechargeInfo); List onlineMarket(); + + GoldBean selectOnlineSum(BeanOnlineRechargeInfo beanOnlineRechargeInfo); } \ No newline at end of file diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java index 1aacb33..c1122c4 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java @@ -132,31 +132,11 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { //统计系统金豆记录 @Override public GoldBean statsSystemBean(BeanSystemRechargeInfo beanSystemRechargeInfo) { - GoldBean gold = new GoldBean(); - List beanSystemRechargeInfos = beanRechargeMapper2.selectBySystem(beanSystemRechargeInfo); - - // 初始化累加器 - int permanentGoldSum = 0; - int freeGoldSum = 0; - BigDecimal moneySum = new BigDecimal("0.0"); - - // 遍历充值记录并累加金币 - for (BeanSystemRechargeInfo info : beanSystemRechargeInfos) { - // 累加永久金币 - if (info.getPermanentBean() != null) { - permanentGoldSum += info.getPermanentBean(); - } - // 累加免费金币 - if (info.getFreeBean() != null) { - freeGoldSum += info.getFreeBean(); - } - } - moneySum = new BigDecimal(permanentGoldSum).divide(new BigDecimal("50"), 2, RoundingMode.HALF_UP); - // 将累加结果设置到Gold对象 - gold.setPermanentBean(permanentGoldSum); - gold.setFreeBean(freeGoldSum); + GoldBean gold = beanRechargeMapper2.selectSystemSum(beanSystemRechargeInfo); + BigDecimal moneySum; + moneySum = new BigDecimal(gold.getPermanentBean()).divide(new BigDecimal("50"), 2, RoundingMode.HALF_UP); gold.setMoney(moneySum.doubleValue()); - gold.setBeanNum(permanentGoldSum+freeGoldSum); + gold.setBeanNum(gold.getPermanentBean()+gold.getFreeBean()); return gold; } @@ -182,28 +162,7 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { //统计线上金豆记录 @Override public GoldBean statsOnlineBean(BeanOnlineRechargeInfo beanOnlineRechargeInfo) { - GoldBean gold = new GoldBean(); - List beanOnlineRechargeInfos = beanRechargeMapper3.selectByOnline(beanOnlineRechargeInfo); - - // 初始化累加器 - int countSum = 0; - BigDecimal moneySum = new BigDecimal("0.0"); - - // 遍历充值记录并累加金币 - for (BeanOnlineRechargeInfo info : beanOnlineRechargeInfos) { - // 累加数量 - if (info.getNum() != null) { - countSum += info.getNum(); - } - // 累加金额 - if (info.getMoney() != null) { - moneySum = moneySum.add(new BigDecimal(info.getMoney().toString())); - } - } - - // 将累加结果设置到Gold对象 - gold.setBeanNum(countSum); - gold.setMoney(moneySum.doubleValue()); + GoldBean gold = beanRechargeMapper3.selectOnlineSum(beanOnlineRechargeInfo); return gold; } diff --git a/src/main/resources/jindouMapper/BeanRechargeMapper2.xml b/src/main/resources/jindouMapper/BeanRechargeMapper2.xml index 02d8982..b2c1695 100644 --- a/src/main/resources/jindouMapper/BeanRechargeMapper2.xml +++ b/src/main/resources/jindouMapper/BeanRechargeMapper2.xml @@ -61,4 +61,56 @@ + + + \ No newline at end of file diff --git a/src/main/resources/paymapper/BeanRechargeMapper3.xml b/src/main/resources/paymapper/BeanRechargeMapper3.xml index cc72ec0..abe73c8 100644 --- a/src/main/resources/paymapper/BeanRechargeMapper3.xml +++ b/src/main/resources/paymapper/BeanRechargeMapper3.xml @@ -67,4 +67,61 @@ + + \ No newline at end of file