diff --git a/src/main/java/com/example/demo/domain/vo/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/ConsumeUser.java index d2370ce..9b6f364 100644 --- a/src/main/java/com/example/demo/domain/vo/ConsumeUser.java +++ b/src/main/java/com/example/demo/domain/vo/ConsumeUser.java @@ -37,6 +37,7 @@ public class ConsumeUser implements Serializable { private String remark; // 备注 private Integer adminId; //提交人Id private String adminName; //提交人姓名 + private Integer isRefund; //是否退款 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; // 消费时间 diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java index 5b5ecc2..085a575 100644 --- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.io.Console; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -95,6 +96,7 @@ public class RefundServiceImpl implements RefundService { @Transactional @Override public Result add(RefundUser refundUser) { + System.out.println("11111111111111111111"); if (refundUser.getTaskGold() == null || refundUser.getFreeGold() == null || refundUser.getPermanentGold() == null) { return Result.error("金币不能为空"); } @@ -150,6 +152,14 @@ public class RefundServiceImpl implements RefundService { List list = consumeMapper.selectOrderCodeByJwcode(userGoldRecord.getJwcode().toString(), orderCode); if (list == null || list.isEmpty()) { return Result.error("该用户没有该订单号"); + }else if(list.size()==1){ + ConsumeUser consumeUser = list.getFirst(); + if(consumeUser.getIsRefund().equals(1)) + { + return Result.error("该订单已被退款"); + } + }else { + return Result.error("消费订单重复"); } refundMapper.add(userGoldRecord); consumeMapper.updateIsRefund(orderCode); diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index ce5134c..8263303 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -134,7 +134,8 @@