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(); }