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