From b60cba10d4e8048372eebd245f32df31a0d96d6f Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Fri, 5 Dec 2025 11:02:21 +0800 Subject: [PATCH] =?UTF-8?q?12=E6=9C=885=E6=97=A5=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E7=BA=A2=E5=8C=85?= 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 | 2 ++ src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 e5f33cc..39764b4 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 @@ -81,4 +81,6 @@ public class ConsumeUser implements Serializable { private List markets; // 地区列表 @ExcelIgnore private Integer flag; //是否为员工号 + @ExcelProperty("折扣金币") + private BigDecimal price; // 折扣金币 } 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 8c2f3b1..0a4fef8 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -206,7 +206,7 @@ public class ConsumeServiceImpl implements ConsumeService { } - redService.sendJwcode(consumeUser.getJwcode()); + redService.sendConsumeJwcode(consumeUser.getJwcode(),consumeUser.getPrice().intValue()-consumeUser.getSumGold().intValue()); // } return Result.success(); }