单位订单todo

nxhs-service/src/main/java/cc/yunxi/controller/CommonController.java

@@ -36,6 +36,7 @@ public class CommonController {
     public CommonResult<UserDTO> shLogin(@RequestBody WxLoginDTO wxLoginDTO) {
         // 散户端登录业务
         UserDTO userDTO = commonService.loginByClient(wxLoginDTO);
+
         return CommonResult.success(userDTO);
     }
 

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;
+
 }

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;

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;
+
 }

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<RecycleOrderDetailSaveVO> orderDetails;
 
+    @ApiModelProperty(value = "订单的散户类型，1非单位，2单位订单", required = true, example = "1")
+    private String clientType;
+
     @ApiModelProperty(value = "订单备注", required = false, example = "请尽快上门")
     private String remark;
 

nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/shorder/RecycleOrderCreateVO.java

@@ -62,4 +62,10 @@ public class RecycleOrderCreateVO {
     @Valid
     private List<RecycleOrderDetailCreateVO> orderDetails;
 
+    @ApiModelProperty(value = "单位订单", required = true)
+    @NotNull(message = "是否单位订单")
+    @Valid
+    private Integer clientType;
+
+
 }

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<Client> {
-
+    String isClientUnit(String phoneNumber);
 }

nxhs-service/src/main/java/cc/yunxi/service/IClientService.java

@@ -69,6 +69,13 @@ public interface IClientService extends IService<Client> {
      */
     Client registerClient(String phoneNumber, String openId);
 
+    /**
+     * 根据手机号注册散户信息
+     * @param phoneNumber
+     * @param openId
+     * @return Client
+     */
+    String isClientUnit(String phoneNumber);
 
     /**
      * 更新散户信息

nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java

@@ -79,6 +79,10 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> 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<ClientMapper, Client> impleme
         return client;
     }
 
+    @Override
+    public String isClientUnit(String phoneNumber) {
+        String id = clientMapper.isClientUnit(phoneNumber);
+        if (id == null) {
+            return "n";
+        } else {
+            return "y";
+        }
+    }
+
 
     @Override
     @Transactional

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;
     }
 

nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java

@@ -377,7 +377,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
         LocationDTO location = orderReachVO.getLocation();
         BigDecimal distance = CommonUtil.getDistance(recycleOrder.getLongitude(), recycleOrder.getLatitude(),
                 location.getLongitude(), location.getLatitude());
-        if (distance.compareTo(new BigDecimal("0.3")) > 0) { // 大于0.2km
+        if (distance.compareTo(new BigDecimal("0.3")) > 0) { // 大于0.3km
             throw new BusinessLogicException("未到达!");
         }
         recycleOrder = BeanUtils.copyBean(orderReachVO, RecycleOrder.class);

nxhs-service/src/main/resources/mapper/ClientMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cc.yunxi.mapper.ClientMapper">
 
+    <!-- 查询单位指定的回收垃圾散户 -->
+    <select id="isClientUnit" resultType="String">
+        SELECT id，name FROM nx_manager where mobile_phone = #{phoneNumber};
+    </select>
+
 </mapper>