货主我的

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -73,8 +73,8 @@ auth:
     - /searchRecordsInfo/**/*
     - /saleOrder/*
     - /saleOrder/**/*
-    - /driverViewInfo/*
-    - /driverViewInfo/**/*
+    - /driverInfo/*
+    - /driverInfo/**/*
     - /appendix/*
     - /appendix/**/*
     - /noticeTask/*

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -158,6 +158,9 @@ public enum StatusEnum {
     LOADING_CONFIRM("3", "已确认", "loading_confirm"),
     LOADING_REJECTION("5", "已驳回", "loading_rejection"),
 
+    //代理货主状态
+    AUTHORIZED("5", "已授权", "authorized"),
+    AUTHORIZATION_REVOKED("7", "已撤销授权", "authorization_revoked"),
 
 
     ;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/AgentCargoOwnerInfoController.java

@@ -1,9 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.IAgentCargoOwnerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
 
 /**
  * <p>
@@ -17,5 +20,34 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/agentCargoOwnerInfo")
 public class AgentCargoOwnerInfoController {
 
+    @Autowired
+    private IAgentCargoOwnerInfoService agentCargoOwnerInfoService;
+
+    /**
+     * 代理货主列表
+     * @return
+     */
+    @GetMapping("/selectAgentCargoOwner")
+    public List<AgentCargoOwnerInfo> selectAgentCargoOwner(@RequestBody String commonId){
+        return agentCargoOwnerInfoService.selectAgentCargoOwner(commonId);
+    }
+
+    /**
+     * 更改代理货主状态
+     */
+    @PostMapping("/api/editAgentCargoOwner")
+    public String editAgentCargoOwner(@RequestBody AgentCargoOwnerInfo agentCargoOwnerInfo) {
+        return agentCargoOwnerInfoService.editAgentCargoOwner(agentCargoOwnerInfo);
+    }
+
+    /**
+     * 删除代理货主
+     * @param agentCargoOwnerInfo
+     */
+    @PostMapping("/api/deleteAgentCargoOwner")
+    public void deleteAgentCargoOwner(@RequestBody AgentCargoOwnerInfo agentCargoOwnerInfo){
+        agentCargoOwnerInfoService.deleteAgentCargoOwner(agentCargoOwnerInfo.getId());
+    }
+
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerCompInfoController.java

