From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActUserWalletService.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActUserWalletService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActUserWalletService.java
index d5f3ac8..26bc0ef 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActUserWalletService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActUserWalletService.java
@@ -2,9 +2,13 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActUserWalletDO;
+
+import java.math.BigDecimal;
/**
* @auther lyq
@@ -31,8 +35,23 @@
* 随手拍审核通过给用户添加收益
* @param activityType 审核通过选择的随手拍标签（1.优质 2.精良 3.普通）
* @param easyPhotoId 随手拍id
- * @param userId 审核用户id
+ * @param userId 发放用户id
+ * @param amount 发放奖励金额
*/
- void examineAddMoney(Integer activityType,Long easyPhotoId,Long userId);
+ void examineAddMoney(Integer activityType, Long easyPhotoId, Long userId, BigDecimal amount);
+
+ /**
+ * 分页查询收益结算列表
+ * @param pageWalletAdminDTO 请求参数
+ * @return 收益结算列表
+ */
+ R pageUserWalletAdmin(PageComActWalletAdminDTO pageWalletAdminDTO);
+
+ /**
+ * 用户结算收益
+ * @param settlementAdminDTO 请求参数
+ * @return 结算结果
+ */
+ R userWalletSettlementAdmin(ComActWalletSettlementAdminDTO settlementAdminDTO);
}
--
Gitblit v1.7.1