From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActUserWalletApi.java |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActUserWalletApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActUserWalletApi.java
index 7d450bc..75e84bb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActUserWalletApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActUserWalletApi.java
@@ -1,16 +1,20 @@
 package com.panzhihua.service_community.api;
 
-import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 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.PageComActWalletTradeAdminDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.service_community.service.ComActUserWalletService;
 import com.panzhihua.service_community.service.ComActUserWalletTradeService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @RestController
@@ -24,59 +28,65 @@
 
     /**
      * 分页查询收益结算列表
-     * @param pageWalletAdminDTO    请求参数
-     * @return  收益结算列表
+     * 
+     * @param pageWalletAdminDTO
+     *            请求参数
+     * @return 收益结算列表
      */
     @PostMapping("/page")
-    public R page(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO){
+    public R page(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO) {
         return comActUserWalletService.pageUserWalletAdmin(pageWalletAdminDTO);
     }
 
     /**
      * 用户结算收益
-     * @param settlementAdminDTO    请求参数
-     * @return  结算结果
+     * 
+     * @param settlementAdminDTO
+     *            请求参数
+     * @return 结算结果
      */
     @PostMapping("/settlement")
-    public R settlement(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO){
+    public R settlement(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO) {
         return comActUserWalletService.userWalletSettlementAdmin(settlementAdminDTO);
     }
 
     /**
      * 分页查询交易记录
      *
-     * @param pageTradeAdminDTO 请求参数
+     * @param pageTradeAdminDTO
+     *            请求参数
      * @return 交易记录列表
      */
     @PostMapping("/trade/page")
-    public R tradePage(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO){
+    public R tradePage(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO) {
         return comActUserWalletTradeService.pageUserWalletTradeAdmin(pageTradeAdminDTO);
     }
 
     /**
      * 查询用户交易记录总额
-     * @param pageTradeAdminDTO 请求参数
-     * @return  交易记录总额
+     * 
+     * @param pageTradeAdminDTO
+     *            请求参数
+     * @return 交易记录总额
      */
     @PostMapping("/trade/total")
-    public R getTradeUserTotalWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO){
+    public R getTradeUserTotalWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO) {
         return comActUserWalletTradeService.getTradeUserTotalWalletTradeAdmin(pageTradeAdminDTO);
     }
 
     @PostMapping("/trade/statistics")
-    public R getTradeUserStatisticsAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO){
+    public R getTradeUserStatisticsAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO) {
         return comActUserWalletTradeService.getTradeUserStatisticsAdmin(pageTradeAdminDTO);
     }
 
     @PostMapping("/trade/export")
-    public R getTradeUserTotalWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO){
+    public R getTradeUserTotalWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO) {
         return comActUserWalletTradeService.getTradeUserTotalWalletTradeExportAdmin(pageTradeAdminDTO);
     }
 
     @PostMapping("/trade/reward/export")
-    public R getTradeUserTotalJLWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO){
+    public R getTradeUserTotalJLWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO) {
         return comActUserWalletTradeService.getTradeUserTotalJLWalletTradeExportAdmin(pageTradeAdminDTO);
     }
-
 
 }

--
Gitblit v1.7.1