zoujiajian 8 달 전
부모
커밋
6957aa672a
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

+ 2 - 2
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -2581,8 +2581,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 			//12月买的 退200余额
 			refundBalance = refundBalance.add(BigDecimal.valueOf(20000));
 		}
-		//超过订单金额 计算剩余的余额
-		if (refundMoney.add(refundBalance).compareTo(orderTotalMoney) > 0) {
+		//超过订单金额 计算剩余的余额 排除兑换码
+		if (orderTotalMoney.compareTo(BigDecimal.ZERO) > 0 && refundMoney.add(refundBalance).compareTo(orderTotalMoney) > 0) {
 			refundBalance = orderTotalMoney.subtract(refundMoney);
 		}
 		orderRefundDto.setRefundMoney(refundMoney);