From 5cf14d31b118d8cfaeb68696529042e40b4f3563 Mon Sep 17 00:00:00 2001 From: jevononlie <728254585@qq.com> Date: Wed, 24 Apr 2024 17:44:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E8=AE=A2=E5=8D=95todo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/yunxi/controller/CommonController.java | 1 + .../src/main/java/cc/yunxi/domain/dto/UserDTO.java | 4 ++++ .../main/java/cc/yunxi/domain/po/RecycleOrder.java | 4 ++++ .../cc/yunxi/domain/vo/client/ClientRespVO.java | 7 +++++++ .../dzorder/DZRecycleOrderCreateVO.java | 4 ++++ .../recycleorder/shorder/RecycleOrderCreateVO.java | 6 ++++++ .../main/java/cc/yunxi/mapper/ClientMapper.java | 2 +- .../main/java/cc/yunxi/service/IClientService.java | 7 +++++++ .../cc/yunxi/service/impl/ClientServiceImpl.java | 14 ++++++++++++++ .../java/cc/yunxi/service/impl/CommonService.java | 3 +++ .../service/impl/RecycleOrderServiceImpl.java | 2 +- .../src/main/resources/mapper/ClientMapper.xml | 5 +++++ 12 files changed, 57 insertions(+), 2 deletions(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/CommonController.java b/nxhs-service/src/main/java/cc/yunxi/controller/CommonController.java index 9d04265..001ce42 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/CommonController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/CommonController.java @@ -36,6 +36,7 @@ public class CommonController { public CommonResult shLogin(@RequestBody WxLoginDTO wxLoginDTO) { // 散户端登录业务 UserDTO userDTO = commonService.loginByClient(wxLoginDTO); + return CommonResult.success(userDTO); } 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 25a1ecb..54d814b 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 @@ -1,6 +1,7 @@ package cc.yunxi.domain.dto; import cc.yunxi.enums.UserTypeEnum; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,4 +37,7 @@ public class UserDTO { @ApiModelProperty(value = "访问token", required = false) private String token; // 返回时有用 + @ApiModelProperty(value = "是否单位散户", required = false) + private String isClientUnit; + } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java index 865093d..7e71c0a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java @@ -151,6 +151,10 @@ public class RecycleOrder { @TableField("organize_json_id") private String organizeJsonId; + @ApiModelProperty("订单的散户类型，1非单位订单，2单位订单") + @TableField("client_type") + private Integer clientType; + // @ApiModelProperty("综合评分") // @TableField("star_score") // private Integer starScore; diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientRespVO.java index ab83583..fcf457a 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientRespVO.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/client/ClientRespVO.java @@ -1,5 +1,6 @@ package cc.yunxi.domain.vo.client; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -81,4 +82,10 @@ public class ClientRespVO { @ApiModelProperty("创建时间") private LocalDateTime creatorTime; + @ApiModelProperty("是否有单位(0-无单位，1-有单位)") + private Integer clientType; + + @ApiModelProperty("所属单位名称") + private String clientUnitName; + } 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 a1443ee..c19fe5d 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 @@ -2,6 +2,7 @@ package cc.yunxi.domain.vo.recycleorder.dzorder; import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailSaveVO; import cc.yunxi.domain.vo.recycleorderdetail.RecycleOrderDetailUpdateVO; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,6 +24,9 @@ public class DZRecycleOrderCreateVO { @Valid private List orderDetails; + @ApiModelProperty(value = "订单的散户类型，1非单位，2单位订单", required = true, example = "1") + private String clientType; + @ApiModelProperty(value = "订单备注", required = false, example = "请尽快上门") private String remark; 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 e894f6d..f3dc867 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,4 +62,10 @@ public class RecycleOrderCreateVO { @Valid private List orderDetails; + @ApiModelProperty(value = "单位订单", required = true) + @NotNull(message = "是否单位订单") + @Valid + private Integer clientType; + + } diff --git a/nxhs-service/src/main/java/cc/yunxi/mapper/ClientMapper.java b/nxhs-service/src/main/java/cc/yunxi/mapper/ClientMapper.java index 9e9e026..1b829ea 100644 --- a/nxhs-service/src/main/java/cc/yunxi/mapper/ClientMapper.java +++ b/nxhs-service/src/main/java/cc/yunxi/mapper/ClientMapper.java @@ -14,5 +14,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ClientMapper extends BaseMapper { - + String isClientUnit(String phoneNumber); } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java b/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java index d03ff12..7b3976b 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java @@ -69,6 +69,13 @@ public interface IClientService extends IService { */ Client registerClient(String phoneNumber, String openId); + /** + * 根据手机号注册散户信息 + * @param phoneNumber + * @param openId + * @return Client + */ + String isClientUnit(String phoneNumber); /** * 更新散户信息 diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java index 929cbae..e841114 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java @@ -79,6 +79,10 @@ public class ClientServiceImpl extends ServiceImpl impleme @Resource private WxPayV3Properties wxPayV3Properties; + @Resource + private ClientMapper clientMapper; + + private String serialNo; private final static int OK = 200; @@ -148,6 +152,16 @@ public class ClientServiceImpl extends ServiceImpl impleme return client; } + @Override + public String isClientUnit(String phoneNumber) { + String id = clientMapper.isClientUnit(phoneNumber); + if (id == null) { + return "n"; + } else { + return "y"; + } + } + @Override @Transactional 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 ad18317..5a4fa1e 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 @@ -130,6 +130,9 @@ public class CommonService implements ICommonService { userDTO.setUserType(UserTypeEnum.CLIENT); userDTO.setUsername(client.getNickName()); userDTO.setToken(this.createToken(userDTO)); + +// userDTO.setIsClientUnit( clientService.isClientUnit(userDTO.getPhone())); + return userDTO; } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java index a0ddf11..dfb44c6 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java @@ -377,7 +377,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl 0) { // 大于0.2km + if (distance.compareTo(new BigDecimal("0.3")) > 0) { // 大于0.3km throw new BusinessLogicException("未到达!"); } recycleOrder = BeanUtils.copyBean(orderReachVO, RecycleOrder.class); diff --git a/nxhs-service/src/main/resources/mapper/ClientMapper.xml b/nxhs-service/src/main/resources/mapper/ClientMapper.xml index 807c4a4..9e1eb86 100644 --- a/nxhs-service/src/main/resources/mapper/ClientMapper.xml +++ b/nxhs-service/src/main/resources/mapper/ClientMapper.xml @@ -2,4 +2,9 @@ + + +