From df3afb74b38c5fac603061c3477b219259e46602 Mon Sep 17 00:00:00 2001 From: seesaw Date: Thu, 31 Oct 2024 10:29:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E9=87=91=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/member/service/amount/DeductionService.java | 5 ++--- .../module/member/service/amount/DeductionServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionService.java index 27445cc9..f5533855 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionService.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.member.service.amount; import cn.iocoder.yudao.module.member.dal.dataobject.order.DishOrderDO; import java.math.BigDecimal; -import java.util.List; public interface DeductionService { @@ -13,9 +12,9 @@ public interface DeductionService { void deduction(DishOrderDO dishOrderDO); /** - * 现金提现 + * 现金扣款 */ - void cashDraw(Long userId, BigDecimal money); + void cashDraw(Long userId, BigDecimal money,String type); /** * 微信提现 金额单位:分 diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java index 0676e6b6..92e75173 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java @@ -183,7 +183,7 @@ public class DeductionServiceImpl implements DeductionService { @Override - public void cashDraw(Long userId, BigDecimal money) { + public void cashDraw(Long userId, BigDecimal money, String type) { BigDecimal newMoney; BigDecimal wxNewMoney; @@ -211,7 +211,7 @@ public class DeductionServiceImpl implements DeductionService { cardDO.setUserId(userId); cardDO.setFlag(CardDO.MINUS); cardDO.setChangeMoney(money); - cardDO.setType(CostTypeEnum.CASH_WITHDRAW.getCode()); + cardDO.setType(type); cardDO.setWxAmount(wxNewMoney); cardDO.setGiftAmount(giftNewMoney); cardDO.setMoney(newMoney);