From c779917cab5b282c88a27389ab7d1ecc76ea7454 Mon Sep 17 00:00:00 2001 From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com> Date: Sat, 10 Aug 2024 23:19:02 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E5=A2=9E=E5=8A=A0=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/pay/domain/OrderPayCustomer.java | 13 +++++ .../pay/domain/req/OrderCustomerUpdReq.java | 50 +++++++++++++++++++ .../OrderPayCustomerController.java | 48 +++++++++++++++++- 3 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/OrderCustomerUpdReq.java diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java index 84e6b0e..463891c 100644 --- a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java @@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.cloud.pay.domain.req.OrderCustomerAddReq; +import com.muyu.cloud.pay.domain.req.OrderCustomerUpdReq; import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; +import java.util.function.Supplier; + /** * @Author：yang * @Package：com.muyu.cloud.pay.domain @@ -57,4 +60,14 @@ public class OrderPayCustomer extends BaseEntity { .build(); } + public static OrderPayCustomer updBuild(OrderCustomerUpdReq req, Supplier idSupplier){ + return OrderPayCustomer.builder() + .id(idSupplier.get()) + .appName(req.getAppName()) + .appDesc(req.getAppDesc()) + .status(req.getStatus()) + .remark(req.getRemark()) + .build(); + } + } diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/OrderCustomerUpdReq.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/OrderCustomerUpdReq.java new file mode 100644 index 0000000..753e436 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/OrderCustomerUpdReq.java @@ -0,0 +1,50 @@ +package com.muyu.cloud.pay.domain.req; + +import com.muyu.common.core.validation.custom.IsSystemYesNo; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author：yang + * @Package：com.muyu.cloud.pay.domain.req + * @Project：cloud-pay + * @name：OrderCustomerUpdReq + * @Date：2024/8/10 22:54 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class OrderCustomerUpdReq { + /** + * 服务/客户名称 + */ + @NotEmpty(message = "服务客户不可为空") + @Schema(title = "服务/客户名称",type = "String",defaultValue = "会员服务", + description = "客户名称一般为微服务的中文名称，方便给客户进行使用",requiredProperties = {"appName"}) + private String appName; + /** + *客户描述 + */ + @Schema(title = "服务/客户描述",type = "String") + private String appDesc; + /** + *状态 + */ + @NotBlank(message = "客户可用状态不可为空") + @IsSystemYesNo + @Schema(title = "服务/客户开通状态",type = "String",defaultValue = "Y", + description = "状态为Y和N，如果为Y则客户可以使用支付接口，若为N则客户不可以使用支付类接口") + + private String status; + /** + *客户备注 + */ + @Schema(title = "服务/客户备注",type = "String") + private String remark; +} 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 55dbe12..75f9f7d 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 @@ -4,6 +4,7 @@ import com.dtflys.forest.springboot.annotation.ForestScannerRegister; import com.muyu.cloud.pay.domain.OrderPayCustomer; import com.muyu.cloud.pay.domain.req.CustomerListReq; import com.muyu.cloud.pay.domain.req.OrderCustomerAddReq; +import com.muyu.cloud.pay.domain.req.OrderCustomerUpdReq; import com.muyu.cloud.pay.domain.resp.CustomerResp; import com.muyu.cloud.pay.service.OrderPayCustomerService; import com.muyu.common.core.domain.Result; @@ -70,10 +71,55 @@ public class OrderPayCustomerController { orderPayCustomerService.getCustomerAllList() ); } + + /** + * 添加方法 + * @param orderCustomerAddReq + * @return + */ @PostMapping @Operation(summary = "客户信息添加",description = "添加支付平台客户信息，添加成功之后才可以使用支付类的产品") public Result save(@Validated @RequestBody OrderCustomerAddReq orderCustomerAddReq){ orderPayCustomerService.save(OrderPayCustomer.addBuild(orderCustomerAddReq)); - return Result.success(); + return Result.success(null,"操作成功"); + } + + + /** + * 修改客户 + * @param orderCustomerUpdReq 修改客户请求信息 + * @return 修改结果 + */ + @PutMapping("/{orderCustomerId}") + @Operation(summary = "客户信息修改",description = "通过ID修改客户信息") + public Result update( + @Schema(title = "客户ID",type = "Long",defaultValue = "1",description = "修改客户信息需要依据的唯一条件") + @PathVariable("orderCustomerId") Long orderCustomerId, + @RequestBody @Validated OrderCustomerUpdReq orderCustomerUpdReq){ + orderPayCustomerService.updateById(OrderPayCustomer.updBuild(orderCustomerUpdReq,()->orderCustomerId)); + return Result.success(null,"操作成功"); + } + + /** + * 删除客户 + * @param orderCustomerId 删除客户请求信息 + * @return 删除结果 + */ + @DeleteMapping("/{orderCustomerId}") + @Operation(summary = "客户信息删除",description = "通过ID删除客户信息") + public Result delete(@PathVariable("orderCustomerId") Long orderCustomerId){ + orderPayCustomerService.removeById(orderCustomerId); + return Result.success(null,"操作成功"); + } + /** + * 通过ID获取客户 + * @param orderCustomerId ID + * @return 客户信息 + */ + @DeleteMapping("/{orderCustomerId}") + @Operation(summary = "通过ID获取客户",description = "通过ID获取客户信息") + public Result findById(@PathVariable("orderCustomerId") Long orderCustomerId){ + + return Result.success(orderPayCustomerService.getById(orderCustomerId),"操作成功"); } }