From fe9a40493ec296ae33c77f686e7ba7ad876f9e2a Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 6 Mar 2025 14:18:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/service/order/dto/VipRefundDTO.java | 3 ++- .../com/czg/service/order/service/impl/PayServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipRefundDTO.java b/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipRefundDTO.java index 1a11942b3..72f486b8b 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipRefundDTO.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipRefundDTO.java @@ -3,6 +3,7 @@ package com.czg.service.order.dto; import jakarta.validation.constraints.NotNull; import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; /** @@ -10,7 +11,7 @@ import java.math.BigDecimal; * @description */ @Data -public class VipRefundDTO { +public class VipRefundDTO implements Serializable { /** * 店铺id */ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 93d796b44..4b3194937 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -405,10 +405,10 @@ public class PayServiceImpl implements PayService { Map resultMap = new HashMap<>(5); ShopUser shopUser = shopUserService.getShopUserInfo(payParam.getShopId(), payParam.getUserId()); AssertUtil.isNull(shopUser, "该店铺用户不存在"); - ShopUserFlow inFlow = userFlowService.queryChain().select(ShopUserFlow::getAmount) + ShopUserFlow inFlow = userFlowService.queryChain().select(ShopUserFlow::getAmount, ShopUserFlow::getRefundAmount) .eq(ShopUserFlow::getId, payParam.getFlowId()).one(); AssertUtil.isNull(inFlow, "充值记录不存在"); - ShopUserFlow giftFlow = userFlowService.queryChain().select(ShopUserFlow::getAmount) + ShopUserFlow giftFlow = userFlowService.queryChain().select(ShopUserFlow::getAmount, ShopUserFlow::getRefundAmount) .eq(ShopUserFlow::getRelationId, payParam.getFlowId()) .eq(ShopUserFlow::getBizCode, ShopUserFlowBizEnum.AWARD_IN.getCode()) .one();