From ae9c3fe71a8ab08462d14c04fa6df37c7c1feec3 Mon Sep 17 00:00:00 2001
From: chengkun <2500338766@qq.com>
Date: Tue, 12 Jul 2022 18:22:42 +0800
Subject: [PATCH] =?UTF-8?q?feature1.0.0-img:=E6=96=B0=E5=A2=9E=E8=BD=AC?=
 =?UTF-8?q?=E5=85=A5=E9=92=B1=E5=8C=85=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../img/controller/CreatorMiniController.java |  7 +++++++
 .../bnyer/img/mapper/CreatorProfitMapper.java |  8 ++++++++
 .../img/service/CreatorProfitService.java     |  7 +++++++
 .../impl/CreatorProfitServiceImpl.java        |  5 +++++
 .../bnyer/img/mapper/CreatorProfitMapper.xml  | 19 +++++++++++++++----
 5 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java
index 2087bfb..84055a2 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java
@@ -279,6 +279,13 @@ public class CreatorMiniController extends BaseController {
         return AjaxResult.success(creatorProfitService.queryFrontEndProfitAmt(params.getCreatorId(),params.getType()));
     }
 
+    //@TokenCheck
+        @ApiOperation(value="查询指定艺术家转入钱包收益详情")
+    @GetMapping(value = "/queryFrontEndAmtDetails/{id}")
+    public AjaxResult queryFrontEndAmtDetails(@PathVariable @ApiParam("收益id") Long id){
+        return AjaxResult.success(creatorProfitService.queryFrontEndAmtDetails(id));
+    }
+
     //@TokenCheck
     @ApiOperation(value="查询指定艺术家收益统计")
     @GetMapping(value = "/queryFrontProfitInfo/{creatorId}")
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java
index 0c98e38..9c58ff6 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java
@@ -171,4 +171,12 @@ public interface CreatorProfitMapper extends BaseMapper<CreatorProfit> {
      * @return -
      */
     BigDecimal queryLastDayInviteProfit(@Param("creatorId") Long creatorId);
+
+    /**
+     * 查询转入钱包收益详情
+     * @param id 收益id
+     * @return -
+     */
+    CreatorProfitEndAmtVo queryFrontEndAmtDetails(@Param("id") Long id);
+
 }
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java
index 10569fc..c566413 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java
@@ -187,4 +187,11 @@ public interface CreatorProfitService {
      * @return -
      */
     boolean checkUserCanDownload(Long userId,String platform,String appType);
+
+    /**
+     * 查询转入钱包收益详情
+     * @param id 收益id
+     * @return -
+     */
+    CreatorProfitEndAmtVo queryFrontEndAmtDetails(Long id);
 }
diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java
index 8f6541e..b0c0fc7 100644
--- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java
+++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java
@@ -379,4 +379,9 @@ public class CreatorProfitServiceImpl implements CreatorProfitService {
             return false;
         }
     }
+
+    @Override
+    public CreatorProfitEndAmtVo queryFrontEndAmtDetails(Long id) {
+        return creatorProfitMapper.queryFrontEndAmtDetails(id);
+    }
 }
diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml
index 2fbd5e9..1d02a69 100644
--- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml
+++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml
@@ -48,10 +48,10 @@
   </update>
     <select id="queryFrontPreDownloadCount" resultType="com.bnyer.img.vo.CreatorProfitDownloadCountVo">
       select
-        sum(download_num) as downloadNum,create_time as createTime
+        sum(download_num) as downloadNum,DATE_FORMAT(create_time,'%Y-%m-%d') as createTime
       from img_creator_profit
       where creator_id = #{creatorId} and status = '0' and is_show = '1' and type = '0'
-      group by create_time
+      group by DATE_FORMAT(create_time,'%Y-%m-%d')
     </select>
   <select id="queryFrontPreProfit" resultType="com.bnyer.img.vo.CreatorProfitPreVo">
     select
@@ -103,10 +103,10 @@
 
   <select id="queryFrontPreInviteCount" resultType="com.bnyer.img.vo.CreatorProfitInviteCountVo">
     select
-        sum(download_num) as inviteDownloadNum,create_time as createTime
+        sum(download_num) as inviteDownloadNum,DATE_FORMAT(create_time,'%Y-%m-%d') as createTime
     from img_creator_profit
     where creator_id = #{creatorId} and status = '0' and is_show = '1' and type = '1'
-    group by create_time
+    group by DATE_FORMAT(create_time,'%Y-%m-%d')
   </select>
 
   <select id="queryFrontInOrEndAdAmt" resultType="java.math.BigDecimal">
@@ -255,4 +255,15 @@
       where creator_id = #{creatorId} and type = '1'
       and date_format(create_time,'%Y-%m-%d') = (select date_sub(curdate(), interval 1 day) from dual)
   </select>
+
+  <select id="queryFrontEndAmtDetails" resultType="com.bnyer.img.vo.CreatorProfitEndAmtVo">
+      select
+              icp.id as id,icp.order_no as orderNo,icp.creator_id as creatorId,icp.scan_code as scanCode,
+              icp.img_id as imgId,icp.profit as profit,icp.platform as platform,icp.app_type as appType,
+              iti.img_url as url,
+              icp.type as type,icp.status as status, icp.wallet_time as walletTime
+      from img_creator_profit icp
+      left join img_tiktok_img iti on iti.id = icp.img_id
+      where icp.is_show = '1' and icp.id = #{id} and icp.status = '2'
+  </select>
 </mapper>