diff --git a/src/main/java/com/example/demo/mapper/coin/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/coin/ConsumeMapper.java index 750ca02..6b34369 100644 --- a/src/main/java/com/example/demo/mapper/coin/ConsumeMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/ConsumeMapper.java @@ -3,6 +3,7 @@ package com.example.demo.mapper.coin; import com.example.demo.domain.entity.UserGoldRecord; import com.example.demo.domain.vo.coin.ConsumeUser; import com.example.demo.domain.vo.coin.Gold; +import com.example.demo.domain.vo.coin.RefundUser; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -36,7 +37,7 @@ public interface ConsumeMapper { void updateIsRefund(String orderCode); //获得订单号 - List selectOrderCodeByJwcode(UserGoldRecord userGoldRecord); + List selectOrderCodeByJwcode(RefundUser refundUser); void updateUserGold(UserGoldRecord userGoldRecord); diff --git a/src/main/java/com/example/demo/mapper/coin/RechargeMapper.java b/src/main/java/com/example/demo/mapper/coin/RechargeMapper.java index 3c07322..080bd29 100644 --- a/src/main/java/com/example/demo/mapper/coin/RechargeMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/RechargeMapper.java @@ -30,5 +30,5 @@ public interface RechargeMapper { Gold sumGold(RechargeUser rechargeUser); - List selectOrderCodeByJwcode(UserGoldRecord userGoldRecord); + List selectOrderCodeByJwcode(RefundUser refundUser); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java index 0f597f1..5ec6b47 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java @@ -174,8 +174,8 @@ public class RefundServiceImpl implements RefundService { userGoldRecord.setType((byte) 2); userGoldRecord.setAuditStatus(0); userGoldRecord.setCreateTime(new Date()); - List list1 = consumeMapper.selectOrderCodeByJwcode(userGoldRecord); - List list2 = rechargeMapper.selectOrderCodeByJwcode(userGoldRecord); + List list1 = consumeMapper.selectOrderCodeByJwcode(refundUser); + List list2 = rechargeMapper.selectOrderCodeByJwcode(refundUser); if(Objects.equals(refundUser.getRefundType(), "商品退款")){ //消费订单号校验 if (list1 == null || list1.isEmpty()) { @@ -187,7 +187,8 @@ public class RefundServiceImpl implements RefundService { } } else { return Result.error("订单重复"); - }}else{ + } + }else{ //充值订单号校验 if (list2 == null || list2.isEmpty()) { return Result.error("该用户没有该订单号");