From 36ae58706f46df41a94342dd172c28cbe3613b58 Mon Sep 17 00:00:00 2001 From: jevononlie <728254585@qq.com> Date: Tue, 30 Apr 2024 14:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=95=A3=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cc/yunxi/domain/dto/UserDTO.java | 9 +++++++++ .../src/main/java/cc/yunxi/domain/po/Client.java | 9 +++++++++ .../yunxi/domain/vo/recycleorder/RecycleOrderRespVO.java | 4 +++- .../vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java | 3 ++- .../vo/recycleorder/dzorder/DZRecycleOrderRespVO.java | 3 +++ .../vo/recycleorder/shorder/RecycleOrderCancelVO.java | 3 +++ .../vo/recycleorder/shorder/RecycleOrderCreateVO.java | 6 ++---- .../vo/recycleorder/shorder/RecycleOrderFinishVO.java | 3 +++ .../vo/recycleorder/shorder/RecycleOrderReachVO.java | 4 ++++ .../vo/recycleorder/shorder/RecycleOrderTakingVO.java | 3 +++ .../vo/recycleorder/shorder/RecycleOrderUpdateVO.java | 3 +++ .../vo/recycleorder/shorder/SHRecycleOrderRespVO.java | 3 +++ .../main/java/cc/yunxi/service/impl/CommonService.java | 6 +++++- 13 files changed, 52 insertions(+), 7 deletions(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java b/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java index 69468e0..ea4972d 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/dto/UserDTO.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.time.LocalDateTime; + /** * 用户信息 DTO */ @@ -43,4 +45,11 @@ public class UserDTO { @ApiModelProperty(value = "是否单位散户", required = false) private String isClientUnit; + + + @ApiModelProperty("散户类型，单位散户") + private LocalDateTime clientType; + + @ApiModelProperty("所属单位名称") + private LocalDateTime clientUnitName; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/Client.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/Client.java index b770629..fb0a876 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/Client.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/Client.java @@ -114,4 +114,13 @@ public class Client { @TableField("f_last_modify_time") private LocalDateTime updateTime; + + @ApiModelProperty("散户类型，单位散户") + @TableField("client_type") + private LocalDateTime clientType; + + @ApiModelProperty("所属单位名称") + @TableField("client_unit_name") + private LocalDateTime clientUnitName; + } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderRespVO.java index 4a42b21..406f466 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderRespVO.java @@ -67,5 +67,7 @@ public class RecycleOrderRespVO { @ApiModelProperty("备注") protected String remark; - + + @ApiModelProperty("单位订单") + private Integer clientType; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java index c19fe5d..79b6c27 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderCreateVO.java @@ -24,7 +24,7 @@ public class DZRecycleOrderCreateVO { @Valid private List orderDetails; - @ApiModelProperty(value = "订单的散户类型，1非单位，2单位订单", required = true, example = "1") + @ApiModelProperty(value = "订单的散户类型，1非单位，2单位订单", required = false) private String clientType; @ApiModelProperty(value = "订单备注", required = false, example = "请尽快上门") @@ -33,4 +33,5 @@ public class DZRecycleOrderCreateVO { @ApiModelProperty(value = "回收员id", hidden = true, example = "17802164218") private String recyclerId; + } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderRespVO.java index 5676b23..1b0ca32 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/dzorder/DZRecycleOrderRespVO.java @@ -24,4 +24,7 @@ public class DZRecycleOrderRespVO extends RecycleOrderRespVO { @ApiModelProperty("订单明细详情") private List orderDetails; + @ApiModelProperty("单位订单") + private Integer clientType; + } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCancelVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCancelVO.java index 9fb3bf7..d7c0e87 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCancelVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCancelVO.java @@ -17,4 +17,7 @@ public class RecycleOrderCancelVO { @ApiModelProperty(value = "散户id", hidden = true, example = "533242995646951684") private String clientId; + + @ApiModelProperty(value = "单位订单", required = false) + private Integer clientType; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java index 85d6062..5d3016c 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java @@ -62,10 +62,8 @@ public class RecycleOrderCreateVO { @Valid private List orderDetails; -// @ApiModelProperty(value = "单位订单", required = true) -// @NotNull(message = "是否单位订单") -// @Valid -// private Integer clientType; + @ApiModelProperty(value = "单位订单", required = false) + private Integer clientType; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderFinishVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderFinishVO.java index 913a0bd..735cb4d 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderFinishVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderFinishVO.java @@ -27,4 +27,7 @@ public class RecycleOrderFinishVO { @NotNull(message = "订单明细未提交") @Valid private List orderDetails; + + @ApiModelProperty(value = "单位订单", required = false) + private Integer clientType; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderReachVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderReachVO.java index d7266c8..890b643 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderReachVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderReachVO.java @@ -24,4 +24,8 @@ public class RecycleOrderReachVO { @NotNull(message = "位置定位信息未授权") @Valid private LocationDTO location; + + + @ApiModelProperty(value = "单位订单", required = false) + private Integer clientType; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderTakingVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderTakingVO.java index 4241b8a..e0491ff 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderTakingVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderTakingVO.java @@ -17,4 +17,7 @@ public class RecycleOrderTakingVO { @ApiModelProperty(value = "回收员id", hidden = true, example = "533242995646951684") private String staffsId; + + @ApiModelProperty(value = "单位订单", required = false) + private Integer clientType; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderUpdateVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderUpdateVO.java index 21b3358..59a788b 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderUpdateVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderUpdateVO.java @@ -34,4 +34,7 @@ public class RecycleOrderUpdateVO { @ApiModelProperty(value = "备注", required = false, example = "请尽快上门") private String remark; + @ApiModelProperty(value = "单位订单", required = false) + private Integer clientType; + } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/SHRecycleOrderRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/SHRecycleOrderRespVO.java index d4d2dc1..411f61c 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/SHRecycleOrderRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/SHRecycleOrderRespVO.java @@ -68,6 +68,9 @@ public class SHRecycleOrderRespVO extends RecycleOrderRespVO { @ApiModelProperty("订单明细详情") private List orderDetails; + @ApiModelProperty(value = "单位订单", required = false) + private Integer clientType; + // @ApiModelProperty("综合评分") // private Integer starScore; diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java index 3a6075e..02c7d6c 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/CommonService.java @@ -24,12 +24,14 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import io.swagger.annotations.ApiModelProperty; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.Date; /** @@ -161,7 +163,9 @@ public class CommonService implements ICommonService { userDTO.setUsername(client.getNickName()); userDTO.setToken(this.createToken(userDTO)); -// userDTO.setIsClientUnit( clientService.isClientUnit(userDTO.getPhone())); + userDTO.setClientType(client.getClientType()); + userDTO.setClientUnitName(client.getClientUnitName()); + return userDTO; }