From cab360dad23a2e27c986fe19b5b15b3ed6a3b683 Mon Sep 17 00:00:00 2001 From: 86191 <2160251938@qq.com> Date: Thu, 8 Aug 2024 21:33:43 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/pay/domain/req/CustomerListReq.java | 1 - .../pay/domain/req/OrderCustomerUpdReq.java | 2 ++ .../cloud/pay/domain/resp/CustomerResp.java | 7 ++++++- .../pay/service/OrderPayCustomerService.java | 2 +- .../impl/OrderPayCustomerServiceImpl.java | 21 ++++++++++++------- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java index fa4062a..ac71714 100644 --- a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java @@ -3,7 +3,6 @@ package com.muyu.cloud.pay.domain.req; import com.muyu.common.core.validation.IsSystemYesNo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; 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 index 4b5cec7..337bc8a 100644 --- 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 @@ -2,6 +2,7 @@ package com.muyu.cloud.pay.domain.req; import com.muyu.common.core.validation.IsSystemPayType; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; @@ -16,6 +17,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor +@Tag(name = "支付服务客户添加请求对象", description = "根据入参进行客户服务添加") public class OrderCustomerUpdReq { /** * 服务/客户名称 diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java index d0976b5..8b7032d 100644 --- a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java @@ -8,6 +8,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -43,9 +44,12 @@ public class CustomerResp { */ @Schema(description = "客户状态,同数据字典-系统是否",defaultValue = "Y",type = "String") private String status; + @Schema(description = "创建人",defaultValue = "muyu",type = "String") private String createBy; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @Schema(description = "创建时间",defaultValue = "2024-7-31",type = "Date") private Date createTime; @@ -53,6 +57,7 @@ public class CustomerResp { /** * 客户最近5条支付单 */ + @Schema(description = "客户最近五条支付记录", type = "List") private List orderPaySimpleRespList; 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 30b242d..450ebe5 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 @@ -38,5 +38,5 @@ public interface OrderPayCustomerService extends IService { * @param orderCustomerId * @param status */ - void settingStatus(Long orderCustomerId, String status); +// 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 ba09842..f9f8ed8 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 @@ -17,7 +17,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -48,8 +47,8 @@ public class OrderPayCustomerServiceImpl extends ServiceImpl orderPayCustomerList = this.list(queryWrapper); - return orderPayCustomerList.stream() + + return this.list(queryWrapper).stream() .map(orderPayCustomer -> CustomerResp.customerBuild( orderPayCustomer, () -> orderPayService.selectOrderPayByAppCodeAndLimit(orderPayCustomer.getAppCode(), 5) @@ -107,7 +106,7 @@ public class OrderPayCustomerServiceImpl extends ServiceImpl