From cd341b1a0179a94d7daeec0d864e6898833ada2b Mon Sep 17 00:00:00 2001 From: zhang chengzhi <3144712872@qq.com> Date: Thu, 8 Aug 2024 16:03:38 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=B7=BB=E5=8A=A0=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E5=92=8C=E5=90=AF=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/cloud/pay/MuYuPayApplication.java | 1 - .../OrderPayCustomerController.java | 30 +++++++++++++++++-- .../pay/service/OrderPayCustomerService.java | 21 +++++++++++++ .../impl/OrderPayCustomerServiceImpl.java | 19 ++++++++++++ 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/MuYuPayApplication.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/MuYuPayApplication.java index 1e3cbb4..336fc24 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/MuYuPayApplication.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/MuYuPayApplication.java @@ -1,6 +1,5 @@ package com.muyu.cloud.pay; -import com.dtflys.forest.springboot.annotation.ForestScan; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; import lombok.extern.log4j.Log4j2; diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java index bdcbaba..8041c8d 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java @@ -107,7 +107,7 @@ public Result update(@Schema(title = "客户ID",type = "Long",defaultVal */ @DeleteMapping("/{orderCustomerId}") - @Operation(summary = "客户信息删除",description = "通过ID删除客户信息") + @Operation(summary = "客户信息删除",description = "通过ID删除客户信息,七天内有支付支付记录的客户,不可进行删除") public Result delete(@PathVariable("orderCustomerId") Long orderCustomerId){ orderPayCustomerService.removeById(orderCustomerId); return Result.success(null,"操作成功"); @@ -122,12 +122,38 @@ public Result update(@Schema(title = "客户ID",type = "Long",defaultVal @GetMapping("/{orderCustomerId}") @Operation(summary = "通过ID获取客户信息",description = "通过ID获取客户信息") public Result findById(@PathVariable("orderCustomerId") Long orderCustomerId){ - + log.info(""); return Result.success(orderPayCustomerService.getById(orderCustomerId),"操作成功"); } + /** + * 通过ID禁用客户 + * @param orderCustomerId ID + * @return 禁用结果 + */ + @GetMapping("/disable/{orderCustomerId}") + @Operation(summary = "通过ID禁用客户",description = "通过ID禁用客户,禁用之后禁止调用支付相关接口") + public Result disable(@PathVariable("orderCustomerId") Long orderCustomerId){ + this.orderPayCustomerService.disable(orderCustomerId); + return Result.success(null,"操作成功"); + } + + + + /** + * 通过ID启动客户 + * @param orderCustomerId ID + * @return 启动结果 + */ + + @GetMapping("/enable/{orderCustomerId}") + @Operation(summary = "通过ID启动客户",description = "通过ID启用被禁止的客户,启用后可以调用支付相关的接口") + public Result enable(@PathVariable("orderCustomerId") Long orderCustomerId){ + this.orderPayCustomerService.enable(orderCustomerId); + return Result.success(null,"操作成功"); + } diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java index dd8cecc..ec027fa 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java @@ -34,5 +34,26 @@ public interface OrderPayCustomerService extends IService { List getCustomerAllList(); + /** + * 禁用客户 + * @param orderCustomerId + */ + + void disable(Long orderCustomerId); + /** + * 启用客户 + * @param orderCustomerId + */ + void enable(Long orderCustomerId); + + /** + * 通过客户ID设置客户状态 + * @param orderCustomerId ID + * @param status 状态 SysIsYesNo + */ + + +void settingStatus(Long orderCustomerId,String status); + } diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java index f67aa8b..d443402 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java @@ -12,6 +12,7 @@ import com.muyu.cloud.pay.mapper.OrderPayCustomerMapper; import com.muyu.cloud.pay.service.OrderPayCustomerService; import com.muyu.cloud.pay.service.OrderPayInfoService; import com.muyu.common.core.enums.SysPayType; +import com.muyu.common.core.enums.SystemYesNo; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.nacos.remote.service.NacosServerService; @@ -92,6 +93,24 @@ public class OrderPayCustomerServiceImpl extends ServiceImpl