From 7db77c5391b4cd6fafd2894e8424560b4037ee0a Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Wed, 10 Dec 2025 11:22:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?12=E6=9C=8810=E6=97=A5=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java | 3 +++ .../java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java index 39764b4..50d76dc 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java @@ -83,4 +83,7 @@ public class ConsumeUser implements Serializable { private Integer flag; //是否为员工号 @ExcelProperty("折扣金币") private BigDecimal price; // 折扣金币 + @ExcelIgnore + private Integer redMoney; //是否用红包 + } 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 5c0ad1c..263eba8 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -204,10 +204,9 @@ public class ConsumeServiceImpl implements ConsumeService { }catch (Exception e){ log.warn("消耗累加失败，主流程继续 | jwcode={}", consumeUser.getJwcode(), e); } - - + if(consumeUser.getRedMoney()==1){ redService.sendConsumeJwcode(consumeUser.getJwcode(),(consumeUser.getPrice().subtract(consumeUser.getSumGold())).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); - // } + } return Result.success(); } // From 1cb29839f9b6af2135cd6b0ccd72bf607356b02d Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 11 Dec 2025 15:08:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?12-11=20=E4=BF=AE=E5=A4=8D=E8=90=A5?= =?UTF-8?q?=E6=94=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/WorkBenchMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/WorkBenchMapper.xml b/src/main/resources/mapper/WorkBenchMapper.xml index c319ab5..649fe15 100644 --- a/src/main/resources/mapper/WorkBenchMapper.xml +++ b/src/main/resources/mapper/WorkBenchMapper.xml @@ -179,7 +179,7 @@ SUM(CASE WHEN r.id = 7 THEN cr.received_amount/100 ELSE 0 END) AS vdn, SUM(CASE WHEN r.id = 8 THEN cr.received_amount/100 ELSE 0 END) AS krw, ROUND( SUM(cr.received_amount/100 * r.num), 2) AS totalSGD - FROM cash_record cr + FROM cash_record_collection as cr JOIN market m ON cr.received_market = m.id JOIN rate r ON cr.received_currency = r.id WHERE cr.received_currency IN (2,3,4,5,6,7,8) -- 只统计这7种币