From a7d92902c0ccd138e6910d5b6b5cbb4cc9715f60 Mon Sep 17 00:00:00 2001 From: bynt Date: Sun, 23 Apr 2023 09:52:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/baiye/util/FileUtil.java | 1 + .../ChannelResourceAssignController.java | 10 ---------- .../agent/controller/CustomManageController.java | 14 ++++++++++++++ .../service/ChannelResourceAssignService.java | 7 +------ .../modules/agent/service/CustomManageService.java | 7 +++++++ .../impl/ChannelResourceAssignServiceImpl.java | 6 +----- .../service/impl/CustomManageServiceImpl.java | 6 ++++++ .../java/com/baiye/feign/DeliveryRecordClient.java | 2 +- 8 files changed, 31 insertions(+), 22 deletions(-) diff --git a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/FileUtil.java b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/FileUtil.java index 7c7f7faf..a3967fd2 100644 --- a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/FileUtil.java +++ b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/FileUtil.java @@ -20,6 +20,7 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; import com.baiye.exception.BadRequestException; diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/ChannelResourceAssignController.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/ChannelResourceAssignController.java index 430d4238..4a301362 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/ChannelResourceAssignController.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/ChannelResourceAssignController.java @@ -1,7 +1,5 @@ package com.baiye.modules.agent.controller; -import com.baiye.annotation.Inner; -import com.baiye.annotation.Log; import com.baiye.http.CommonResponse; import com.baiye.modules.agent.entity.query.ChannelQuery; import com.baiye.modules.agent.entity.query.ResourceAssignInfoQuery; @@ -46,13 +44,5 @@ public class ChannelResourceAssignController { return channelResourceAssignService.assignNum(channelId, assignNum); } - @Log - @Inner - @ApiOperation("修改数量") - @GetMapping("/update/quantity") - public ResponseEntity updateQuantity(Long userId, Integer number) { - channelResourceAssignService.updateQuantity(userId, number); - return new ResponseEntity<>(HttpStatus.OK); - } } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/CustomManageController.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/CustomManageController.java index bfac006a..0affe312 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/CustomManageController.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/controller/CustomManageController.java @@ -1,5 +1,7 @@ package com.baiye.modules.agent.controller; +import com.baiye.annotation.Inner; +import com.baiye.annotation.Log; import com.baiye.http.CommonResponse; import com.baiye.modules.agent.entity.ChannelCustom; import com.baiye.modules.agent.entity.query.ChannelQuery; @@ -64,4 +66,16 @@ public class CustomManageController { public CommonResponse>> findCustomList(@RequestParam("customId") Long customId) { return CommonResponse.createBySuccess(customManageService.findUrlByCustomId(customId)); } + + + + @Log + @Inner + @ApiOperation("修改数量") + @GetMapping("/update/quantity") + public ResponseEntity updateQuantity(Long userId, Integer number) { + customManageService.updateQuantity(userId, number); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/ChannelResourceAssignService.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/ChannelResourceAssignService.java index 32e31391..f93cb6ab 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/ChannelResourceAssignService.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/ChannelResourceAssignService.java @@ -38,10 +38,5 @@ public interface ChannelResourceAssignService { */ CommonResponse assignNum(Long customId, Integer assignNum); - /** - * 修改数量 - * @param userId - * @param number - */ - void updateQuantity(Long userId, Integer number); + } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/CustomManageService.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/CustomManageService.java index 3e229c5f..a6aaac6b 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/CustomManageService.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/CustomManageService.java @@ -76,4 +76,11 @@ public interface CustomManageService { * @return */ ChannelCustom findCustomByUserIdAndStatus(Long userId, Integer status); + + /** + * 修改数量 + * @param userId + * @param number + */ + void updateQuantity(Long userId, Integer number); } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/ChannelResourceAssignServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/ChannelResourceAssignServiceImpl.java index 1e113766..f328db65 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/ChannelResourceAssignServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/ChannelResourceAssignServiceImpl.java @@ -57,9 +57,5 @@ public class ChannelResourceAssignServiceImpl implements ChannelResourceAssignSe return CommonResponse.createBySuccess(); } - @Override - @Transactional(rollbackFor = Exception.class) - public void updateQuantity(Long userId, Integer number) { - channelCustomRepository.updateQuantity(userId, number); - } + } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java index b78251d9..b09b7f18 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java @@ -250,4 +250,10 @@ public class CustomManageServiceImpl implements CustomManageService { } return byUserId; } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateQuantity(Long userId, Integer number) { + channelCustomRepository.updateQuantity(userId, number); + } } diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/DeliveryRecordClient.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/DeliveryRecordClient.java index 1fcfe42d..36759f1b 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/DeliveryRecordClient.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/DeliveryRecordClient.java @@ -17,7 +17,7 @@ public interface DeliveryRecordClient { String PAY_PREFIX = "/api/down/record"; - String AGENT_PREFIX = "/api/resource"; + String AGENT_PREFIX = "/api/custom"; /** * 修改兑换链接