@@ -1,6 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerCompInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -17,5 +22,32 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/cargoOwnerCompInfo")
 public class CargoOwnerCompInfoController {
 
+    @Autowired
+    private ICargoOwnerCompInfoService cargoOwnerCompInfoService;
+
+    /**
+     * 添加所属公司
+     */
+    @PostMapping("/api/addCargoOwnerComp")
+    public String addCargoOwnerComp(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo){
+        return cargoOwnerCompInfoService.addCargoOwnerComp(cargoOwnerCompInfo);
+    }
+
+    /**
+     * 编辑所属公司
+     */
+    @PostMapping("/api/editCargoOwnerComp")
+    public String editCargoOwnerComp(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo) {
+        return cargoOwnerCompInfoService.editCargoOwnerComp(cargoOwnerCompInfo);
+    }
+
+    /**
+     * 删除所属公司
+     * @param cargoOwnerCompInfo
+     */
+    @PostMapping("/api/deleteCargoOwnerComp")
+    public void deleteCargoOwnerComp(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo){
+        cargoOwnerCompInfoService.deleteCargoOwnerComp(cargoOwnerCompInfo.getId());
+    }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerInfoController.java

@@ -1,9 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -17,5 +19,33 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/cargoOwnerInfo")
 public class CargoOwnerInfoController {
 
+    @Autowired
+    private ICargoOwnerInfoService cargoOwnerInfoService;
+
+    /**
+     * 货主认证列表
+     * @return
+     */
+    @GetMapping("/selectCargoOwner")
+    public CargoOwnerInfo selectCargoOwner(@RequestBody String commonId){
+        return cargoOwnerInfoService.selectCargoOwner(commonId);
+    }
+
+    /**
+     * 添加认证信息
+     */
+    @PostMapping("/api/addCargoOwner")
+    public String addCargoOwner(@RequestBody CargoOwnerInfo cargoOwnerInfo){
+        return cargoOwnerInfoService.addCargoOwner(cargoOwnerInfo);
+    }
+
+    /**
+     * 编辑货主个人信息
+     */
+    @PostMapping("/api/editCargoOwner")
+    public String editCargoOwner(@RequestBody CargoOwnerInfo cargoOwnerInfo) {
+        return cargoOwnerInfoService.editCargoOwner(cargoOwnerInfo);
+    }
+
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CompanyInfoController.java

@@ -1,9 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.ICompanyInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
 
 /**
  * <p>
@@ -17,5 +20,50 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/companyInfo")
 public class CompanyInfoController {
 
+    @Autowired
+    private ICompanyInfoService companyInfoService;
+
+    /**
+     * 公司列表
+     * @return
+     */
+    @GetMapping("/selectCompany")
+    public List<CompanyInfo> selectCompany(@RequestBody String commonId){
+        return companyInfoService.selectCompany(commonId);
+    }
+
+    /**
+     * 添加公司信息
+     */
+    @PostMapping("/api/addCompanyInfo")
+    public String addCompanyInfo(@RequestBody CompanyInfo companyInfo){
+        return companyInfoService.addCompanyInfo(companyInfo);
+    }
+
+    /**
+     * 编辑公司信息
+     */
+    @PostMapping("/api/editCompanyInfo")
+    public String editCompanyInfo(@RequestBody CompanyInfo companyInfo) {
+        return companyInfoService.editCompanyInfo(companyInfo);
+    }
+
+    /**
+     * 删除公司信息
+     * @param companyInfo
+     */
+    @PostMapping("/api/deleteCompany")
+    public void deleteCompany(@RequestBody CompanyInfo companyInfo){
+        companyInfoService.deleteCompany(companyInfo.getId());
+    }
+
+    /**
+     * 所有公司下拉列表
+     * @return
+     */
+    @GetMapping("/selectAllCompany")
+    public List<CompanyInfo> selectAllCompany(){
+        return companyInfoService.selectAllCompany();
+    }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverCarInfoController.java

@@ -2,9 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
-import com.yh.saas.plugin.yiliangyiyun.service.IDriverInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -58,5 +56,15 @@ public class DriverCarInfoController {
     public void deleteDriverCar(@RequestBody DriverCarInfo driverCarInfo){
         driverCarInfoService.deleteDriverCar(driverCarInfo.getId());
     }
+
+    /**
+     * 审核
+     * @param
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(@RequestBody DriverCarInfo driverCarInfo){
+        return driverCarInfoService.examine(driverCarInfo);
+    }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverInfoController.java

@@ -2,13 +2,11 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.DistinguishView;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverInfoService;
+import com.yh.saas.plugin.yiliangyiyun.util.EntityAnalyse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -25,6 +23,16 @@ public class DriverInfoController {
     @Autowired
     private IDriverInfoService driverInfoService;
 
+    /**
+     * 第一次认证
+     * @param driverPhone
+     * @return
+     */
+    @GetMapping("/firstAuthentication")
+    public DriverInfo firstAuthentication(String driverPhone){
+        return driverInfoService.firstAuthentication(driverPhone);
+    }
+
     /**
      * 添加信息
      */
@@ -50,5 +58,25 @@ public class DriverInfoController {
     public String examine(@RequestBody DriverInfo driverInfo){
         return driverInfoService.examine(driverInfo);
     }
+
+    /**
+     * 识别身份证
+     * @param personImg
+     * @return
+     */
+    @GetMapping("/personShibie")
+    public DistinguishView personShibie (String personImg){
+        return EntityAnalyse.personShibie(personImg);
+    }
+
+    /**
+     * 识别银行卡
+     * @param bankImg
+     * @return
+     */
+    @GetMapping("/bankShibie")
+    public DistinguishView bankShibie (String bankImg){
+        return EntityAnalyse.bankShibie(bankImg);
+    }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SearchRecordsInfoController.java

@@ -1,9 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.SearchRecordsInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.ISearchRecordsInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -17,5 +19,35 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/searchRecordsInfo")
 public class SearchRecordsInfoController {
 
+    @Autowired
+    private ISearchRecordsInfoService searchRecordsInfoService;
+    /**
+     * 新增搜索记录
+     * @param searchRecordsInfo
+     * @return
+     */
+    @PostMapping("/api/addInfo")
+    public String addInfo(@RequestBody SearchRecordsInfo searchRecordsInfo) {
+        return searchRecordsInfoService.addInfo(searchRecordsInfo);
+    }
+
+    /**
+     * 搜索记录列表
+     * @param searchRecordsInfo
+     * @return
+     */
+    @GetMapping("/selectSearchRecordsInfo")
+    public Page<SearchRecordsInfo> selectSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo) {
+        return searchRecordsInfoService.selectSearchRecordsInfo(searchRecordsInfo);
+
+    }
+    /**
+     * 删除搜索记录
+     * @param searchRecordsInfo
+     */
+    @PostMapping("/api/deleteSearchRecordsInfo")
+    public void deleteSearchRecordsInfo (@RequestBody SearchRecordsInfo searchRecordsInfo){
+        searchRecordsInfoService.deleteSearchRecordsInfo(searchRecordsInfo);
+    }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/AgentCargoOwnerInfo.java

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -63,11 +64,21 @@ public class AgentCargoOwnerInfo extends BaseModel<AgentCargoOwnerInfo> {
      * 状态
      */
     private String status;
+    /**
+     * 授权操作标识（1授权2驳回3撤销授权）
+     */
+    @TableField(exist = false)
+    private String grantFlag;
 
 
     @Override
     protected Serializable pkVal() {
         return this.id;
     }
+    public static class QueryFiles {
 
+        public static final String COMMON_ID = "common_id";
+
+        public static final String DELETE_FLAG = "delete_flag";
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CargoOwnerCompInfo.java

@@ -64,7 +64,7 @@ public class CargoOwnerCompInfo extends BaseModel<CargoOwnerCompInfo> {
      */
     private String advanceFreightService;
     /**
-     * 认证状态key（1审核中3已驳回5已认证）
+     * 认证状态key（1审核中3企业已驳回5已认证7未通过审核9授权已过期11企业变更授权失效）
      */
     private String statusKey;
     /**
@@ -77,5 +77,11 @@ public class CargoOwnerCompInfo extends BaseModel<CargoOwnerCompInfo> {
     protected Serializable pkVal() {
         return this.id;
     }
+    public static class QueryFiles {
+
+        public static final String COMMON_ID = "common_id";
+
+        public static final String DELETE_FLAG = "delete_flag";
+    }
 
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CargoOwnerInfo.java

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -9,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -72,10 +74,21 @@ public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
      */
     private String authenticationStatus;
 
+    @TableField(exist = false)
+    private List<CargoOwnerCompInfo> cargoOwnerCompInfoList;
+
+    @TableField(exist = false)
+    private CargoOwnerCompInfo cargoOwnerCompInfo;
+
 
     @Override
     protected Serializable pkVal() {
         return this.id;
     }
+    public static class QueryFiles {
 
+        public static final String COMMON_ID = "common_id";
+
+        public static final String DELETE_FLAG = "delete_flag";
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CommonUser.java

@@ -82,6 +82,11 @@ public class CommonUser extends BaseModel<CommonUser> {
      * 推送id
      */
     private String cid;
+    /**
+     * 司机id
+     */
+    @TableField(exist = false)
+    private String driverId;
     /**
      * 注册码
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CompanyInfo.java

@@ -3,10 +3,12 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -75,6 +77,8 @@ public class CompanyInfo extends BaseModel<CompanyInfo> {
     /**
      * 营业期限截止日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date businessTermDate;
     /**
      * 统一社会信用代码
@@ -87,6 +91,8 @@ public class CompanyInfo extends BaseModel<CompanyInfo> {
     /**
      * 场地租赁截止日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date siteLeaseDate;
     /**
      * 视频验证地址
@@ -110,5 +116,11 @@ public class CompanyInfo extends BaseModel<CompanyInfo> {
     protected Serializable pkVal() {
         return this.id;
     }
+    public static class QueryFiles {
+
+        public static final String COMMON_ID = "common_id";
+
+        public static final String DELETE_FLAG = "delete_flag";
+    }
 
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/DriverCarInfo.java

@@ -44,6 +44,30 @@ public class DriverCarInfo extends BaseModel<DriverCarInfo> {
      * 车牌号
      */
     private String carNumber;
+    /**
+     * 车牌颜色
+     */
+    private String carNumberColour;
+    /**
+     * 车辆总质量（吨）
+     */
+    private Float carTotalWeight;
+    /**
+     * 核定载质量（吨）
+     */
+    private Float carApprovedWeight;
+    /**
+     * 车长（毫米）
+     */
+    private Float carLong;
+    /**
+     * 车宽（毫米）
+     */
+    private Float carWidth;
+    /**
+     * 车高（毫米）
+     */
+    private Float carHeight;
     /**
      * 人车合影附件地址
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/DriverInfo.java

@@ -11,10 +11,12 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -68,7 +70,7 @@ public class DriverInfo extends BaseModel<DriverInfo> {
     /**
      * 身份证有效期
      */
-    private Date cardValidityDate;
+    private String cardValidityDate;
     /**
      * 司机类型(1挂车司机2非挂车司机)
      */
@@ -84,6 +86,8 @@ public class DriverInfo extends BaseModel<DriverInfo> {
     /**
      * 驾驶证有效期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date driverLicenseValidityDate;
     /**
      * 行驶证主页
@@ -93,9 +97,15 @@ public class DriverInfo extends BaseModel<DriverInfo> {
      * 行驶证副页
      */
     private String drivingLicenseBackPage;
+    /**
+     * 行驶证档案编号
+     */
+    private String drivingLicenseNumber;
     /**
      * 行驶证有效期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date drivingLicenseValidityDate;
     /**
      * 挂车行驶证主页
@@ -105,9 +115,15 @@ public class DriverInfo extends BaseModel<DriverInfo> {
      * 挂车行驶证副页
      */
     private String trailerLicenseBackPage;
+    /**
+     * 挂车行驶证档案编号
+     */
+    private String trailerLicenseNumber;
     /**
      * 挂车行驶证有效期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date trailerLicenseValidityDate;
     /**
      * 从业资格证
@@ -116,22 +132,36 @@ public class DriverInfo extends BaseModel<DriverInfo> {
     /**
      * 从业资格证有效期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date qualificationCertificateValidityDate;
     /**
-     * 运营证
+     * 道路运输证
      */
     private String operationCertificate;
     /**
-     * 运营证有效期
+     * 道路运输证号
+     */
+    private String operationCertificateNumber;
+    /**
+     * 道路运输证有效期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date operationCertificateValidityDate;
     /**
-     * 挂车运营证
+     * 挂车道路运输证
      */
     private String trailerOperationCertificate;
     /**
-     * 挂车运营证有效期
+     * 挂车道路运输证号
      */
+    private String trailerOperationCertificateNumber;
+    /**
+     * 挂车运输证有效期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date trailerOperationCertificateValidityDate;
     /**
      * 认证状态key（1审核中3未通过5已认证）
@@ -141,7 +171,10 @@ public class DriverInfo extends BaseModel<DriverInfo> {
      * 认证状态
      */
     private String authenticationStatus;
-
+    /**
+     * 第一次认证标识(1是)
+     */
+    private String firstFlag;
 
     @TableField(exist = false)
     private List<DriverCarInfo> driverCarInfoList;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SearchRecordsInfo.java

@@ -54,4 +54,13 @@ public class SearchRecordsInfo extends BaseModel<SearchRecordsInfo> {
         return this.id;
     }
 
+    public static class QueryFiles {
+
+        public static final String COMMON_ID = "common_id";
+
+        public static final String DELETE_FLAG = "delete_flag";
+
+        public static final String FUNCTION_TYPE = "function_type";
+
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -38,6 +38,8 @@ public enum YExceptionEnum {
 	TASK_WEIGHT_EXCEEDED_ERROR("ERROR-001", "超出任务重量无法操作成功！"),
 	TRANTASK_NOT_CREATED_ERROR("ERROR-002", "内勤尚未创建运输任务！"),
 	DRIVER_CAR_ERROR("ERROR005", "车牌号重复，不可添加！"),
+	COMPANY_NAME_ERROR("ERROR006", "企业名称重复，不可添加！"),
+	UNIFIED_SOCIAL_CREDIT_CODE_ERROR("ERROR007", "统一社会信用代码重复，不可添加！"),
 	;
 	@Getter
 	private String value;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IAgentCargoOwnerInfoService.java

@@ -3,6 +3,8 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 记录代理货主信息 服务类
@@ -13,4 +15,25 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface IAgentCargoOwnerInfoService extends IService<AgentCargoOwnerInfo> {
 
+    /**
+     * 代理货主列表
+     *
+     * @param commonId
+     * @return
+     */
+    List<AgentCargoOwnerInfo> selectAgentCargoOwner(String commonId);
+
+    /**
+     * 更改代理货主状态
+     * @param agentCargoOwnerInfo
+     * @return
+     */
+    String editAgentCargoOwner(AgentCargoOwnerInfo agentCargoOwnerInfo);
+
+    /**
+     * 删除代理货主
+     * @param id
+     */
+    void deleteAgentCargoOwner(String id);
 }
+

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerCompInfoService.java

@@ -13,4 +13,23 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface ICargoOwnerCompInfoService extends IService<CargoOwnerCompInfo> {
 
+    /**
+     * 添加所属公司
+     * @param cargoOwnerCompInfo
+     * @return
+     */
+    String addCargoOwnerComp(CargoOwnerCompInfo cargoOwnerCompInfo);
+
+    /**
+     * 编辑所属公司
+     * @param cargoOwnerCompInfo
+     * @return
+     */
+    String editCargoOwnerComp(CargoOwnerCompInfo cargoOwnerCompInfo);
+
+    /**
+     * 删除所属公司
+     * @param id
+     */
+    void deleteCargoOwnerComp(String id);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerInfoService.java

@@ -3,6 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
 import com.baomidou.mybatisplus.service.IService;
 
+
 /**
  * <p>
  * 货主个人信息 服务类
@@ -13,4 +14,25 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface ICargoOwnerInfoService extends IService<CargoOwnerInfo> {
 
+    /**
+     * 货主认证列表
+     *
+     * @param commonId
+     * @return
+     */
+    CargoOwnerInfo selectCargoOwner(String commonId);
+
+    /**
+     * 添加认证信息
+     * @param cargoOwnerInfo
+     * @return
+     */
+    String addCargoOwner(CargoOwnerInfo cargoOwnerInfo);
+
+    /**
+     * 编辑货主个人信息
+     * @param cargoOwnerInfo
+     * @return
+     */
+    String editCargoOwner(CargoOwnerInfo cargoOwnerInfo);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICompanyInfoService.java

@@ -3,6 +3,8 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 记录公司信息 服务类
@@ -13,4 +15,39 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface ICompanyInfoService extends IService<CompanyInfo> {
 
+    /**
+     * 公司列表
+     *
+     * @param commonId
+     * @return
+     */
+    List<CompanyInfo> selectCompany(String commonId);
+
+    /**
+     * 添加公司信息
+     * @param companyInfo
+     * @return
+     */
+    String addCompanyInfo(CompanyInfo companyInfo);
+
+    /**
+     * 编辑公司信息
+     * @param companyInfo
+     * @return
+     */
+    String editCompanyInfo(CompanyInfo companyInfo);
+
+    /**
+     * 删除公司信息
+     * @param id
+     */
+    void deleteCompany(String id);
+
+    /**
+     * 所有公司下拉列表
+     *
+     * @param
+     * @return
+     */
+    List<CompanyInfo> selectAllCompany();
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverCarInfoService.java

@@ -2,7 +2,6 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
 import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
 
 import java.util.List;
 
@@ -43,4 +42,11 @@ public interface IDriverCarInfoService extends IService<DriverCarInfo> {
      * @param id
      */
     void deleteDriverCar(String id);
+
+    /**
+     * 审核
+     * @param driverCarInfo
+     * @return
+     */
+    String examine(DriverCarInfo driverCarInfo);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverInfoService.java

@@ -13,6 +13,13 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface IDriverInfoService extends IService<DriverInfo> {
 
+    /**
+     * 第一次认证
+     * @param  driverPhone
+     * @return
+     */
+    DriverInfo firstAuthentication(String driverPhone);
+
     /**
      * 添加司机信息
      * @param driverInfo

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISearchRecordsInfoService.java

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.SearchRecordsInfo;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -13,4 +14,23 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface ISearchRecordsInfoService extends IService<SearchRecordsInfo> {
 
+    /**
+     * 新增
+     *
+     * @param searchRecordsInfo
+     */
+    String addInfo(SearchRecordsInfo searchRecordsInfo);
+
+    /**
+     * 搜索记录列表
+     * @param searchRecordsInfo
+     * @return
+     */
+    Page<SearchRecordsInfo> selectSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo);
+
+    /**
+     *删除搜索记录
+     * @param searchRecordsInfo
+     */
+    void deleteSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/AgentCargoOwnerInfoServiceImpl.java

@@ -1,10 +1,18 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.AgentCargoOwnerInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IAgentCargoOwnerInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +25,58 @@ import org.springframework.stereotype.Service;
 @Service
 public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerInfoMapper, AgentCargoOwnerInfo> implements IAgentCargoOwnerInfoService {
 
+    /**
+     *代理货主列表
+     * @param commonId
+     * @return
+     */
+    @Override
+    public List<AgentCargoOwnerInfo> selectAgentCargoOwner(String commonId) {
+        List<AgentCargoOwnerInfo> agentCargoOwnerInfoList = this.selectList(new EntityWrapper<AgentCargoOwnerInfo>()
+                .eq(AgentCargoOwnerInfo.QueryFiles.COMMON_ID, commonId)
+                .eq(AgentCargoOwnerInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        return agentCargoOwnerInfoList;
+    }
+
+    /**
+     * 更改代理货主状态
+     */
+    @Override
+    public String editAgentCargoOwner(AgentCargoOwnerInfo agentCargoOwnerInfo) {
+        //查询代理货主信息
+        AgentCargoOwnerInfo agentCargoOwnerInfo1 = this.selectById(agentCargoOwnerInfo.getId());
+        //如果信息不为空，授权
+        if (agentCargoOwnerInfo1 != null){
+            if("1".equals(agentCargoOwnerInfo1.getGrantFlag())){
+                //信息编辑,授权
+                agentCargoOwnerInfo1.setStatus(StatusEnum.AUTHORIZED.getName());
+                agentCargoOwnerInfo1.setStatusKey(StatusEnum.AUTHORIZED.getFlag());
+                this.updateById(agentCargoOwnerInfo1);
+            }else if("2".equals(agentCargoOwnerInfo1.getGrantFlag())){
+                //信息编辑,驳回
+                agentCargoOwnerInfo1.setStatus(StatusEnum.TASK_RETURN.getName());
+                agentCargoOwnerInfo1.setStatusKey(StatusEnum.TASK_RETURN.getFlag());
+                this.updateById(agentCargoOwnerInfo1);
+            }else {
+                //信息编辑,撤销授权
+                agentCargoOwnerInfo1.setStatus(StatusEnum.AUTHORIZATION_REVOKED.getName());
+                agentCargoOwnerInfo1.setStatusKey(StatusEnum.AUTHORIZATION_REVOKED.getFlag());
+                this.updateById(agentCargoOwnerInfo1);
+            }
+        }
+        return "OK";
+    }
+
+    /**
+     * 删除代理货主
+     *
+     * @param id
+     */
+    @Override
+    public void deleteAgentCargoOwner(String id) {
+        AgentCargoOwnerInfo agentCargoOwnerInfo = this.selectById(id);
+        if (agentCargoOwnerInfo != null) {
+            this.deleteById(agentCargoOwnerInfo.getId());
+        }
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerCompInfoServiceImpl.java

@@ -1,10 +1,17 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CargoOwnerCompInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerCompInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.ICompanyInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -17,4 +24,49 @@ import org.springframework.stereotype.Service;
 @Service
 public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInfoMapper, CargoOwnerCompInfo> implements ICargoOwnerCompInfoService {
 
+
+    /**
+     * 添加所属公司
+     * @param cargoOwnerCompInfo
+     * @return
+     */
+    @Override
+    public String addCargoOwnerComp(CargoOwnerCompInfo cargoOwnerCompInfo){
+        //新增主键id
+        cargoOwnerCompInfo.setId(IdGenerator.generateUUID());
+        cargoOwnerCompInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        cargoOwnerCompInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        this.insert(cargoOwnerCompInfo);
+        return "OK";
+
+    }
+
+    /**
+     * 编辑所属公司
+     */
+    @Override
+    public String editCargoOwnerComp(CargoOwnerCompInfo cargoOwnerCompInfo) {
+        CargoOwnerCompInfo cargoOwnerCompInfo1 = this.selectById(cargoOwnerCompInfo.getId());
+        if (cargoOwnerCompInfo1 != null){
+            //信息编辑
+            cargoOwnerCompInfo1.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            cargoOwnerCompInfo1.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            this.updateById(cargoOwnerCompInfo1);
+        }
+        return "OK";
+    }
+
+    /**
+     * 删除所属公司
+     *
+     * @param id
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteCargoOwnerComp(String id) {
+        CargoOwnerCompInfo cargoOwnerCompInfo = this.selectById(id);
+        if (cargoOwnerCompInfo != null) {
+            this.deleteById(cargoOwnerCompInfo.getId());
+        }
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerInfoServiceImpl.java

@@ -1,10 +1,26 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
+import com.yh.saas.plugin.yiliangyiyun.exception.YException;
+import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CargoOwnerInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IAgentCargoOwnerInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerCompInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.ICompanyInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +33,90 @@ import org.springframework.stereotype.Service;
 @Service
 public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper, CargoOwnerInfo> implements ICargoOwnerInfoService {
 
+    @Autowired
+    private ICargoOwnerCompInfoService cargoOwnerCompInfoService;
+    @Autowired
+    private ICompanyInfoService companyInfoService;
+    @Autowired
+    private IAgentCargoOwnerInfoService agentCargoOwnerInfoService;
+
+    /**
+     *货主认证列表
+     * @param commonId
+     * @return
+     */
+    @Override
+    public CargoOwnerInfo selectCargoOwner(String commonId) {
+        //根据用户id查询货主个人信息
+        CargoOwnerInfo cargoOwnerInfo = this.selectOne(new EntityWrapper<CargoOwnerInfo>()
+                .eq(CargoOwnerInfo.QueryFiles.COMMON_ID, commonId).eq(CargoOwnerInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        //根据货主个人信息查询货主所属公司信息
+        List<CargoOwnerCompInfo> cargoOwnerCompInfoList = cargoOwnerCompInfoService.selectList(new EntityWrapper<CargoOwnerCompInfo>()
+                .eq(CargoOwnerCompInfo.QueryFiles.COMMON_ID, commonId).eq(CargoOwnerCompInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        cargoOwnerInfo.setCargoOwnerCompInfoList(cargoOwnerCompInfoList);
+        return cargoOwnerInfo;
+    }
+
+    /**
+     * 添加认证信息
+     * @param cargoOwnerInfo
+     * @return
+     */
+    @Override
+    public String addCargoOwner(CargoOwnerInfo cargoOwnerInfo){
+        //根据用户id查询货主个人信息
+        CargoOwnerInfo cargoOwnerInfo1 = this.selectOne(new EntityWrapper<CargoOwnerInfo>()
+                .eq(CargoOwnerInfo.QueryFiles.COMMON_ID,cargoOwnerInfo.getCommonId()).eq(CargoOwnerInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        //如果货主信息为空，新增货主个人信息
+        if(cargoOwnerInfo1 == null){
+            //新增主键id
+            cargoOwnerInfo.setId(IdGenerator.generateUUID());
+            cargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            cargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            this.insert(cargoOwnerInfo);
+        }
+        //所属公司新增
+        CargoOwnerCompInfo cargoOwnerCompInfo = cargoOwnerInfo.getCargoOwnerCompInfo();
+        cargoOwnerCompInfo.setId(IdGenerator.generateUUID());
+        cargoOwnerCompInfo.setCargoOwnerId(cargoOwnerInfo.getId());
+        cargoOwnerCompInfo.setCommonId(cargoOwnerInfo.getCommonId());
+        cargoOwnerCompInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        cargoOwnerCompInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        cargoOwnerCompInfoService.insert(cargoOwnerCompInfo);
+        //根据公司名称和法人名称获取公司用户id
+        CompanyInfo companyInfo = companyInfoService.selectOne(new EntityWrapper<CompanyInfo>()
+                .eq("company_name",cargoOwnerCompInfo.getCompany())
+                .eq("legal_person_name",cargoOwnerCompInfo.getLegalPersonName())
+                .eq("delete_flag","0"));
+        //新增代理货主信息
+        AgentCargoOwnerInfo agentCargoOwnerInfo = new AgentCargoOwnerInfo();
+        agentCargoOwnerInfo.setId(IdGenerator.generateUUID());
+        agentCargoOwnerInfo.setCommonId(companyInfo.getCommonId());
+        agentCargoOwnerInfo.setAgentCommonId(cargoOwnerCompInfo.getCommonId());
+        agentCargoOwnerInfo.setName(cargoOwnerInfo.getName());
+        agentCargoOwnerInfo.setPhone(cargoOwnerInfo.getPhone());
+        agentCargoOwnerInfo.setCompany(cargoOwnerCompInfo.getCompany());
+        agentCargoOwnerInfo.setCertificateAddressUrl(cargoOwnerCompInfo.getCertificateAddressUrl());
+        agentCargoOwnerInfo.setStatus(StatusEnum.TO_BE_REVIEWED.getName());
+        agentCargoOwnerInfo.setStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
+        agentCargoOwnerInfoService.insert(agentCargoOwnerInfo);
+
+        return "OK";
+
+    }
+
+    /**
+     * 编辑货主个人信息
+     */
+    @Override
+    public String editCargoOwner(CargoOwnerInfo cargoOwnerInfo) {
+        CargoOwnerInfo cargoOwnerInfo1 = this.selectById(cargoOwnerInfo.getId());
+        if (cargoOwnerInfo1 != null){
+            //信息编辑
+            cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            this.updateById(cargoOwnerInfo1);
+        }
+        return "OK";
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.yh.saas.plugin.yiliangyiyun.service.IDriverInfoService;
 import org.apache.commons.collections.CollectionUtils;
 import com.winsea.svc.base.base.entity.*;
 import com.winsea.svc.base.base.exception.EnterpriseErrorCodeEnums;
@@ -103,6 +104,8 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     private INoticeTaskService noticeTaskService;
     @Autowired
     private CommonStaffMapper staffMapper;
+    @Autowired
+    private IDriverInfoService driverInfoService;
 
 
     //用来过滤权限的时候使用,当过滤的code已在其中的时候就不进行过滤;
@@ -541,6 +544,8 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
 //        if (!CollectionUtils.isEmpty(driverViewInfos)) {
 //            user.setDriverFlag("1");
 //        }
+        DriverInfo driverInfo = driverInfoService.selectOne(new EntityWrapper<DriverInfo>().eq("common_id",user.getId()));
+        user.setDriverId(driverInfo.getId());
         return user;
     }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CompanyInfoServiceImpl.java

@@ -1,10 +1,19 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
+import com.yh.saas.plugin.yiliangyiyun.exception.YException;
+import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CompanyInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ICompanyInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +26,85 @@ import org.springframework.stereotype.Service;
 @Service
 public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, CompanyInfo> implements ICompanyInfoService {
 
+    /**
+     *公司列表
+     * @param commonId
+     * @return
+     */
+    @Override
+    public List<CompanyInfo> selectCompany(String commonId) {
+        List<CompanyInfo> companyInfoList = this.selectList(new EntityWrapper<CompanyInfo>()
+                .eq(CompanyInfo.QueryFiles.COMMON_ID, commonId).eq(CompanyInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        return companyInfoList;
+    }
+
+    /**
+     * 添加公司信息
+     * @param companyInfo
+     * @return
+     */
+    @Override
+    public String addCompanyInfo(CompanyInfo companyInfo){
+        //新增主键id
+        companyInfo.setId(IdGenerator.generateUUID());
+        //判断企业名称是否重复
+        List<CompanyInfo> companyInfos = this.selectList(new EntityWrapper<CompanyInfo>()
+                .eq("company_name",companyInfo.getCompanyName())
+                .eq("delete_flag", NumberConstant.CONSTANT0));
+        if (companyInfos.size() > 0) {
+            throw new YException(YExceptionEnum.COMPANY_NAME_ERROR);
+        }
+        //判断统一社会信用代码是否重复
+        List<CompanyInfo> companyInfos1 = this.selectList(new EntityWrapper<CompanyInfo>()
+                .eq("unified_social_credit_code",companyInfo.getUnifiedSocialCreditCode())
+                .eq("delete_flag", NumberConstant.CONSTANT0));
+        if (companyInfos1.size() > 0) {
+            throw new YException(YExceptionEnum.UNIFIED_SOCIAL_CREDIT_CODE_ERROR);
+        }
+        companyInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        companyInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        this.insert(companyInfo);
+        return "ok";
+    }
+
+    /**
+     * 编辑公司信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String editCompanyInfo(CompanyInfo companyInfo) {
+        CompanyInfo companyInfo1 = this.selectById(companyInfo.getId());
+        if (companyInfo1 != null){
+            //信息编辑
+            companyInfo1.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            companyInfo1.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            this.updateById(companyInfo1);
+        }
+        return "OK";
+    }
+
+    /**
+     * 删除公司信息
+     *
+     * @param id
+     */
+    @Override
+    public void deleteCompany(String id) {
+        CompanyInfo companyInfo = this.selectById(id);
+        if (companyInfo != null) {
+            this.deleteById(companyInfo.getId());
+        }
+    }
+
+    /**
+     *所有公司下拉列表
+     * @param
+     * @return
+     */
+    @Override
+    public List<CompanyInfo> selectAllCompany() {
+        List<CompanyInfo> companyInfoList = this.selectList(new EntityWrapper<CompanyInfo>()
+                .eq(CompanyInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        return companyInfoList;
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverCarInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.DriverCarInfoMapper;
@@ -69,6 +70,8 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, D
     @Transactional(rollbackFor = Exception.class)
     public String editInfo(DriverCarInfo driverCarInfo) {
         //信息编辑
+        driverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        driverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
         this.updateById(driverCarInfo);
         return "OK";
     }
@@ -86,4 +89,22 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, D
             this.deleteById(driverCarInfo.getId());
         }
     }
+
+    /**
+     * 审核
+     * @param driverCarInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String examine(DriverCarInfo driverCarInfo) {
+        //查询车辆信息
+        DriverCarInfo driverCarInfo1 = this.selectById(driverCarInfo.getId());
+        if (driverCarInfo1 != null) {
+            //更改车辆状态信息
+            this.updateById(driverCarInfo1);
+            return "OK";
+        }
+        return "NG";
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java

@@ -38,6 +38,18 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
     private IDriverPayeeInfoService driverPayeeInfoService;
 
 
+    /**
+     * 第一次认证
+     * @param driverPhone
+     * @return
+     */
+    public DriverInfo firstAuthentication(String driverPhone) {
+        DriverInfo driverInfo1 = this.selectOne(new EntityWrapper<DriverInfo>()
+        .eq("driver_phone",driverPhone)
+        .eq("delete_flag",0));
+        return driverInfo1;
+    }
+
     /**
      * 添加信息
      *
@@ -49,16 +61,17 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
     public String addInfo(DriverInfo driverInfo) {
         //新增主键id
         driverInfo.setId(IdGenerator.generateUUID());
-            //判断司机电话是否唯一
-            List<DriverInfo> driverInfos =
-                    this.selectList(new EntityWrapper<DriverInfo>()
-                            .eq("driver_phone", driverInfo.getDriverPhone())
-                            .eq("delete_flag", NumberConstant.CONSTANT0));
-            if (driverInfos.size() > 0) {
-                throw new YException(YExceptionEnum.DRIVER_PHONE_ERROR);
-            }
-            driverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
-            driverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+        driverInfo.setFirstFlag("1");
+        driverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        driverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        //判断司机电话是否唯一
+        List<DriverInfo> driverInfos =
+                this.selectList(new EntityWrapper<DriverInfo>()
+                        .eq("driver_phone", driverInfo.getDriverPhone())
+                        .eq("delete_flag", NumberConstant.CONSTANT0));
+        if (driverInfos.size() > 0) {
+            throw new YException(YExceptionEnum.DRIVER_PHONE_ERROR);
+        }
         //判断司机身份证号是否唯一
         List<DriverInfo> driverInfoList =
                 this.selectList(new EntityWrapper<DriverInfo>()
@@ -73,6 +86,8 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
             for (DriverCarInfo driverCarInfo : driverCarInfoList) {
                 driverCarInfo.setId(IdGenerator.generateUUID());
                 driverCarInfo.setDriverId(driverInfo.getId());
+                driverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+                driverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
             }
         }
         //收款人账户信息新增
@@ -110,6 +125,8 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String editInfo(DriverInfo driverInfo) {
+        driverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        driverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
         //主表信息编辑
         this.updateById(driverInfo);
         //货车信息编辑

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SearchRecordsInfoServiceImpl.java

@@ -1,10 +1,18 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.entity.SearchRecordsInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.SearchRecordsInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ISearchRecordsInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +25,73 @@ import org.springframework.stereotype.Service;
 @Service
 public class SearchRecordsInfoServiceImpl extends ServiceImpl<SearchRecordsInfoMapper, SearchRecordsInfo> implements ISearchRecordsInfoService {
 
+
+    /**
+     * 删除搜索记录
+     *
+     * @param searchRecordsInfo
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo) {
+        //查询搜索记录
+        //判断记录是否存在
+        List<SearchRecordsInfo> searchRecordsInfos = this.selectList(new EntityWrapper<SearchRecordsInfo>()
+                        .eq(SearchRecordsInfo.QueryFiles.COMMON_ID, searchRecordsInfo.getCommonId())
+                        .eq(SearchRecordsInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        //已存在
+        if (searchRecordsInfos.size() > 0) {
+            //删除搜索记录
+            for (SearchRecordsInfo searchRecordsInfo1 : searchRecordsInfos) {
+                this.deleteById(searchRecordsInfo1.getId());
+            }
+        }
+
+    }
+
+    /**
+     * 新增搜索记录
+     *
+     * @param searchRecordsInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String addInfo(SearchRecordsInfo searchRecordsInfo) {
+        //判断记录是否存在
+        SearchRecordsInfo searchRecordsInfo1 = this.selectOne(new EntityWrapper<SearchRecordsInfo>()
+                        .eq(SearchRecordsInfo.QueryFiles.COMMON_ID, searchRecordsInfo.getCommonId())
+                        .eq("search_content", searchRecordsInfo.getSearchContent())
+                        .eq(SearchRecordsInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        //已存在，次数加1
+        if (searchRecordsInfo1 != null) {
+            Long count = searchRecordsInfo1.getSearchCount() + 1;
+            searchRecordsInfo1.setSearchCount(count);
+            this.updateById(searchRecordsInfo1);
+        }
+        //新增
+        else {
+            //新增主键id
+            searchRecordsInfo.setId(IdGenerator.generateUUID());
+            // 操作主表数据
+            this.insert(searchRecordsInfo);
+        }
+        return "OK";
+    }
+
+    /**
+     * 搜索记录列表
+     *
+     * @param searchRecordsInfo
+     * @return
+     */
+    @Override
+    public Page<SearchRecordsInfo> selectSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo) {
+        //查询搜索记录
+        Page<SearchRecordsInfo> searchRecordsInfoPage = this.selectPage(searchRecordsInfo.getQueryPage(), new EntityWrapper<SearchRecordsInfo>()
+                .eq(SearchRecordsInfo.QueryFiles.COMMON_ID, searchRecordsInfo.getCommonId())
+                .eq(SearchRecordsInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
+                .orderBy("update_date", false));
+        return searchRecordsInfoPage;
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/OrderInfoMapper.xml

@@ -10,6 +10,11 @@
         AND common_id = #{commonId}
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(order_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR (lower(cargo_owner) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR (lower(send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR (lower(send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR (lower(unload_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR (lower(unload_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
         </if>
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
@@ -57,6 +62,11 @@
         AND common_id = #{commonId}
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(order_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR (lower(cargo_owner) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR (lower(send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR (lower(send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR (lower(unload_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR (lower(unload_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
         </if>
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">