From a2d9bd16ac1106489572a5f7d8d70e1086d5406d Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 31 May 2020 21:19:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/xcong/excoin/modules/home/service/MemberQuickBuySaleService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/home/service/MemberQuickBuySaleService.java b/src/main/java/com/xcong/excoin/modules/home/service/MemberQuickBuySaleService.java
index 6ab4ba5..4e8327e 100644
--- a/src/main/java/com/xcong/excoin/modules/home/service/MemberQuickBuySaleService.java
+++ b/src/main/java/com/xcong/excoin/modules/home/service/MemberQuickBuySaleService.java
@@ -5,16 +5,19 @@
import com.xcong.excoin.modules.home.dto.MemberQuickBuySaleCommitDto;
import com.xcong.excoin.modules.home.dto.MemberQuickBuySaleDto;
import com.xcong.excoin.modules.home.entity.MemberQuickBuySaleEntity;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
public interface MemberQuickBuySaleService extends IService<MemberQuickBuySaleEntity> {
- public Result recharge(MemberQuickBuySaleDto memberQuickBuySaleDto);
+ public Result recharge(MemberEntity member,MemberQuickBuySaleDto memberQuickBuySaleDto);
public Result commitPay(MemberQuickBuySaleCommitDto memberQuickBuySaleCommitDto);
public Result selectById(Long id);
- public Result sell();
+ public Result selectAll(String type);
public Result cancelRecharge(Long id);
+
+ public Result sell(MemberEntity member,MemberQuickBuySaleDto memberQuickBuySaleDto);
}
--
Gitblit v1.9.1