From 239df6b32472882b4bd74fe97d9cc589c4f39baf Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 15 八月 2021 12:25:47 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletTradeServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletTradeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletTradeServiceImpl.java
index a891b80..c167f7c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletTradeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletTradeServiceImpl.java
@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActUserWalletTradeRewardExcelVO;
import com.panzhihua.service_community.dao.ComActUserWalletTradeMapper;
import com.panzhihua.service_community.model.dos.ComActUserWalletTradeDO;
import com.panzhihua.service_community.service.ComActUserWalletTradeService;
@@ -13,6 +14,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @auther lyq
@@ -94,6 +96,17 @@
}
@Override
+ public R getTradeUserTotalJLWalletTradeExportAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO){
+ List<ComActUserWalletTradeRewardExcelVO> tradeList = this.baseMapper.getTradeUserTotalJLWalletTradeExportAdmin(pageTradeAdminDTO);
+ tradeList.forEach(trade -> {
+ if(trade.getType().equals("1")){
+ trade.setType("发布随手拍");
+ }
+ });
+ return R.ok(tradeList);
+ }
+
+ @Override
public R getTradeUserStatisticsAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO){
return R.ok(this.baseMapper.getTradeUserStatisticsAdmin(pageTradeAdminDTO));
}
--
Gitblit v1.7.1