diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java index 1766e1b..6288f39 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.playlet.common.core.domain.Result; import com.playlet.system.domain.PlayletUserAccount; import com.playlet.web.service.app.PlayletUserAccountAppService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +21,7 @@ import java.util.List; */ @Controller @RequestMapping("/app/account") +@Api(tags = "短剧*用户提现账户") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PlayletUserAccountAppController { diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java index a045663..2f8c558 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java @@ -51,7 +51,6 @@ public class PlayletItemController extends BaseController { @RequiresPermissions("system:item:list") @PostMapping("/list") @ResponseBody - @ApiOperation(value = "查询短剧基础列表") public TableDataInfo list(PlayletItem playletItem) { startPage(); @@ -66,7 +65,6 @@ public class PlayletItemController extends BaseController { @Log(title = "短剧基础", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - @ApiOperation(value = "导出短剧基础列表") public AjaxResult export(PlayletItem playletItem) { List list = playletItemService.selectPlayletItemList(playletItem); @@ -90,7 +88,6 @@ public class PlayletItemController extends BaseController { @Log(title = "短剧基础", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - @ApiOperation(value = "新增保存短剧基础") public AjaxResult addSave(PlayletItem playletItem) { return toAjax(playletItemService.insertPlayletItem(playletItem)); @@ -101,7 +98,6 @@ public class PlayletItemController extends BaseController { */ @RequiresPermissions("system:item:edit") @GetMapping("/edit/{id}") - @ApiOperation(value = "修改短剧基础") public String edit(@PathVariable("id") Long id, ModelMap mmap) { PlayletItem playletItem = playletItemService.selectPlayletItemById(id); @@ -116,7 +112,6 @@ public class PlayletItemController extends BaseController { @Log(title = "短剧基础", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - @ApiOperation(value = "修改保存短剧基础") public AjaxResult editSave(PlayletItem playletItem) { return toAjax(playletItemService.updatePlayletItem(playletItem)); @@ -129,7 +124,6 @@ public class PlayletItemController extends BaseController { @Log(title = "短剧基础", businessType = BusinessType.DELETE) @PostMapping( "/remove") @ResponseBody - @ApiOperation(value = "删除短剧基础") public AjaxResult remove(String ids) { return toAjax(playletItemService.deletePlayletItemByIds(ids)); diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletRevenueRecordController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletRevenueRecordController.java index e0e1cdb..a572b2a 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletRevenueRecordController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletRevenueRecordController.java @@ -47,7 +47,6 @@ public class PlayletRevenueRecordController extends BaseController { @RequiresPermissions("system:record:list") @PostMapping("/list") @ResponseBody - @ApiOperation(value = "查询短剧任务收益列表") public TableDataInfo list(PlayletRevenueRecord playletRevenueRecord) { startPage(); List list = playletRevenueRecordService.selectPlayletRevenueRecordList(playletRevenueRecord); @@ -61,7 +60,6 @@ public class PlayletRevenueRecordController extends BaseController { @Log(title = "短剧任务收益", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - @ApiOperation(value = "导出短剧任务收益列表") public AjaxResult export(PlayletRevenueRecord playletRevenueRecord) { List list = playletRevenueRecordService.selectPlayletRevenueRecordList(playletRevenueRecord); ExcelUtil util = new ExcelUtil(PlayletRevenueRecord.class); @@ -83,7 +81,6 @@ public class PlayletRevenueRecordController extends BaseController { @Log(title = "短剧任务收益", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - @ApiOperation(value = "新增保存短剧任务收益") public AjaxResult addSave(PlayletRevenueRecord playletRevenueRecord) { return toAjax(playletRevenueRecordService.insertPlayletRevenueRecord(playletRevenueRecord)); } @@ -93,7 +90,6 @@ public class PlayletRevenueRecordController extends BaseController { */ @RequiresPermissions("system:record:edit") @GetMapping("/edit/{id}") - @ApiOperation(value = "修改短剧任务收益") public String edit(@PathVariable("id") Long id, ModelMap mmap) { PlayletRevenueRecord playletRevenueRecord = playletRevenueRecordService.selectPlayletRevenueRecordById(id); mmap.put("playletRevenueRecord", playletRevenueRecord); @@ -107,7 +103,6 @@ public class PlayletRevenueRecordController extends BaseController { @Log(title = "短剧任务收益", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - @ApiOperation(value = "修改保存短剧任务收益") public AjaxResult editSave(PlayletRevenueRecord playletRevenueRecord) { return toAjax(playletRevenueRecordService.updatePlayletRevenueRecord(playletRevenueRecord)); } @@ -119,26 +114,22 @@ public class PlayletRevenueRecordController extends BaseController { @Log(title = "短剧任务收益", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - @ApiOperation(value = "删除短剧任务收益") public AjaxResult remove(String ids) { return toAjax(playletRevenueRecordService.deletePlayletRevenueRecordByIds(ids)); } - @ApiOperation(value = "根据时间统计任务收益") @ResponseBody @PostMapping("/statisticsTime") public Result statisticsTime(@RequestBody PlayletRevenueRecord playletRevenueRecord) { return Result.success(playletRevenueRecordService.statisticsTime(playletRevenueRecord)); } - @ApiOperation(value = "统计任务总收益") @ResponseBody @PostMapping("/statistics") public Result statistics(@RequestBody PlayletRevenueRecord playletRevenueRecord) { return Result.success(playletRevenueRecordService.statistics(playletRevenueRecord)); } - @ApiOperation(value = "根据时间/类型统计任务收益") @ResponseBody @PostMapping("/statisticsTimeType") public Result> statisticsTimeType(@RequestBody PlayletRevenueRecord playletRevenueRecord) { diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java index 1e1c41d..c455f83 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java @@ -46,7 +46,6 @@ public class PlayletTaskController extends BaseController { @RequiresPermissions("system:task:list") @PostMapping("/list") @ResponseBody - @ApiOperation(value = "查询任务列表") public TableDataInfo list(PlayletTask playletTask) { startPage(); List list = playletTaskService.selectPlayletTaskList(playletTask); @@ -60,7 +59,6 @@ public class PlayletTaskController extends BaseController { @Log(title = "任务", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - @ApiOperation(value = "导出任务列表") public AjaxResult export(PlayletTask playletTask) { List list = playletTaskService.selectPlayletTaskList(playletTask); ExcelUtil util = new ExcelUtil(PlayletTask.class); @@ -82,7 +80,6 @@ public class PlayletTaskController extends BaseController { @Log(title = "任务", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - @ApiOperation(value = "新增保存任务") public AjaxResult addSave(PlayletTask playletTask) { return toAjax(playletTaskService.insertPlayletTask(playletTask)); } @@ -92,7 +89,6 @@ public class PlayletTaskController extends BaseController { */ @RequiresPermissions("system:task:edit") @GetMapping("/edit/{id}") - @ApiOperation(value = "修改任务") public String edit(@PathVariable("id") Long id, ModelMap mmap) { PlayletTask playletTask = playletTaskService.selectPlayletTaskById(id); mmap.put("playletTask", playletTask); @@ -106,7 +102,6 @@ public class PlayletTaskController extends BaseController { @Log(title = "任务", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - @ApiOperation(value = "修改保存任务") public AjaxResult editSave(PlayletTask playletTask) { return toAjax(playletTaskService.updatePlayletTask(playletTask)); } @@ -118,7 +113,6 @@ public class PlayletTaskController extends BaseController { @Log(title = "任务", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - @ApiOperation(value = "删除任务") public AjaxResult remove(String ids) { return toAjax(playletTaskService.deletePlayletTaskByIds(ids)); } diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserAccountController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserAccountController.java index 8051acd..676400d 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserAccountController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserAccountController.java @@ -48,7 +48,6 @@ public class PlayletUserAccountController extends BaseController { @RequiresPermissions("system:account:list") @PostMapping("/list") @ResponseBody - @ApiOperation(value = "查询短剧用户提现账户列表") public TableDataInfo list(PlayletUserAccount playletUserAccount) { startPage(); List list = playletUserAccountService.selectPlayletUserAccountList(playletUserAccount); @@ -62,7 +61,6 @@ public class PlayletUserAccountController extends BaseController { @Log(title = "短剧用户提现账户", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - @ApiOperation(value = "导出短剧用户提现账户列表") public AjaxResult export(PlayletUserAccount playletUserAccount) { List list = playletUserAccountService.selectPlayletUserAccountList(playletUserAccount); ExcelUtil util = new ExcelUtil(PlayletUserAccount.class); @@ -84,7 +82,6 @@ public class PlayletUserAccountController extends BaseController { @Log(title = "短剧用户提现账户", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - @ApiOperation(value = "新增保存短剧用户提现账户") public AjaxResult addSave(PlayletUserAccount playletUserAccount) { return toAjax(playletUserAccountService.insertPlayletUserAccount(playletUserAccount)); } @@ -94,7 +91,6 @@ public class PlayletUserAccountController extends BaseController { */ @RequiresPermissions("system:account:edit") @GetMapping("/edit/{id}") - @ApiOperation(value = "修改短剧用户提现账户") public String edit(@PathVariable("id") Long id, ModelMap mmap) { PlayletUserAccount playletUserAccount = playletUserAccountService.selectPlayletUserAccountById(id); mmap.put("playletUserAccount", playletUserAccount); @@ -108,7 +104,6 @@ public class PlayletUserAccountController extends BaseController { @Log(title = "短剧用户提现账户", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - @ApiOperation(value = "修改保存短剧用户提现账户") public AjaxResult editSave(PlayletUserAccount playletUserAccount) { return toAjax(playletUserAccountService.updatePlayletUserAccount(playletUserAccount)); } @@ -120,7 +115,6 @@ public class PlayletUserAccountController extends BaseController { @Log(title = "短剧用户提现账户", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - @ApiOperation(value = "删除短剧用户提现账户") public AjaxResult remove(String ids) { return toAjax(playletUserAccountService.deletePlayletUserAccountByIds(ids)); } diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserTaskController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserTaskController.java index b03efd0..435a487 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserTaskController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserTaskController.java @@ -48,7 +48,6 @@ public class PlayletUserTaskController extends BaseController { @RequiresPermissions("system:task:list") @PostMapping("/list") @ResponseBody - @ApiOperation(value = "查询短剧用户任务列表") public TableDataInfo list(PlayletUserTask playletUserTask) { startPage(); List list = playletUserTaskService.selectPlayletUserTaskList(playletUserTask); @@ -62,7 +61,6 @@ public class PlayletUserTaskController extends BaseController { @Log(title = "短剧用户任务", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - @ApiOperation(value = "导出短剧用户任务列表") public AjaxResult export(PlayletUserTask playletUserTask) { List list = playletUserTaskService.selectPlayletUserTaskList(playletUserTask); ExcelUtil util = new ExcelUtil(PlayletUserTask.class); @@ -84,7 +82,6 @@ public class PlayletUserTaskController extends BaseController { @Log(title = "短剧用户任务", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - @ApiOperation(value = "新增保存短剧用户任务") public AjaxResult addSave(PlayletUserTask playletUserTask) { return toAjax(playletUserTaskService.insertPlayletUserTask(playletUserTask)); } @@ -94,7 +91,6 @@ public class PlayletUserTaskController extends BaseController { */ @RequiresPermissions("system:task:edit") @GetMapping("/edit/{id}") - @ApiOperation(value = "修改短剧用户任务") public String edit(@PathVariable("id") Long id, ModelMap mmap) { PlayletUserTask playletUserTask = playletUserTaskService.selectPlayletUserTaskById(id); mmap.put("playletUserTask", playletUserTask); @@ -108,7 +104,6 @@ public class PlayletUserTaskController extends BaseController { @Log(title = "短剧用户任务", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - @ApiOperation(value = "修改保存短剧用户任务") public AjaxResult editSave(PlayletUserTask playletUserTask) { return toAjax(playletUserTaskService.updatePlayletUserTask(playletUserTask)); } @@ -120,7 +115,6 @@ public class PlayletUserTaskController extends BaseController { @Log(title = "短剧用户任务", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - @ApiOperation(value = "删除短剧用户任务") public AjaxResult remove(String ids) { return toAjax(playletUserTaskService.deletePlayletUserTaskByIds(ids)); } diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserWithdrawDepositRecordController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserWithdrawDepositRecordController.java index 4be3927..37c9256 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserWithdrawDepositRecordController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserWithdrawDepositRecordController.java @@ -46,7 +46,6 @@ public class PlayletUserWithdrawDepositRecordController extends BaseController { @RequiresPermissions("system:record:list") @PostMapping("/list") @ResponseBody - @ApiOperation(value = "查询用户交易记录列表") public TableDataInfo list(PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord) { startPage(); List list = playletUserWithdrawDepositRecordService.selectPlayletUserWithdrawDepositRecordList(playletUserWithdrawDepositRecord); @@ -60,7 +59,6 @@ public class PlayletUserWithdrawDepositRecordController extends BaseController { @Log(title = "用户交易记录", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - @ApiOperation(value = "导出用户交易记录列表") public AjaxResult export(PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord) { List list = playletUserWithdrawDepositRecordService.selectPlayletUserWithdrawDepositRecordList(playletUserWithdrawDepositRecord); ExcelUtil util = new ExcelUtil(PlayletUserWithdrawDepositRecord.class); @@ -82,7 +80,6 @@ public class PlayletUserWithdrawDepositRecordController extends BaseController { @Log(title = "用户交易记录", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - @ApiOperation(value = "新增保存用户交易记录") public AjaxResult addSave(PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord) { return toAjax(playletUserWithdrawDepositRecordService.insertPlayletUserWithdrawDepositRecord(playletUserWithdrawDepositRecord)); } @@ -92,7 +89,6 @@ public class PlayletUserWithdrawDepositRecordController extends BaseController { */ @RequiresPermissions("system:record:edit") @GetMapping("/edit/{id}") - @ApiOperation(value = "修改用户交易记录") public String edit(@PathVariable("id") Long id, ModelMap mmap) { PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord = playletUserWithdrawDepositRecordService.selectPlayletUserWithdrawDepositRecordById(id); mmap.put("playletUserWithdrawDepositRecord", playletUserWithdrawDepositRecord); @@ -106,7 +102,6 @@ public class PlayletUserWithdrawDepositRecordController extends BaseController { @Log(title = "用户交易记录", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - @ApiOperation(value = "修改保存用户交易记录") public AjaxResult editSave(PlayletUserWithdrawDepositRecord playletUserWithdrawDepositRecord) { return toAjax(playletUserWithdrawDepositRecordService.updatePlayletUserWithdrawDepositRecord(playletUserWithdrawDepositRecord)); } @@ -118,12 +113,10 @@ public class PlayletUserWithdrawDepositRecordController extends BaseController { @Log(title = "用户交易记录", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - @ApiOperation(value = "删除用户交易记录") public AjaxResult remove(String ids) { return toAjax(playletUserWithdrawDepositRecordService.deletePlayletUserWithdrawDepositRecordByIds(ids)); } - @ApiOperation(value = "交易回调") @ResponseBody @PostMapping("/recordCallbackUpdate") public Result recordCallbackUpdate(@RequestBody PlayletUserWithdrawDepositRecord playletUserWithdrawalPassword) { diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserWithdrawalPasswordController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserWithdrawalPasswordController.java index efab505..cf39464 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserWithdrawalPasswordController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserWithdrawalPasswordController.java @@ -45,7 +45,6 @@ public class PlayletUserWithdrawalPasswordController extends BaseController { @RequiresPermissions("system:password:list") @PostMapping("/list") @ResponseBody - @ApiOperation(value = "查询用户提现密码列表") public TableDataInfo list(PlayletUserWithdrawalPassword playletUserWithdrawalPassword) { startPage(); List list = playletUserWithdrawalPasswordService.selectPlayletUserWithdrawalPasswordList(playletUserWithdrawalPassword); @@ -59,7 +58,6 @@ public class PlayletUserWithdrawalPasswordController extends BaseController { @Log(title = "用户提现密码", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - @ApiOperation(value = "导出用户提现密码列表") public AjaxResult export(PlayletUserWithdrawalPassword playletUserWithdrawalPassword) { List list = playletUserWithdrawalPasswordService.selectPlayletUserWithdrawalPasswordList(playletUserWithdrawalPassword); ExcelUtil util = new ExcelUtil(PlayletUserWithdrawalPassword.class); @@ -81,12 +79,10 @@ public class PlayletUserWithdrawalPasswordController extends BaseController { @Log(title = "用户提现密码", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - @ApiOperation(value = "新增保存用户提现密码") public AjaxResult addSave(PlayletUserWithdrawalPassword playletUserWithdrawalPassword) { return toAjax(playletUserWithdrawalPasswordService.insertPlayletUserWithdrawalPassword(playletUserWithdrawalPassword)); } - @ApiOperation(value = "用户确认密码") @ResponseBody @PostMapping("/validatePassword") public Result statisticsTime(@RequestBody PlayletUserWithdrawalPassword playletUserWithdrawalPassword) { @@ -98,7 +94,6 @@ public class PlayletUserWithdrawalPasswordController extends BaseController { */ @RequiresPermissions("system:password:edit") @GetMapping("/edit/{id}") - @ApiOperation(value = "修改用户提现密码") public String edit(@PathVariable("id") Long id, ModelMap mmap) { PlayletUserWithdrawalPassword playletUserWithdrawalPassword = playletUserWithdrawalPasswordService.selectPlayletUserWithdrawalPasswordById(id); mmap.put("playletUserWithdrawalPassword", playletUserWithdrawalPassword); @@ -112,7 +107,6 @@ public class PlayletUserWithdrawalPasswordController extends BaseController { @Log(title = "用户提现密码", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - @ApiOperation(value = "修改保存用户提现密码") public AjaxResult editSave(PlayletUserWithdrawalPassword playletUserWithdrawalPassword) { return toAjax(playletUserWithdrawalPasswordService.updatePlayletUserWithdrawalPassword(playletUserWithdrawalPassword)); } @@ -124,7 +118,6 @@ public class PlayletUserWithdrawalPasswordController extends BaseController { @Log(title = "用户提现密码", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - @ApiOperation(value = "删除用户提现密码") public AjaxResult remove(String ids) { return toAjax(playletUserWithdrawalPasswordService.deletePlayletUserWithdrawalPasswordByIds(ids)); } diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletWithdrawApprovalController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletWithdrawApprovalController.java index e7b8f76..5010b87 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletWithdrawApprovalController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletWithdrawApprovalController.java @@ -47,7 +47,6 @@ public class PlayletWithdrawApprovalController extends BaseController { @RequiresPermissions("system:approval:list") @PostMapping("/list") @ResponseBody - @ApiOperation(value = "查询提现审批列表") public TableDataInfo list(PlayletWithdrawApproval playletWithdrawApproval) { startPage(); List list = playletWithdrawApprovalService.selectPlayletWithdrawApprovalList(playletWithdrawApproval); @@ -61,7 +60,6 @@ public class PlayletWithdrawApprovalController extends BaseController { @Log(title = "提现审批", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - @ApiOperation(value = "导出提现审批列表") public AjaxResult export(PlayletWithdrawApproval playletWithdrawApproval) { List list = playletWithdrawApprovalService.selectPlayletWithdrawApprovalList(playletWithdrawApproval); ExcelUtil util = new ExcelUtil(PlayletWithdrawApproval.class); @@ -83,7 +81,6 @@ public class PlayletWithdrawApprovalController extends BaseController { @Log(title = "提现审批", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - @ApiOperation(value = "新增保存提现审批") public AjaxResult addSave(PlayletWithdrawApproval playletWithdrawApproval) { return toAjax(playletWithdrawApprovalService.insertPlayletWithdrawApproval(playletWithdrawApproval)); } @@ -93,7 +90,6 @@ public class PlayletWithdrawApprovalController extends BaseController { */ @RequiresPermissions("system:approval:edit") @GetMapping("/edit/{id}") - @ApiOperation(value = "修改提现审批") public String edit(@PathVariable("id") Long id, ModelMap mmap) { PlayletWithdrawApproval playletWithdrawApproval = playletWithdrawApprovalService.selectPlayletWithdrawApprovalById(id); mmap.put("playletWithdrawApproval", playletWithdrawApproval); @@ -107,7 +103,6 @@ public class PlayletWithdrawApprovalController extends BaseController { @Log(title = "提现审批", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - @ApiOperation(value = "修改保存提现审批") public AjaxResult editSave(PlayletWithdrawApproval playletWithdrawApproval) { return toAjax(playletWithdrawApprovalService.updatePlayletWithdrawApproval(playletWithdrawApproval)); } @@ -119,7 +114,6 @@ public class PlayletWithdrawApprovalController extends BaseController { @Log(title = "提现审批", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - @ApiOperation(value = "删除提现审批") public AjaxResult remove(String ids) { return toAjax(playletWithdrawApprovalService.deletePlayletWithdrawApprovalByIds(ids)); } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletRevenueRecordAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletRevenueRecordAppServiceImpl.java index c3a227a..2a1938c 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletRevenueRecordAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletRevenueRecordAppServiceImpl.java @@ -5,10 +5,15 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.playlet.system.domain.PlayletItem; +import com.playlet.system.domain.PlayletItemType; import com.playlet.system.domain.PlayletRevenueRecord; import com.playlet.system.domain.PlayletUserTask; import com.playlet.system.pojo.vo.RevenueRecordStatisticsVO; +import com.playlet.system.service.IPlayletItemService; +import com.playlet.system.service.IPlayletItemTypeService; import com.playlet.system.service.IPlayletRevenueRecordService; +import com.playlet.system.service.IPlayletTaskService; import com.playlet.web.service.app.PlayletRevenueRecordAppService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -31,10 +36,24 @@ public class PlayletRevenueRecordAppServiceImpl implements PlayletRevenueRecordA private final IPlayletRevenueRecordService revenueRecordService; + private final IPlayletItemService playletItemService; + + private final IPlayletItemTypeService playletItemTypeService; + @Override public PageInfo getItemPage(PlayletRevenueRecord record, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum, pageSize); List revenueRecordList = revenueRecordService.selectPlayletRevenueRecordList(record); + revenueRecordList.forEach(model->{ + PlayletItem playletItem = playletItemService.selectPlayletItemById(model.getPlayletItemId()); + if(playletItem != null){ + model.setPlayletItemName(playletItem.getVideoName()); + PlayletItemType playletItemType = playletItemTypeService.selectPlayletItemTypeById(Long.valueOf(playletItem.getItemType())); + if(playletItemType != null){ + model.setPlayletItemTypeName(playletItemType.getName()); + } + } + }); return PageInfo.of(revenueRecordList); } diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java index 1193592..5d905f6 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java @@ -44,10 +44,18 @@ public class PlayletRevenueRecord extends BaseEntity { /** * 剧场id */ - @Excel(name = "剧场id") - @ApiModelProperty(value = "剧场id") + @Excel(name = "短剧id") + @ApiModelProperty(value = "短剧id") private Long playletItemId; + @TableField(exist = false) + @ApiModelProperty(value = "短剧名称") + private String playletItemName; + + @TableField(exist = false) + @ApiModelProperty(value = "短场名称") + private String playletItemTypeName; + /** * 任务Id */ @@ -118,6 +126,9 @@ public class PlayletRevenueRecord extends BaseEntity { @ApiModelProperty(value = "推送收益时间(此处为外部平台推入 建议使用时间戳后续数据转换。) 时间戳") private Date pushTime; + @ApiModelProperty(value = "到账状态, 01.待到账, 02.已到账") + private String drawStatus; + /** 剧场类型 */ @Excel(name = "剧场类型") @ApiModelProperty(value = "剧场类型") diff --git a/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml index 7b79a07..2bf6a6f 100644 --- a/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml +++ b/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml @@ -23,10 +23,11 @@ + - select id, refund_money, playlet_item_id, user_id, source_platform, earnings_type, clicks_number, clicks_number_people, recharge_money, estimate_earnings, practical_earnings, push_time, create_by, create_time, update_by, update_time, remark, item_type, task_id from playlet_revenue_record + select id, refund_money, draw_status, playlet_item_id, user_id, source_platform, earnings_type, clicks_number, clicks_number_people, recharge_money, estimate_earnings, practical_earnings, push_time, create_by, create_time, update_by, update_time, remark, item_type, task_id from playlet_revenue_record