Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun

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

@@ -111,6 +111,8 @@ auth:
     - /notice/**/*
     - /paymentManagement/*
     - /paymentManagement/**/*
+    - /ClothingColorController/*
+    - /ClothingColorController/**/*
     - /qualityInspectionManagement/*
     - /qualityInspectionManagement/**/*
     - /weighingManagement/*

winsea-haixin-plugin-wangluohuoyun/pom.xml

@@ -102,6 +102,17 @@
 <!--            <artifactId>aliyun-java-sdk-green</artifactId>-->
 <!--            <version>3.5.0</version>-->
 <!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-sts</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.4.6</version>
+        </dependency>
     </dependencies>
 
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","patform_anagement_egulations");
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","province_city_info");
     }
 
     /**

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

@@ -189,6 +189,18 @@ public enum StatusEnum {
     TASK_REJECT("5", "已通过", "task_reject"),
     TASK_ADOPT("7", "已过期", "task_adopt"),
 
+    //所属公司状态
+    COMPANY_EXAMINEING("1", "企业审核中", "company_examineing"),
+    COMPANY_REJECTED("3", "企业已驳回", "company_rejected"),
+    PLATFORM_EXAMINEING("5", "平台审核中", "platform_examineing"),
+    PLATFORM_REJECTED("7", "平台已驳回", "platform_rejected"),
+    PLATFORM_CERTIFIED("9", "已认证", "platform_certified"),
+    CAUTHORIZATION_REVOKED("17", "授权已撤销", "authorization_revoked"),
+
+    //平台规定管理状态
+    PLATFORM_REVIEWED("1", "待审核", "reviewed"),
+    PLATFORM_FAILED("3", "已驳回", "passed"),
+    PLATFORM_COMPLETED("5", "生效中", "Completed"),
 
     ;
     @Getter

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

@@ -7,6 +7,8 @@ import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerAddressInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 货主地址信息 前端控制器
@@ -71,5 +73,15 @@ public class CargoOwnerAddressInfoController {
     public String setDefault(@RequestBody CargoOwnerAddressInfo cargoOwnerAddressInfo){
         return cargoOwnerAddressInfoService.setDefault(cargoOwnerAddressInfo);
     }
+
+    /**
+     * 默认收货发货列表
+     * @param cargoOwnerAddressInfo
+     * @return
+     */
+    @GetMapping("/addressList")
+    public List<CargoOwnerAddressInfo> addressList(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+        return cargoOwnerAddressInfoService.addressList(cargoOwnerAddressInfo);
+    }
 }
 

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

@@ -1,15 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
 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;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -51,6 +47,15 @@ public class CargoOwnerCompInfoController {
         cargoOwnerCompInfoService.deleteCargoOwnerComp(cargoOwnerCompInfo.getId());
     }
 
+    /**
+     * 授权审核管理页面列表
+     * @param cargoOwnerCompInfo
+     * @return
+     */
+    @GetMapping("/selectCargoOwnerCompInfoPage")
+    public Page<CargoOwnerCompInfo> selectCargoOwnerCompInfoPage(CargoOwnerCompInfo cargoOwnerCompInfo){
+        return cargoOwnerCompInfoService.selectCargoOwnerCompInfoPage(cargoOwnerCompInfo);
+    }
 
     /**
      * 审核
@@ -58,7 +63,7 @@ public class CargoOwnerCompInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo){
+    public String examine( CargoOwnerCompInfo cargoOwnerCompInfo){
         return cargoOwnerCompInfoService.examine(cargoOwnerCompInfo);
     }
 }

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

@@ -26,7 +26,7 @@ public class CargoOwnerInfoController {
 
 
     /**
-     * huozhu 管理页面列表
+     * 货主管理页面列表
      * @param cargoOwnerInfo
      * @return
      */
@@ -66,7 +66,7 @@ public class CargoOwnerInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody CargoOwnerInfo cargoOwnerInfo){
+    public String examine( CargoOwnerInfo cargoOwnerInfo){
         return cargoOwnerInfoService.examine(cargoOwnerInfo);
     }
 

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.winsea.svc.base.base.entity.CommonCompany;
 import com.winsea.svc.base.base.entity.CommonStaff;
@@ -30,15 +31,30 @@ import com.yh.saas.plugin.yiliangyiyun.util.HttpUtil;
 import com.yh.saas.plugin.yiliangyiyun.util.WebSocket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.exceptions.ServerException;
+import com.aliyuncs.profile.DefaultProfile;
+import com.google.gson.Gson;
+
+import java.util.*;
+
+import com.aliyuncs.sts.model.v20150401.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.net.URLEncoder;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author Gongdc
@@ -66,19 +82,47 @@ public class CommonUserController {
     private WebSocket webSocket;
 
 
+    @GetMapping("/getAuth")
+    public String getAuth(String apiKey, String secretKey) {
+        //构建一个阿里云客户端，用于发起请求。
+        //构建阿里云客户端时需要设置AccessKey ID和AccessKey Secret。
+        DefaultProfile profile = DefaultProfile.getProfile("cn-beijing", "'LTAI4G9c14PgKvM23WZ9zrpc", "FpClTp4OVrRRtHEfi3lBOWUoLxKieW");
+        IAcsClient client = new DefaultAcsClient(profile);
+
+        //构造请求，设置参数。关于参数含义和设置方法，请参见《API参考》。
+        AssumeRoleRequest request = new AssumeRoleRequest();
+        request.setRegionId("cn-beijing");
+        request.setRoleArn("acs:ram::1822896003496259:role/aliyuncasdefaultrole");
+        request.setRoleSessionName("Ok");
+
+        //发起请求，并得到响应。
+        try {
+            AssumeRoleResponse response = client.getAcsResponse(request);
+            return new Gson().toJson(response);
+        } catch (ServerException e) {
+            e.printStackTrace();
+        } catch (ClientException e) {
+            System.out.println("ErrCode:" + e.getErrCode());
+            System.out.println("ErrMsg:" + e.getErrMsg());
+            System.out.println("RequestId:" + e.getRequestId());
+        }
+        return null;
+    }
+
 
     /**
      * 图像审核识别Demo
+     *
      * @param imagePath
      * @param accessToken
      * @return UserDefinedBean
      * @throws Exception
      */
     @PostMapping("/getUserDefinedBean")
-    public static UserDefinedBean getUserDefinedBean(String imagePath, String accessToken) throws Exception{
+    public static UserDefinedBean getUserDefinedBean(String imagePath, String accessToken) throws Exception {
         byte[] imgData = FileUtil.readFileByBytes(imagePath);
         String imgStr = Base64Util.encode(imgData);
-        String param = "image=" + URLEncoder.encode(imgStr,"UTF-8");
+        String param = "image=" + URLEncoder.encode(imgStr, "UTF-8");
 //		String jsonParam = "{\"top_num\":5,\"image\":\"图片的base64\"}";
         // 注意这里仅为了简化编码每一次请求都去获取access_token，线上环境access_token有过期时间， 客户端可自行缓存，过期后重新获取。
         String result = HttpUtil.post(ImageCensorConsts.ANTI_USER_DEFINED_URL, accessToken, param);
@@ -88,58 +132,64 @@ public class CommonUserController {
 
     /**
      * 注册
+     *
      * @param commonUser
      * @return
      */
     @PostMapping("/register")
-    public  String register(@RequestBody CommonUser commonUser) throws ServiceException {
+    public String register(@RequestBody CommonUser commonUser) throws ServiceException {
         return commonUserService.register(commonUser);
     }
 
     /**
      * 重置密码
+     *
      * @param commonUser
      * @return
      */
     @PostMapping("/resetPassword")
-    public  String resetPassword(@RequestBody CommonUser commonUser) throws ServiceException {
+    public String resetPassword(@RequestBody CommonUser commonUser) throws ServiceException {
         return commonUserService.resetPassword(commonUser);
     }
 
     /**
      * 重置账号
+     *
      * @param commonUser
      * @return
      */
     @PostMapping("/resetAccount")
-    public  String resetAccount(@RequestBody CommonUser commonUser) throws ServiceException {
+    public String resetAccount(@RequestBody CommonUser commonUser) throws ServiceException {
         return commonUserService.resetAccount(commonUser);
     }
 
 
     /**
      * 修改用户信息
+     *
      * @param commonUser
      * @return
      */
     @PostMapping("/editUserInfo")
-    public  String editUserInfo(@RequestBody CommonUser commonUser) throws ServiceException {
+    public String editUserInfo(@RequestBody CommonUser commonUser) throws ServiceException {
         return commonUserService.editUserInfo(commonUser);
     }
 
     /**
      * 发送验证码
+     *
      * @param phone
      * @return
      * @throws ServiceException
      */
     @GetMapping("/sendVerifyCode")
-    public  String sendVerifyCode(String phone) throws ServiceException {
+    public String sendVerifyCode(String phone) throws ServiceException {
         return commonUserService.sendVerifyCode(phone);
     }
 
     /**
      * 登录
+     *
      * @param commonUser
      * @return
      * @throws ServiceException
@@ -151,6 +201,7 @@ public class CommonUserController {
 
     /**
      * 快捷登录
+     *
      * @param commonUser
      * @return
      * @throws ServiceException
@@ -159,8 +210,10 @@ public class CommonUserController {
     public CommonUser loginVerifyCode(CommonUser commonUser) throws ServiceException {
         return commonUserService.loginVerifyCode(commonUser);
     }
+
     /**
      * 校验验证码
+     *
      * @param commonUser
      * @return
      * @throws ServiceException
@@ -182,7 +235,6 @@ public class CommonUserController {
     }
 
 
-
     /**
      * 创建登录用户
      *
@@ -217,7 +269,7 @@ public class CommonUserController {
                 compId = companyService.getCompanyIdByDomainName(authUser.getCompanyId(), authUser.getDomainName(),
                         request.getServerName());
 
-                if (StringUtils.isEmpty(compId)){
+                if (StringUtils.isEmpty(compId)) {
                     compId = userService.findPhoneCompId(authUser.getMobilePhone());
                 }
             }
@@ -259,6 +311,7 @@ public class CommonUserController {
     public String checkApp(@RequestBody CommonUser commonUser) throws ServiceException {
         return commonUserService.checkApp(commonUser);
     }
+
     /**
      * Session检测
      *
@@ -279,6 +332,7 @@ public class CommonUserController {
     public List<CommonCompany> getComp() {
         return commonUserService.getComp();
     }
+
     /**
      * 公司
      *
@@ -288,6 +342,7 @@ public class CommonUserController {
     public List<CommonCompany> getCompOwn(String phone) {
         return commonUserService.getCompOwn(phone);
     }
+
     /**
      * 首页公司下拉列表
      *

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

@@ -74,5 +74,24 @@ public class CompanyInfoController {
     public Page<CompanyInfo> selectAllCompany(CompanyInfo companyInfo){
         return companyInfoService.selectAllCompany(companyInfo);
     }
+
+    /**
+     * 企业审核后台管理列表
+     * @return
+     */
+    @GetMapping("/selectCompanyPage")
+    public Page<CompanyInfo> selectCompanyPage(CompanyInfo companyInfo){
+        return companyInfoService.selectCompanyPage(companyInfo);
+    }
+
+    /**
+     * 审核
+     * @param
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(CompanyInfo companyInfo){
+        return companyInfoService.examine(companyInfo);
+    }
 }
 

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

@@ -1,6 +1,8 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,14 +26,23 @@ public class DriverCarInfoController {
     private IDriverCarInfoService driverCarInfoService;
 
     /**
-     * 车辆列表
+     * 后台管理车辆列表
      * @return
      */
-    @PostMapping("/selectCar")
-    public List<DriverCarInfo> selectCar(@RequestBody DriverCarInfo driverCarInfo){
+    @GetMapping("/selectCar")
+    public Page<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo){
         return driverCarInfoService.selectCar(driverCarInfo);
     }
 
+    /**
+     * 司机车辆列表
+     * @return
+     */
+    @GetMapping("/selectDriverCar")
+    public List<DriverCarInfo> selectDriverCar(DriverCarInfo driverCarInfo){
+        return driverCarInfoService.selectDriverCar(driverCarInfo);
+    }
+
     /**
      * 添加信息
      */
@@ -63,7 +74,7 @@ public class DriverCarInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody DriverCarInfo driverCarInfo){
+    public String examine( DriverCarInfo driverCarInfo){
         return driverCarInfoService.examine(driverCarInfo);
     }
 }

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

@@ -67,7 +67,7 @@ public class DriverInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody DriverInfo driverInfo){
+    public String examine( DriverInfo driverInfo){
         return driverInfoService.examine(driverInfo);
     }
 

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

@@ -39,7 +39,7 @@ public class NewsInfoController {
      * @return
      */
     @PostMapping("/api/addNewsInfo")
-    public String addNewsInfo (@RequestBody NewsInfo newsInfo){
+    public String addNewsInfo ( NewsInfo newsInfo){
         return newsInfoService.addNewsInfo(newsInfo);
     }
 

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

@@ -1,6 +1,8 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PatformAnagementEgulations;
 import com.yh.saas.plugin.yiliangyiyun.service.IOrderInfoService;
@@ -25,32 +27,59 @@ public class PatformAnagementEgulationsController {
     private IPatformAnagementEgulationsService patformAnagementEgulationsService;
 
     /**
-     * 详情
+     * 查看
      */
     @GetMapping("/show")
-    public PatformAnagementEgulations show() {
-        return patformAnagementEgulationsService.show();
+    public PatformAnagementEgulations show(String id) {
+        return patformAnagementEgulationsService.show(id);
     }
 
-
-
     /**
      * 新增
      * @param patformAnagementEgulations
      * @return
      */
     @PostMapping("/api/add")
-    public String add(@RequestBody PatformAnagementEgulations patformAnagementEgulations){
+    public String add( PatformAnagementEgulations patformAnagementEgulations){
         return patformAnagementEgulationsService.add(patformAnagementEgulations);
     }
+
     /**
      * 编辑
      * @param patformAnagementEgulations
      * @return
      */
     @PostMapping("/api/edit")
-    public String edit(@RequestBody PatformAnagementEgulations patformAnagementEgulations){
+    public String edit( PatformAnagementEgulations patformAnagementEgulations){
         return patformAnagementEgulationsService.edit(patformAnagementEgulations);
     }
+
+    /**
+     * 删除
+     * @param patformAnagementEgulations
+     */
+    @PostMapping("/api/delete")
+    public void delete( PatformAnagementEgulations patformAnagementEgulations){
+        patformAnagementEgulationsService.delete(patformAnagementEgulations.getId());
+    }
+
+    /**
+     * 平台规定管理列表
+     * @return
+     */
+    @GetMapping("/selectPage")
+    public Page<PatformAnagementEgulations> selectPage(PatformAnagementEgulations patformAnagementEgulations){
+        return patformAnagementEgulationsService.selectPage(patformAnagementEgulations);
+    }
+
+    /**
+     * 审核
+     * @param
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(PatformAnagementEgulations patformAnagementEgulations){
+        return patformAnagementEgulationsService.examine(patformAnagementEgulations);
+    }
 }
 

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

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 省会城市信息 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-03-30
+ */
+@RestController
+@RequestMapping("/provinceCityInfo")
+public class ProvinceCityInfoController {
+
+}
+

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

@@ -96,16 +96,36 @@ public class PublishTaskInfoController {
         publishTaskInfoService.showHidden(publishTaskInfo.getId());
     }
 
+    /**
+     * 刷新
+     * @param publishTaskInfo
+     * @return
+     */
+    @PostMapping("/api/refresh")
+    public String refresh(@RequestBody PublishTaskInfo publishTaskInfo){
+        return publishTaskInfoService.refresh(publishTaskInfo);
+    }
+
     /**
      * 货源列表
      * @param publishTaskInfo
      * @return
      */
     @GetMapping("/selectGoodsSource")
-    public Page<GoodsSourceView> selectGoodsSource(PublishTaskInfo publishTaskInfo) {
+    public Page<PublishTaskInfo> selectGoodsSource(PublishTaskInfo publishTaskInfo) {
         return publishTaskInfoService.selectGoodsSource(publishTaskInfo);
     }
 
+    /**
+     * 周边信息列表
+     * @param publishTaskInfo
+     * @return
+     */
+    @GetMapping("/selectPeripheralInfo")
+    public Page<PublishTaskInfo> selectPeripheralInfo(PublishTaskInfo publishTaskInfo) {
+        return publishTaskInfoService.selectPeripheralInfo(publishTaskInfo);
+    }
+
     /**
      * 抢单
      * @param publishTaskInfo
@@ -116,14 +136,13 @@ public class PublishTaskInfoController {
         return publishTaskInfoService.addOrder(publishTaskInfo);
     }
 
-
     /**
      * 审核
      * @param
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody PublishTaskInfo publishTaskInfo){
+    public String examine( PublishTaskInfo publishTaskInfo){
         return publishTaskInfoService.examine(publishTaskInfo);
     }
 }

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

@@ -64,6 +64,10 @@ public class AgentCargoOwnerInfo extends BaseModel<AgentCargoOwnerInfo> {
      * 状态
      */
     private String status;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
     /**
      * 授权操作标识（1授权2驳回3撤销授权）
      */

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

@@ -91,7 +91,16 @@ public class CargoOwnerAddressInfo extends BaseModel<CargoOwnerAddressInfo> {
      */
     @TableField(exist = false)
     private String defaultFlag;
-
+    /**
+     * 默认发货地
+     */
+    @TableField(exist = false)
+    private CargoOwnerAddressInfo defaultShipmentPlace;
+    /**
+     * 默认收货地
+     */
+    @TableField(exist = false)
+    private CargoOwnerAddressInfo defaultDestinationPlace;
 
     @Override
     protected Serializable pkVal() {

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

@@ -65,7 +65,7 @@ public class CargoOwnerCompInfo extends BaseModel<CargoOwnerCompInfo> {
      */
     private String advanceFreightService;
     /**
-     * 认证状态key（1审核中3企业已驳回5已认证7未通过审核9授权已过期11企业变更授权失效）
+     * 认证状态key（1企业审核中3企业已驳回5平台审核中7平台已驳回审核9已认证11授权已过期13企业暂不可用15企业不存在17授权已撤销）
      */
     private String statusKey;
     /**
@@ -77,6 +77,36 @@ public class CargoOwnerCompInfo extends BaseModel<CargoOwnerCompInfo> {
      */
     @TableField(exist = false)
     private String flag;
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarUrl;
+    /**
+     * 货主姓名
+     */
+    @TableField(exist = false)
+    private String name;
+    /**
+     * 账号
+     */
+    @TableField(exist = false)
+    private String phone;
+    /**
+     * 身份证号
+     */
+    @TableField(exist = false)
+    private String cardNumber;
 
     @Override
     protected Serializable pkVal() {

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

@@ -45,6 +45,15 @@ public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
      * 姓名
      */
     private String name;
+    /**
+     * 性别
+     */
+    private String sex;
+    /**
+     * 称呼
+     */
+    private String call;
+
     /**
      * 联系电话
      */
@@ -66,7 +75,7 @@ public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
      */
     private String cardValidityDate;
     /**
-     * 认证状态key（1审核中3已驳回5已通过）
+     * 认证状态key（1审核中3已驳回5已通过7禁用）
      */
     private String authenticationStatusKey;
     /**
@@ -76,7 +85,15 @@ public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
     /**
      * 刷新次数
      */
-    private String refreshTimes;
+    private Long refreshTimes;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
+    /**
+     * 第一次认证标识
+     */
+    private String firstFlag;
 
     @TableField(exist = false)
     private List<CargoOwnerCompInfo> cargoOwnerCompInfoList;
@@ -98,6 +115,11 @@ public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
      */
     @TableField(exist = false)
     private String searchKeyWord;
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarUrl;
 
     @Override
     protected Serializable pkVal() {

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

@@ -110,6 +110,11 @@ public class CommonUser extends BaseModel<CommonUser> {
      */
     @TableField(exist = false)
     private String  loginFlag ;
+    /**
+     * 司机货主状态
+     */
+    @TableField(exist = false)
+    private String  statusFlag ;
 
 
     @Override

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

@@ -55,6 +55,10 @@ public class CompanyInfo extends BaseModel<CompanyInfo> {
      * 注册实缴金额（万元）
      */
     private Float registeredPaidAmount;
+    /**
+     * 通信地址
+     */
+    private String mailingAddress;
     /**
      * 身份证人像面附件地址
      */
@@ -111,12 +115,36 @@ public class CompanyInfo extends BaseModel<CompanyInfo> {
      * 认证状态
      */
     private String status;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
 
+    /**
+     * 审核标识
+     */
+    @TableField(exist = false)
+    private String flag;
     /**
      * 模糊查询
      */
     @TableField(exist = false)
     private String searchKeyWord;
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
+    /**
+     * 账号
+     */
+    @TableField(exist = false)
+    private String accountNumber;
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarUrl;
 
 
     @Override

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

@@ -84,11 +84,55 @@ public class DriverCarInfo extends BaseModel<DriverCarInfo> {
      * 认证状态
      */
     private String status;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
     /**
      * 模糊查询
      */
     @TableField(exist = false)
-    private String search;
+    private String searchKeyWord;
+    /**
+     * 审核标识
+     */
+    @TableField(exist = false)
+    private String flag;
+    /**
+     * 司机姓名
+     */
+    @TableField(exist = false)
+    private String driverName;
+    /**
+     * 司机电话
+     */
+    @TableField(exist = false)
+    private String driverPhone;
+    /**
+     * 司机身份证号码
+     */
+    @TableField(exist = false)
+    private String numberCard;
+    /**
+     * 身份证人像面附件地址
+     */
+    @TableField(exist = false)
+    private String cardAddressUrl;
+    /**
+     * 身份证国徽面面附件地址
+     */
+    @TableField(exist = false)
+    private String cardBackAddressUrl;
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarUrl;
 
     @Override
     protected Serializable pkVal() {

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

@@ -183,6 +183,14 @@ public class DriverInfo extends BaseModel<DriverInfo> {
      * 第一次认证标识(1是)
      */
     private String firstFlag;
+    /**
+     * 驳回原因（1证件照片不清晰2证件照片上传错误3身份信息填写错误4证件信息填写错误5其他）
+     */
+    private String rejectReason;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
     /**
      * 审核标识
      */
@@ -199,12 +207,17 @@ public class DriverInfo extends BaseModel<DriverInfo> {
      */
     @TableField(exist = false)
     private String searchType;
-
     /**
      * 模糊查询
      */
     @TableField(exist = false)
     private String searchKeyWord;
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarUrl;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -3,6 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
@@ -62,6 +63,11 @@ public class DriverPayeeInfo extends BaseModel<DriverPayeeInfo> {
      * 默认标识（1是）
      */
     private String defaultFlag;
+    /**
+     * 银行卡颜色
+     */
+    @TableField(exist = false)
+    private String cardColor;
 
 
     @Override

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

@@ -41,6 +41,10 @@ public class NewsInfo extends BaseModel<NewsInfo> {
      * 接收消息用户id
      */
     private String reCommonId;
+    /**
+     * 消息标题
+     */
+    private String newsTitle;
     /**
      * 消息内容
      */

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

@@ -158,7 +158,22 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      * 终止原因描述
      */
     private String terminationReasonDescription;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
+
+    /**
+     * 开始时间
+     */
+    @TableField(exist = false)
+    private String startDate;
 
+    /**
+     * 结束时间
+     */
+    @TableField(exist = false)
+    private String endDate;
 
     /**
      * 模糊查询
@@ -206,6 +221,17 @@ public class OrderInfo extends BaseModel<OrderInfo> {
     @TableField(exist = false)
     private String driverPortrait;
 
+    /**
+     * 司机称呼
+     */
+    @TableField(exist = false)
+    private String driverCall;
+
+    /**
+     * 承运id
+     */
+    @TableField(exist = false)
+    private String carrierId;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PatformAnagementEgulations.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;
@@ -39,6 +40,10 @@ public class PatformAnagementEgulations extends BaseModel<PatformAnagementEgulat
      * 编纂人员
      */
     private String editor;
+    /**
+     * 提交人
+     */
+    private String submitter;
     /**
      * 版本号
      */
@@ -51,6 +56,30 @@ public class PatformAnagementEgulations extends BaseModel<PatformAnagementEgulat
      * 内容
      */
     private String content;
+    /**
+     * 状态key（1待审核3已驳回5生效中7已失效）
+     */
+    private String statusKey;
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 审核标识
+     */
+    @TableField(exist = false)
+    private String flag;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
 
 
     @Override

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

@@ -0,0 +1,49 @@
+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.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 省会城市信息
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("province_city_info")
+public class ProvinceCityInfo extends BaseModel<ProvinceCityInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 省
+     */
+    private String province;
+    /**
+     * 省会城市
+     */
+    private String city;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -192,6 +192,10 @@ public class PublishTaskInfo extends BaseModel<PublishTaskInfo> {
      * 刷新次数
      */
     private String refreshTimes;
+    /**
+     * 驳回原因描述
+     */
+    private String rejectReasonDescription;
 
     /**
      * 司机用户id

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

@@ -40,6 +40,7 @@ public enum YExceptionEnum {
 	DRIVER_CAR_ERROR("ERROR005", "车牌号重复，不可添加！"),
 	COMPANY_NAME_ERROR("ERROR006", "企业名称重复，不可添加！"),
 	UNIFIED_SOCIAL_CREDIT_CODE_ERROR("ERROR007", "统一社会信用代码重复，不可添加！"),
+	REFRESH_TIMES_UPPER_LIMIT("ERROR008", "今日刷新次数已达上限！"),
 	;
 	@Getter
 	private String value;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CargoOwnerCompInfoMapper.java

@@ -2,6 +2,10 @@ package com.yh.saas.plugin.yiliangyiyun.mapper;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +17,19 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface CargoOwnerCompInfoMapper extends BaseMapper<CargoOwnerCompInfo> {
 
+    /**
+     * 根据条件查询所属公司总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询所属公司列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<CargoOwnerCompInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CompanyInfoMapper.java

@@ -32,4 +32,20 @@ public interface CompanyInfoMapper extends BaseMapper<CompanyInfo> {
      * @return
      */
     List<CompanyInfo> getListByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询公司总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByConditions(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询公司列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<CompanyInfo> getListByConditions(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/DriverCarInfoMapper.java

@@ -1,8 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 记录车辆信息 Mapper 接口
@@ -13,4 +17,19 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface DriverCarInfoMapper extends BaseMapper<DriverCarInfo> {
 
+    /**
+     * 根据条件查询车辆总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询车辆列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<DriverCarInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/PatformAnagementEgulationsMapper.java

@@ -1,8 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PatformAnagementEgulations;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 记录平台管理规定 Mapper 接口
@@ -13,4 +17,19 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface PatformAnagementEgulationsMapper extends BaseMapper<PatformAnagementEgulations> {
 
+    /**
+     * 根据条件查询规定总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByConditions(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询规定列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<PatformAnagementEgulations> getListByConditions(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/ProvinceCityInfoMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.ProvinceCityInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 省会城市信息 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-03-30
+ */
+public interface ProvinceCityInfoMapper extends BaseMapper<ProvinceCityInfo> {
+
+}

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/PublishTaskInfoMapper.java

@@ -40,6 +40,7 @@ public interface PublishTaskInfoMapper extends BaseMapper<PublishTaskInfo> {
      */
     Integer getCounstByCondition(Map<String, Object> pageView);
 
+
     /**
      * 根据推荐条件查询货源列表
      *

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 货主地址信息 服务类
@@ -42,4 +44,9 @@ public interface ICargoOwnerAddressInfoService extends IService<CargoOwnerAddres
      * @param cargoOwnerAddressInfo
      */
     String setDefault(CargoOwnerAddressInfo cargoOwnerAddressInfo);
+    /**
+     * 默认收货发货列表
+     * @param cargoOwnerAddressInfo
+     */
+    List<CargoOwnerAddressInfo> addressList(CargoOwnerAddressInfo cargoOwnerAddressInfo);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerCompInfoService.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.CargoOwnerCompInfo;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -33,5 +34,17 @@ public interface ICargoOwnerCompInfoService extends IService<CargoOwnerCompInfo>
      */
     void deleteCargoOwnerComp(String id);
 
+    /**
+     * 授权审核后台管理
+     * @param cargoOwnerCompInfo
+     * @return
+     */
+    Page<CargoOwnerCompInfo> selectCargoOwnerCompInfoPage(CargoOwnerCompInfo cargoOwnerCompInfo);
+
+    /**
+     * 审核
+     * @param cargoOwnerCompInfo
+     * @return
+     */
     String examine(CargoOwnerCompInfo cargoOwnerCompInfo);
 }

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

@@ -37,7 +37,17 @@ public interface ICargoOwnerInfoService extends IService<CargoOwnerInfo> {
      */
     String editCargoOwner(CargoOwnerInfo cargoOwnerInfo);
 
+    /**
+     * 货主后台管理
+     * @param cargoOwnerInfo
+     * @return
+     */
     Page<CargoOwnerInfo> selectCargoOwnerInfoPage(CargoOwnerInfo cargoOwnerInfo);
 
+    /**
+     * 审核
+     * @param cargoOwnerInfo
+     * @return
+     */
     String examine(CargoOwnerInfo cargoOwnerInfo);
 }

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

@@ -58,4 +58,19 @@ public interface ICompanyInfoService extends IService<CompanyInfo> {
      * @return
      */
     Page<CompanyInfo> selectAllCompany(CompanyInfo companyInfo);
+
+    /**
+     * 企业审核后台管理列表
+     *
+     * @param
+     * @return
+     */
+    Page<CompanyInfo> selectCompanyPage(CompanyInfo companyInfo);
+
+    /**
+     * 审核
+     * @param companyInfo
+     * @return
+     */
+    String examine(CompanyInfo companyInfo);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverCarInfoService.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.DriverCarInfo;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -20,7 +21,14 @@ public interface IDriverCarInfoService extends IService<DriverCarInfo> {
      * @param driverCarInfo
      * @return
      */
-    List<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo);
+    Page<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo);
+
+    /**
+     * 司机车辆列表
+     * @param driverCarInfo
+     * @return
+     */
+    List<DriverCarInfo> selectDriverCar(DriverCarInfo driverCarInfo);
 
     /**
      * 添加车辆信息

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IPatformAnagementEgulationsService.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.PatformAnagementEgulations;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -14,10 +15,44 @@ import com.baomidou.mybatisplus.service.IService;
 public interface IPatformAnagementEgulationsService extends IService<PatformAnagementEgulations> {
 
 
-
+    /**
+     * 新增
+     * @param patformAnagementEgulations
+     * @return
+     */
     String add(PatformAnagementEgulations patformAnagementEgulations);
 
+    /**
+     * 编辑
+     * @param patformAnagementEgulations
+     * @return
+     */
     String edit(PatformAnagementEgulations patformAnagementEgulations);
 
-    PatformAnagementEgulations show();
+    /**
+     * 查看
+     * @param id
+     * @return
+     */
+    PatformAnagementEgulations show(String id);
+
+    /**
+     * 删除
+     * @param id
+     */
+    void delete(String id);
+
+    /**
+     * 平台规定管理列表
+     * @param
+     * @return
+     */
+    Page<PatformAnagementEgulations> selectPage(PatformAnagementEgulations patformAnagementEgulations);
+
+    /**
+     * 审核
+     * @param patformAnagementEgulations
+     * @return
+     */
+    String examine(PatformAnagementEgulations patformAnagementEgulations);
 }

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.ProvinceCityInfo;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 省会城市信息 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-03-30
+ */
+public interface IProvinceCityInfoService extends IService<ProvinceCityInfo> {
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
 import com.baomidou.mybatisplus.service.IService;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -66,13 +67,26 @@ public interface IPublishTaskInfoService extends IService<PublishTaskInfo> {
      */
     void showHidden(String id);
 
+    /**
+     * 刷新
+     */
+    String refresh(PublishTaskInfo publishTaskInfo);
+
     /**
      * 货源列表
      *
      * @param publishTaskInfo
      * @return
      */
-    Page<GoodsSourceView> selectGoodsSource(PublishTaskInfo publishTaskInfo);
+    Page<PublishTaskInfo> selectGoodsSource(PublishTaskInfo publishTaskInfo);
+
+    /**
+     * 周边信息列表
+     *
+     * @param publishTaskInfo
+     * @return
+     */
+    Page<PublishTaskInfo> selectPeripheralInfo(PublishTaskInfo publishTaskInfo);
 
     /**
      * 抢单
@@ -81,6 +95,11 @@ public interface IPublishTaskInfoService extends IService<PublishTaskInfo> {
      */
     String addOrder(PublishTaskInfo publishTaskInfo);
 
+    /**
+     * 审核
+     * @param publishTaskInfo
+     * @return
+     */
     String examine(PublishTaskInfo publishTaskInfo);
 
 }

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

@@ -3,17 +3,15 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
-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.entity.PublishTaskInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.AgentCargoOwnerInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IAgentCargoOwnerInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerCompInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +28,10 @@ import java.util.Map;
 @Service
 public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerInfoMapper, AgentCargoOwnerInfo> implements IAgentCargoOwnerInfoService {
 
+    @Autowired
+    private ICargoOwnerCompInfoService cargoOwnerCompInfoService;
+
+
     /**
      *代理货主列表
      * @param agentCargoOwnerInfo
@@ -62,6 +64,10 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
     public String editAgentCargoOwner(AgentCargoOwnerInfo agentCargoOwnerInfo) {
         //查询代理货主信息
         AgentCargoOwnerInfo agentCargoOwnerInfo1 = this.selectById(agentCargoOwnerInfo.getId());
+        //查询所属公司
+        CargoOwnerCompInfo cargoOwnerCompInfo = cargoOwnerCompInfoService.selectOne(new EntityWrapper<CargoOwnerCompInfo>()
+            .eq("common_id",agentCargoOwnerInfo1.getAgentCommonId())
+            .eq("delete_flag","0"));
         //如果信息不为空，授权
         if (agentCargoOwnerInfo1 != null){
             if("1".equals(agentCargoOwnerInfo.getGrantFlag())){
@@ -72,12 +78,23 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
                 //信息编辑,驳回
                 agentCargoOwnerInfo1.setStatus(StatusEnum.TASK_RETURN.getName());
                 agentCargoOwnerInfo1.setStatusKey(StatusEnum.TASK_RETURN.getFlag());
+                if (cargoOwnerCompInfo != null){
+                    //更改所属公司状态
+                    cargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_REJECTED.getName());
+                    cargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_REJECTED.getFlag());
+                }
             }else {
                 //信息编辑,撤销授权
                 agentCargoOwnerInfo1.setStatus(StatusEnum.AUTHORIZATION_REVOKED.getName());
                 agentCargoOwnerInfo1.setStatusKey(StatusEnum.AUTHORIZATION_REVOKED.getFlag());
+                if (cargoOwnerCompInfo != null) {
+                    //更改所属公司状态
+                    cargoOwnerCompInfo.setStatus(StatusEnum.CAUTHORIZATION_REVOKED.getName());
+                    cargoOwnerCompInfo.setStatusKey(StatusEnum.CAUTHORIZATION_REVOKED.getFlag());
+                }
             }
             this.updateById(agentCargoOwnerInfo1);
+            cargoOwnerCompInfoService.updateById(cargoOwnerCompInfo);
         }
         return "OK";
     }

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

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -121,9 +122,6 @@ public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddr
                     }else if("2".equals(cargoOwnerAddressInfo.getDefaultFlag())){
                         //取消默认收货
                         cargoOwnerAddressInfo1.setDefaultReceipt("0");
-                    }else {
-                        //取消置顶
-                        cargoOwnerAddressInfo1.setToppingFlag("0");
                     }
                     this.updateById(cargoOwnerAddressInfo1);
                 }
@@ -131,4 +129,27 @@ public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddr
         }
         return "ok";
     }
+
+    /**
+     * 默认收货发货列表
+     * @param cargoOwnerAddressInfo
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<CargoOwnerAddressInfo> addressList(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+        //查询货主所有地址
+        List<CargoOwnerAddressInfo> cargoOwnerAddressInfoList = this.selectList(new EntityWrapper<CargoOwnerAddressInfo>()
+                .eq(CargoOwnerAddressInfo.QueryFiles.COMMON_ID, cargoOwnerAddressInfo.getCommonId())
+                .eq(CargoOwnerAddressInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        //新建返回地址列表
+        List<CargoOwnerAddressInfo> cargoOwnerAddressInfoList1= new ArrayList<>();
+        if(!CollectionUtils.isEmpty(cargoOwnerAddressInfoList)){
+            for (CargoOwnerAddressInfo cargoOwnerAddressInfo1 : cargoOwnerAddressInfoList){
+                if("1".equals(cargoOwnerAddressInfo1.getDefaultShipment()) || "1".equals(cargoOwnerAddressInfo1.getDefaultReceipt())){
+                    cargoOwnerAddressInfoList1.add(cargoOwnerAddressInfo1);
+                }
+            }
+        }
+        return cargoOwnerAddressInfoList1;
+    }
 }

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

@@ -1,6 +1,8 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
@@ -17,6 +19,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 货主企业信息 服务实现类
@@ -45,8 +51,8 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
     public String addCargoOwnerComp(CargoOwnerCompInfo cargoOwnerCompInfo){
         //新增主键id
         cargoOwnerCompInfo.setId(IdGenerator.generateUUID());
-        cargoOwnerCompInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-        cargoOwnerCompInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        cargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
+        cargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
         this.insert(cargoOwnerCompInfo);
         //根据公司名称和法人名称获取公司用户id
         CompanyInfo companyInfo = companyInfoService.selectOne(new EntityWrapper<CompanyInfo>()
@@ -77,13 +83,11 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
      */
     @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);
-        }
+            cargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
+            cargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
+            this.updateById(cargoOwnerCompInfo);
+
         return "OK";
     }
 
@@ -101,6 +105,33 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         }
     }
 
+    /**
+     * 授权审核后台管理页面
+     *
+     * @param cargoOwnerCompInfo
+     * @return
+     */
+    @Override
+    public Page<CargoOwnerCompInfo> selectCargoOwnerCompInfoPage(CargoOwnerCompInfo cargoOwnerCompInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (cargoOwnerCompInfo.getCurrentPage() - 1)
+                * cargoOwnerCompInfo.getPageSize());
+        //公司id
+        pageView.put("searchType", cargoOwnerCompInfo.getSearchType());
+        pageView.put("searchKeyWord", cargoOwnerCompInfo.getSearchKeyWord());
+        pageView.put("pageSize", cargoOwnerCompInfo.getPageSize());
+        pageView.put("currentPage", cargoOwnerCompInfo.getCurrentPage());
+        // 查询货主总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<CargoOwnerCompInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<CargoOwnerCompInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(cargoOwnerCompInfo.getCurrentPage());
+        page.setSize(cargoOwnerCompInfo.getPageSize());
+        return page;
+    }
+
 
     /**
      * 审核/ 禁用
@@ -117,8 +148,8 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         if (cargoOwnerCompInfo1 != null) {
             //通过
             if ("1".equals(cargoOwnerCompInfo.getFlag())) {
-                cargoOwnerCompInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
-                cargoOwnerCompInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                cargoOwnerCompInfo1.setStatusKey(StatusEnum.PLATFORM_CERTIFIED.getFlag());
+                cargoOwnerCompInfo1.setStatus(StatusEnum.PLATFORM_CERTIFIED.getName());
 //                geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());
@@ -134,8 +165,9 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
             }
 //            驳回
             else if("2".equals(cargoOwnerCompInfo.getFlag())){
-                cargoOwnerCompInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
-                cargoOwnerCompInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+                cargoOwnerCompInfo1.setStatusKey(StatusEnum.PLATFORM_REJECTED.getFlag());
+                cargoOwnerCompInfo1.setStatus(StatusEnum.PLATFORM_REJECTED.getName());
+                this.updateById(cargoOwnerCompInfo);
 //                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());

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

@@ -53,12 +53,12 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
                 * cargoOwnerInfo.getPageSize());
         //公司id
 //        pageView.put("compId", cargoOwnerInfo.getCompId());
-        pageView.put("commonId", cargoOwnerInfo.getCommonId());
+//        pageView.put("commonId", cargoOwnerInfo.getCommonId());
         pageView.put("searchType", cargoOwnerInfo.getSearchType());
         pageView.put("searchKeyWord", cargoOwnerInfo.getSearchKeyWord());
         pageView.put("pageSize", cargoOwnerInfo.getPageSize());
         pageView.put("currentPage", cargoOwnerInfo.getCurrentPage());
-        // 查询司机总数
+        // 查询货主总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<CargoOwnerInfo> dataList = baseMapper.getListByCondition(pageView);
         Page<CargoOwnerInfo> page = new Page<>();
@@ -146,6 +146,7 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             if ("1".equals(cargoOwnerInfo.getFlag())) {
                 cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                cargoOwnerInfo1.setFirstFlag("1");
 //                geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());
@@ -163,6 +164,7 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             else if("2".equals(cargoOwnerInfo.getFlag())){
                 cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
+                this.updateById(cargoOwnerInfo);
 //                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());

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

@@ -42,17 +42,16 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String loadingAdd(CarrierInfo carrierInfo) {
-        //根据id查询承运信息
         CarrierInfo carrierInfo1 = this.selectById(carrierInfo.getId());
-        if (carrierInfo1 != null) {
+        if (carrierInfo != null) {
             //判断暂存提交（前端传参1暂存3提交）
             if ("1".equals(carrierInfo.getStatusFlag())) {
-                carrierInfo1.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
-                carrierInfo1.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
+                carrierInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
+                carrierInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
             }
             else {
-                carrierInfo1.setStatus(StatusEnum.SUBMITTED.getName());
-                carrierInfo1.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
+                carrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
+                carrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
                 //司机确认装车后，订单状态改为待货主确认装车
                 OrderInfo orderInfo = orderInfoService.selectOne(new EntityWrapper<OrderInfo>()
                     .eq("id",carrierInfo1.getOrderId())
@@ -73,7 +72,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
                 newsInfo.setNewsType("承运通知");
                 newsInfoService.addNewsInfo(newsInfo);
             }
-            this.updateById(carrierInfo1);
+            this.updateById(carrierInfo);
         }
         return "OK";
     }
@@ -88,15 +87,15 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
     public String unLoadingAdd(CarrierInfo carrierInfo) {
         //根据id查询承运信息
         CarrierInfo carrierInfo1 = this.selectById(carrierInfo.getId());
-        if(carrierInfo1 != null){
+        if(carrierInfo != null){
             //判断暂存提交（前端传参1暂存3提交）
-            if ("1".equals(carrierInfo1.getStatusFlag())) {
-                this.updateById(carrierInfo1);
+            if ("1".equals(carrierInfo.getStatusFlag())) {
+                this.updateById(carrierInfo);
             }
             else {
-                carrierInfo1.setStatus(StatusEnum.SUBMITTED.getName());
-                carrierInfo1.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
-                this.updateById(carrierInfo1);
+                carrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
+                carrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
+                this.updateById(carrierInfo);
                 //司机确认卸车后，订单状态改为待货主确认卸车
                 OrderInfo orderInfo = orderInfoService.selectOne(new EntityWrapper<OrderInfo>()
                         .eq("id",carrierInfo1.getOrderId())

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

@@ -457,6 +457,19 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
 //        if (!CollectionUtils.isEmpty(driverViewInfos)) {
 //            userDTO.setDriverFlag("1");
 //        }
+        if("2".equals(commonUser.getLoginFlag())){
+            DriverInfo driverInfo = driverInfoService.selectOne(new EntityWrapper<DriverInfo>().eq("common_id",userDTO.getId()));
+            if (driverInfo != null){
+                userDTO.setDriverId(driverInfo.getId());
+                userDTO.setStatusFlag(driverInfo.getAuthenticationStatus());
+            }
+        }
+        if ("1".equals(commonUser.getLoginFlag())){
+            CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>().eq("common_id",userDTO.getId()));
+            if (cargoOwnerInfo != null) {
+                userDTO.setStatusFlag(cargoOwnerInfo.getAuthenticationStatus());
+            }
+        }
         return userDTO;
     }
 
@@ -580,7 +593,16 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
 //        }
         if("2".equals(commonUser.getLoginFlag())){
             DriverInfo driverInfo = driverInfoService.selectOne(new EntityWrapper<DriverInfo>().eq("common_id",user.getId()));
-            user.setDriverId(driverInfo.getId());
+            if (driverInfo != null){
+                user.setDriverId(driverInfo.getId());
+                user.setStatusFlag(driverInfo.getAuthenticationStatus());
+            }
+        }
+        if ("1".equals(commonUser.getLoginFlag())){
+            CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>().eq("common_id",user.getId()));
+            if (cargoOwnerInfo != null){
+                user.setStatusFlag(cargoOwnerInfo.getAuthenticationStatus());
+            }
         }
         return user;
     }

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

@@ -7,7 +7,6 @@ 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.entity.OrderInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CompanyInfoMapper;
@@ -78,14 +77,15 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
     @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);
+            companyInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            companyInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            boolean one = this.updateById(companyInfo);
+        if(one){
+            return "OK";
+        }{
+            return "NG";
         }
-        return "OK";
     }
 
     /**
@@ -130,4 +130,60 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
         page.setTotal(dataCount == null ? 0 : dataCount);
         return page;
     }
+
+    /**
+     *企业审核后台管理列表
+     * @param
+     * @return
+     */
+    @Override
+    public Page<CompanyInfo> selectCompanyPage(CompanyInfo companyInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (companyInfo.getCurrentPage() - 1)
+                * companyInfo.getPageSize());
+        //模糊查询
+        pageView.put("searchKeyWord", companyInfo.getSearchKeyWord());
+        pageView.put("searchType", companyInfo.getSearchType());
+        pageView.put("pageSize", companyInfo.getPageSize());
+        pageView.put("currentPage", companyInfo.getCurrentPage());
+        // 查询公司总数
+        Integer dataCount = baseMapper.getCountByConditions(pageView);
+        List<CompanyInfo> dataList = baseMapper.getListByConditions(pageView);
+        Page<CompanyInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(companyInfo.getCurrentPage());
+        page.setSize(companyInfo.getPageSize());
+        return page;
+    }
+
+    /**
+     * 审核/ 禁用
+     *
+     * @param companyInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String examine(CompanyInfo companyInfo) {
+        //查询列表
+        CompanyInfo companyInfo1 = this.selectById(companyInfo.getId());
+
+        if (companyInfo1 != null) {
+            //通过
+            if ("1".equals(companyInfo.getFlag())) {
+                companyInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                companyInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+            }
+            //驳回
+            else if("2".equals(companyInfo.getFlag())){
+                companyInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                companyInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+            }
+            //更改信息
+            this.updateById(companyInfo1);
+            return "OK";
+        }
+        return "NG";
+    }
 }

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

@@ -1,9 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
 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.CargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
@@ -14,7 +17,9 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -28,18 +33,42 @@ import java.util.List;
 public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, DriverCarInfo> implements IDriverCarInfoService {
 
     /**
-     *车辆列表
+     *后台管理车辆列表
      * @param driverCarInfo
      * @return
      */
     @Override
-    public List<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo) {
+    public Page<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (driverCarInfo.getCurrentPage() - 1)
+                * driverCarInfo.getPageSize());
+        //公司id
+        pageView.put("searchType", driverCarInfo.getSearchType());
+        pageView.put("searchKeyWord", driverCarInfo.getSearchKeyWord());
+        pageView.put("pageSize", driverCarInfo.getPageSize());
+        pageView.put("currentPage", driverCarInfo.getCurrentPage());
+        // 查询车辆总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<DriverCarInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<DriverCarInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(driverCarInfo.getCurrentPage());
+        page.setSize(driverCarInfo.getPageSize());
+        return page;
+    }
+
+    /**
+     *司机车辆列表
+     * @param driverCarInfo
+     * @return
+     */
+    @Override
+    public List<DriverCarInfo> selectDriverCar(DriverCarInfo driverCarInfo) {
         EntityWrapper<DriverCarInfo> driverCarInfoEntityWrapper = new EntityWrapper<>();
         driverCarInfoEntityWrapper
                 .eq(DriverCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                .eq("status_key",driverCarInfo.getStatusKey())
-                .like("car_number",driverCarInfo.getSearch());
-//        .and("car_number like "+ driverCarInfo.getSearch()+"or ");
+                .eq(DriverCarInfo.QueryFiles.DRIVER_ID,driverCarInfo.getDriverId());
         List<DriverCarInfo> driverCarInfoList = this.selectList(driverCarInfoEntityWrapper);
         return driverCarInfoList;
     }
@@ -106,6 +135,41 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, D
         //查询车辆信息
         DriverCarInfo driverCarInfo1 = this.selectById(driverCarInfo.getId());
         if (driverCarInfo1 != null) {
+            //通过
+            if ("1".equals(driverCarInfo.getFlag())) {
+                driverCarInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                driverCarInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+//                geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
+//                UnimallMessage messageDO = new UnimallMessage();
+//                messageDO.setAdminId(commonUser.getId());
+//                messageDO.setCustomer(commonUser.getUserName());
+//                messageDO.setOperation("审核通知");
+//                messageDO.setResult("您的司机认证申请已审核通过");
+//                messageDO.setGmtUpdate(new java.util.Date());
+//                messageDO.setGmtCreate(new Date());
+//                messageDO.setTaskId(IdGenerator.generateUUID());
+//                messageDO.setCompanyId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+//                messageDO.setPath("XXXXX");
+//                webSocket.sendOneMessage(messageDO);
+            }
+            //驳回
+            else if("2".equals(driverCarInfo.getFlag())){
+                driverCarInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                driverCarInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+                this.updateById(driverCarInfo);
+//                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
+//                UnimallMessage messageDO = new UnimallMessage();
+//                messageDO.setAdminId(commonUser.getId());
+//                messageDO.setCustomer(commonUser.getUserName());
+//                messageDO.setOperation("驳回通知");
+//                messageDO.setResult("您的司机认证申请已被驳回");
+//                messageDO.setGmtUpdate(new java.util.Date());
+//                messageDO.setGmtCreate(new Date());
+//                messageDO.setTaskId(IdGenerator.generateUUID());
+//                messageDO.setCompanyId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+//                messageDO.setPath("XXXXX");
+//                webSocket.sendOneMessage(messageDO);
+            }
             //更改车辆状态信息
             this.updateById(driverCarInfo1);
             return "OK";

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

@@ -86,6 +86,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
      * @param driverPhone
      * @return
      */
+    @Override
     public DriverInfo firstAuthentication(String driverPhone) {
         DriverInfo driverInfo1 = this.selectOne(new EntityWrapper<DriverInfo>()
         .eq("driver_phone",driverPhone)
@@ -230,6 +231,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
             else if("2".equals(driverInfo.getFlag())){
                 driverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 driverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
+                this.updateById(driverInfo);
 //                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());

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

@@ -34,6 +34,7 @@ public class DriverPayeeInfoServiceImpl extends ServiceImpl<DriverPayeeInfoMappe
         List<DriverPayeeInfo> driverPayeeInfoList = this.selectList(new EntityWrapper<DriverPayeeInfo>()
                 .eq(DriverPayeeInfo.QueryFiles.DRIVER_ID, driverPayeeInfo.getDriverId())
                 .eq(DriverPayeeInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+
         return driverPayeeInfoList;
     }
 

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

@@ -1,12 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
-import com.yh.saas.plugin.yiliangyiyun.entity.PatformAnagementEgulations;
-import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.PatformAnagementEgulationsMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IPatformAnagementEgulationsService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -15,7 +14,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,7 +40,8 @@ public class PatformAnagementEgulationsServiceImpl extends ServiceImpl<PatformAn
     public String add(PatformAnagementEgulations patformAnagementEgulations) {
         //新增主键id
         patformAnagementEgulations.setId(IdGenerator.generateUUID());
-
+        patformAnagementEgulations.setStatusKey(StatusEnum.PLATFORM_REVIEWED.getFlag());
+        patformAnagementEgulations.setStatus(StatusEnum.PLATFORM_REVIEWED.getName());
         // 操作主表数据
         boolean one = this.insert(patformAnagementEgulations);
         if (one) {
@@ -56,13 +58,14 @@ public class PatformAnagementEgulationsServiceImpl extends ServiceImpl<PatformAn
      */
     @Override
     public String edit(PatformAnagementEgulations patformAnagementEgulations) {
-        //查询发布任务
-        PatformAnagementEgulations patformAnagementEgulations1 = this.selectById(patformAnagementEgulations.getId());
-        //除审核中状态其余可编辑
-        if(patformAnagementEgulations1 != null) {
-            this.updateById(patformAnagementEgulations1);
+        patformAnagementEgulations.setStatusKey(StatusEnum.PLATFORM_REVIEWED.getFlag());
+        patformAnagementEgulations.setStatus(StatusEnum.PLATFORM_REVIEWED.getName());
+        boolean one = this.updateById(patformAnagementEgulations);
+        if(one){
+            return "OK";
+        }{
+            return "NG";
         }
-        return "OK";
     }
 
 
@@ -71,12 +74,77 @@ public class PatformAnagementEgulationsServiceImpl extends ServiceImpl<PatformAn
      * @return
      */
     @Override
-    public PatformAnagementEgulations show() {
-        //查询发布任务
-        PatformAnagementEgulations patformAnagementEgulations = this.selectOne(new EntityWrapper<PatformAnagementEgulations>().eq("delete_flag","0"));
-        //查询货主姓名
+    public PatformAnagementEgulations show(String id) {
+        PatformAnagementEgulations patformAnagementEgulations = this.selectById(id);
         return patformAnagementEgulations;
     }
 
+    /**
+     * 删除
+     * @param id
+     */
+    @Override
+    public void delete(String id) {
+        PatformAnagementEgulations patformAnagementEgulations = this.selectById(id);
+        if (patformAnagementEgulations != null) {
+            this.deleteById(patformAnagementEgulations.getId());
+        }
+    }
+
+    /**
+     *平台规定管理列表
+     * @param
+     * @return
+     */
+    @Override
+    public Page<PatformAnagementEgulations> selectPage(PatformAnagementEgulations patformAnagementEgulations) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (patformAnagementEgulations.getCurrentPage() - 1)
+                * patformAnagementEgulations.getPageSize());
+        //模糊查询
+        pageView.put("searchKeyWord", patformAnagementEgulations.getSearchKeyWord());
+        pageView.put("searchType", patformAnagementEgulations.getSearchType());
+        pageView.put("pageSize", patformAnagementEgulations.getPageSize());
+        pageView.put("currentPage", patformAnagementEgulations.getCurrentPage());
+        // 查询规定总数
+        Integer dataCount = baseMapper.getCountByConditions(pageView);
+        List<PatformAnagementEgulations> dataList = baseMapper.getListByConditions(pageView);
+        Page<PatformAnagementEgulations> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(patformAnagementEgulations.getCurrentPage());
+        page.setSize(patformAnagementEgulations.getPageSize());
+        return page;
+    }
+
+    /**
+     * 审核
+     *
+     * @param patformAnagementEgulations
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String examine(PatformAnagementEgulations patformAnagementEgulations) {
+        //查询
+        PatformAnagementEgulations patformAnagementEgulations1 = this.selectById(patformAnagementEgulations.getId());
+
+        if (patformAnagementEgulations1 != null) {
+            //通过
+            if ("1".equals(patformAnagementEgulations.getFlag())) {
+                patformAnagementEgulations1.setStatusKey(StatusEnum.PLATFORM_COMPLETED.getFlag());
+                patformAnagementEgulations1.setStatus(StatusEnum.PLATFORM_COMPLETED.getName());
+            }
+            //驳回
+            else if("2".equals(patformAnagementEgulations.getFlag())){
+                patformAnagementEgulations1.setStatusKey(StatusEnum.PLATFORM_FAILED.getFlag());
+                patformAnagementEgulations1.setStatus(StatusEnum.PLATFORM_FAILED.getName());
+            }
+            //更改信息
+            this.updateById(patformAnagementEgulations1);
+            return "OK";
+        }
+        return "NG";
+    }
 
 }

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

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.ProvinceCityInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.ProvinceCityInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IProvinceCityInfoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 省会城市信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-03-30
+ */
+@Service
+public class ProvinceCityInfoServiceImpl extends ServiceImpl<ProvinceCityInfoMapper, ProvinceCityInfo> implements IProvinceCityInfoService {
+
+}

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

@@ -4,18 +4,24 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.common.support.util.StringUtils;
+import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
+import com.yh.saas.plugin.yiliangyiyun.exception.YException;
+import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.PublishTaskInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.util.EntCoordUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -44,14 +50,38 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
     private INewsInfoService newsInfoService;
     @Autowired
     private IRepaymentInfoService repaymentInfoService;
+    @Autowired
+    private IProvinceCityInfoService provinceCityInfoService;
 
     /**
      * 地球半径,单位 km
      */
     private static final double EARTH_RADIUS = 6378.137;
 
+
+    /**
+     * 每天0点更新
+     */
+    @Transactional
+    @Scheduled(cron = "0 20 1 * * ?")
+    public void rushTime() {
+        List<PublishTaskInfo> publishTaskInfos = this.selectList(new EntityWrapper<PublishTaskInfo>().eq("delete_flag", "0"));
+        if (!CollectionUtils.isEmpty(publishTaskInfos)) {
+            publishTaskInfos.forEach(publishTaskInfo -> {
+                publishTaskInfo.setRefreshTimes("0");
+            });
+        }
+        List<CargoOwnerInfo> cargoOwnerInfos = cargoOwnerInfoService.selectList(new EntityWrapper<CargoOwnerInfo>().eq("delete_flag", "0"));
+        if (!CollectionUtils.isEmpty(cargoOwnerInfos)) {
+            cargoOwnerInfos.forEach(cargoOwnerInfo -> {
+                cargoOwnerInfo.setRefreshTimes(0L);
+            });
+        }
+    }
+
     /**
      * 任务列表
+     *
      * @param publishTaskInfo
      * @return
      */
@@ -79,17 +109,38 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 货源列表
+     *
      * @param publishTaskInfo
      * @return
      */
     @Override
-    public Page<GoodsSourceView> selectGoodsSource(PublishTaskInfo publishTaskInfo) {
+    public Page<PublishTaskInfo> selectGoodsSource(PublishTaskInfo publishTaskInfo) {
         Map<String, Object> pageView = new HashMap<>();
         pageView.put("startRecord", (publishTaskInfo.getCurrentPage() - 1)
                 * publishTaskInfo.getPageSize());
+        //自定义装货区
+        if (!StringUtils.isEmpty(publishTaskInfo.getLoadingPlace())) {
+            String loading = publishTaskInfo.getLoadingPlace();
+            boolean loadingt = loading.contains(",");
+            if (loadingt) {
+                List<String> loadingList = Arrays.asList(loading.split(","));
+                pageView.put("loadingList", loadingList);
+            } else {
+                pageView.put("loadingPlace", publishTaskInfo.getLoadingPlace());
+            }
+        }
+        //自定义卸货区
+        if (!StringUtils.isEmpty(publishTaskInfo.getUnLoadingPlace())) {
+            String unloading = publishTaskInfo.getUnLoadingPlace();
+            boolean unloadingt = unloading.contains(",");
+            if (unloadingt) {
+                List<String> unloadingList = Arrays.asList(unloading.split(","));
+                pageView.put("unloadingList", unloadingList);
+            } else {
+                pageView.put("unLoadingPlace", publishTaskInfo.getUnLoadingPlace());
+            }
+        }
         //用户id
-        pageView.put("loadingPlace", publishTaskInfo.getLoadingPlace());
-        pageView.put("unLoadingPlace", publishTaskInfo.getUnLoadingPlace());
         pageView.put("loadingPlaceCity", publishTaskInfo.getLoadingPlaceCity());
         pageView.put("unLoadingPlaceCity", publishTaskInfo.getUnLoadingPlaceCity());
         pageView.put("searchKeyWord", publishTaskInfo.getSearchKeyWord());
@@ -98,28 +149,24 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         pageView.put("currentPage", publishTaskInfo.getCurrentPage());
         // 查询货源总数
         Integer dataCount = baseMapper.getCounstByCondition(pageView);
-        Page<GoodsSourceView> page = new Page<>();
-        //货源列表
-        List<GoodsSourceView> goodsSourceViews = new ArrayList<>();
-        //新增货源对象
-        GoodsSourceView goodsSourceView = new GoodsSourceView();
+        Page<PublishTaskInfo> page = new Page<>();
         //推荐货源列表
-        if("1".equals(publishTaskInfo.getSearchKeyWord())){
+        if ("1".equals(publishTaskInfo.getSearchKeyWord())) {
             List<PublishTaskInfo> dataList = baseMapper.getListsByCondition(pageView);
-            goodsSourceView.setPublishTaskInfoList(dataList);
+            page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         }
         //按时间排序货源列表
-        else if("2".equals(publishTaskInfo.getSearchKeyWord())) {
+        else if ("2".equals(publishTaskInfo.getSearchKeyWord())) {
             List<PublishTaskInfo> dataList = baseMapper.getListByTimeCondition(pageView);
-            goodsSourceView.setPublishTaskInfoList(dataList);
+            page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         }
         //按距离排序货源列表
-        else{
+        else {
             List<PublishTaskInfo> dataList = baseMapper.getListsByDistanceCondition(pageView);
-            if("3".equals(publishTaskInfo.getSearchKeyWord())){
-                if(!CollectionUtils.isEmpty(dataList)){
+            if ("3".equals(publishTaskInfo.getSearchKeyWord())) {
+                if (!CollectionUtils.isEmpty(dataList)) {
                     //查询发货地经纬度
-                    for(int i = 0; i < dataList.size(); i++){
+                    for (int i = 0; i < dataList.size(); i++) {
                         PublishTaskInfo publishTaskInfo1 = dataList.get(i);
                         //发货地经纬度
                         double lat2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLatitude()));
@@ -135,30 +182,86 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
                                 Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
                         // 弧长乘地球半径, 返回单位: 千米
-                        s =  s * EARTH_RADIUS;
+                        s = s * EARTH_RADIUS;
                         publishTaskInfo1.setCargoDistance(Math.floor(s));
                     }
                     dataList.sort(Comparator.comparing(PublishTaskInfo::getCargoDistance));
                 }
+                page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
             }
-            //新增货源对象
-            goodsSourceView.setPublishTaskInfoList(dataList);
         }
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(publishTaskInfo.getCurrentPage());
+        page.setSize(publishTaskInfo.getPageSize());
+        return page;
+    }
+
+    /**
+     * 周边信息列表
+     *
+     * @param publishTaskInfo
+     * @return
+     */
+    @Override
+    public Page<PublishTaskInfo> selectPeripheralInfo(PublishTaskInfo publishTaskInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (publishTaskInfo.getCurrentPage() - 1)
+                * publishTaskInfo.getPageSize());
+        //用户id
+        pageView.put("loadingPlaceCity", publishTaskInfo.getLoadingPlaceCity());
+        pageView.put("searchType", publishTaskInfo.getSearchType());
+        pageView.put("pageSize", publishTaskInfo.getPageSize());
+        pageView.put("currentPage", publishTaskInfo.getCurrentPage());
+        //所有周边信息列表
+        List<PublishTaskInfo> dataList1 = baseMapper.getAllListsByCondition(pageView);
         //周边信息列表
         List<PublishTaskInfo> publishTaskInfoList = new ArrayList<>();
-        //所有货源列表
-        List<PublishTaskInfo> dataList1 = baseMapper.getAllListsByCondition(pageView);
-            if (!CollectionUtils.isEmpty(dataList1)){
+        if (!CollectionUtils.isEmpty(dataList1)) {
+            if (!StringUtils.isEmpty(publishTaskInfo.getLoadingPlaceCity())) {
                 //查询发货地经纬度
-                for(int i = 0; i < dataList1.size(); i++){
+                for (int i = 0; i < dataList1.size(); i++) {
                     PublishTaskInfo publishTaskInfo1 = dataList1.get(i);
                     //发货地经纬度
                     double lng2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLongitude()));
                     double lat2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLatitude()));
                     //根据装货城市获取经纬度
-                    String str =  EntCoordUtil.getCoordinate(publishTaskInfo.getLoadingPlaceCity());
+                    String str = EntCoordUtil.getCoordinate(publishTaskInfo.getLoadingPlaceCity());
+                    String str1 = str.substring(0, str.indexOf(","));//经度
+                    String str2 = str.substring(str1.length() + 1, str.length());//纬度
+
+                    //装货地经纬度
+                    double lng1 = Math.toRadians(Double.valueOf(str1));
+                    double lat1 = Math.toRadians(Double.valueOf(str2));
+                    // 纬度之差
+                    double a = lat1 - lat2;
+                    // 经度之差
+                    double b = lng1 - lng2;
+                    // 计算两点距离的公式
+                    double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
+                            Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
+                    // 弧长乘地球半径, 返回单位: 千米
+                    s = s * EARTH_RADIUS;
+                    if (s <= 300) {
+                        //货距小于300公里，放入周边信息列表
+                        publishTaskInfo1.setCargoDistance(Math.floor(s));
+                        publishTaskInfoList.add(publishTaskInfo1);
+                    }
+                }
+            } else {
+                //查询发货地经纬度
+                for (int i = 0; i < dataList1.size(); i++) {
+                    PublishTaskInfo publishTaskInfo1 = dataList1.get(i);
+                    //发货地经纬度
+                    double lng2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLongitude()));
+                    double lat2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLatitude()));
+                    //根据省名查询省会城市
+                    ProvinceCityInfo provinceCityInfo = provinceCityInfoService.selectOne(new EntityWrapper<ProvinceCityInfo>()
+                            .like("province", publishTaskInfo.getLoadingPlace()));
+                    //根据省会城市获取经纬度
+                    String str = EntCoordUtil.getCoordinate(provinceCityInfo.getCity());
                     String str1 = str.substring(0, str.indexOf(","));//经度
-                    String str2 = str.substring(str1.length()+1, str.length());//纬度
+                    String str2 = str.substring(str1.length() + 1, str.length());//纬度
+
                     //装货地经纬度
                     double lng1 = Math.toRadians(Double.valueOf(str1));
                     double lat1 = Math.toRadians(Double.valueOf(str2));
@@ -170,22 +273,20 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
                             Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
                     // 弧长乘地球半径, 返回单位: 千米
-                    s =  s * EARTH_RADIUS;
-                    if (s <= 300){
+                    s = s * EARTH_RADIUS;
+                    if (s <= 300) {
                         //货距小于300公里，放入周边信息列表
                         publishTaskInfo1.setCargoDistance(Math.floor(s));
                         publishTaskInfoList.add(publishTaskInfo1);
                     }
                 }
-                //按货距排序，倒序
-                publishTaskInfoList.sort(Comparator.comparing(PublishTaskInfo::getCargoDistance));
-                //新增周边信息列表
-                goodsSourceView.setPublishTaskInfoLists(publishTaskInfoList);
             }
-        //将货源对象放入货源列表
-        goodsSourceViews.add(goodsSourceView);
-        page.setRecords(goodsSourceViews == null ? Lists.newArrayList() : goodsSourceViews);
-        page.setTotal(dataCount == null ? publishTaskInfoList.size() : dataCount + publishTaskInfoList.size());
+            //按货距排序，倒序
+            publishTaskInfoList.sort(Comparator.comparing(PublishTaskInfo::getCargoDistance));
+        }
+        Page<PublishTaskInfo> page = new Page<>();
+        page.setRecords(publishTaskInfoList == null ? Lists.newArrayList() : publishTaskInfoList);
+        page.setTotal(publishTaskInfoList.size() == 0 ? 0 : publishTaskInfoList.size());
         page.setCurrent(publishTaskInfo.getCurrentPage());
         page.setSize(publishTaskInfo.getPageSize());
         return page;
@@ -209,6 +310,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 发布任务
+     *
      * @param publishTaskInfo
      * @return
      */
@@ -222,20 +324,20 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         String date = f.format(new Date(System.currentTimeMillis()));
         //查询当天任务集合
         List<PublishTaskInfo> publishTaskInfoList = this.selectPublishTaskInfoList();//调用Service中的方法
-        if(publishTaskInfoList.size() > 0){
+        if (publishTaskInfoList.size() > 0) {
             //取第一条数据的编号
             String n = publishTaskInfoList.get(0).getTaskNo();
             //截取编号后6位
             int intNumber = Integer.parseInt(n.substring(10));
             intNumber++;
             String number = String.valueOf(intNumber);
-            for (int i = 0; i < 6; i++){
+            for (int i = 0; i < 6; i++) {
                 number = number.length() < 6 ? "0" + number : number;
             }
             //编号自增
             number = "YS" + date + number;
             publishTaskInfo.setTaskNo(number);
-        }else{
+        } else {
             //如果当天数据为空，生成第一条数据
             String number = "YS" + date + "000001";
             publishTaskInfo.setTaskNo(number);
@@ -254,22 +356,22 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 编辑任务
+     *
      * @param publishTaskInfo
      * @return
      */
     @Override
     public String editTask(PublishTaskInfo publishTaskInfo) {
-        //查询发布任务
-        PublishTaskInfo publishTaskInfo1 = this.selectById(publishTaskInfo.getId());
         //除审核中状态其余可编辑
-        if(publishTaskInfo1 != null && publishTaskInfo1.getStatusKey() != "1") {
-            this.updateById(publishTaskInfo1);
+        if (publishTaskInfo != null) {
+            this.updateById(publishTaskInfo);
         }
         return "OK";
     }
 
     /**
      * 查看任务
+     *
      * @param id
      * @return
      */
@@ -279,15 +381,15 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         PublishTaskInfo publishTaskInfo = this.selectById(id);
         //查询货主姓名
         CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>()
-            .eq("common_id",publishTaskInfo.getCommonId()));
-        if (cargoOwnerInfo != null){
+                .eq("common_id", publishTaskInfo.getCommonId()));
+        if (cargoOwnerInfo != null) {
             publishTaskInfo.setCargoOwnerName(cargoOwnerInfo.getName());
             publishTaskInfo.setCargoOwnerPhone(cargoOwnerInfo.getPhone());
         }
         //查询货主头像
         CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>()
-            .eq("id",publishTaskInfo.getCommonId()));
-        if (commonUser != null){
+                .eq("id", publishTaskInfo.getCommonId()));
+        if (commonUser != null) {
             publishTaskInfo.setCargoOwnerPortrait(commonUser.getAvatarUrl());
         }
         return publishTaskInfo;
@@ -295,6 +397,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 删除任务
+     *
      * @param id
      * @return
      */
@@ -306,6 +409,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
     /**
      * 显示隐藏
+     *
      * @param id
      * @return
      */
@@ -324,13 +428,44 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         }
     }
 
+    /**
+     * 刷新
+     *
+     * @param publishTaskInfo
+     * @return
+     */
+    @Override
+    public String refresh(PublishTaskInfo publishTaskInfo) {
+        //查询发布任务
+        PublishTaskInfo publishTaskInfo1 = this.seeTask(publishTaskInfo.getId());
+        if (publishTaskInfo1 != null) {
+            //将此发布任务刷新次数变为1
+            publishTaskInfo1.setRefreshTimes("1");
+            this.updateById(publishTaskInfo1);
+        }
+        //查询货主
+        CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>()
+                .eq(CargoOwnerInfo.QueryFiles.COMMON_ID, publishTaskInfo.getCommonId())
+                .eq(CargoOwnerInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        if (cargoOwnerInfo.getRefreshTimes() < 3) {
+            //如果货主今日刷新次数小于3次，次数+1
+            Long number = cargoOwnerInfo.getRefreshTimes() + 1;
+            cargoOwnerInfo.setRefreshTimes(number);
+            cargoOwnerInfoService.updateById(cargoOwnerInfo);
+        } else {
+            throw new YException(YExceptionEnum.REFRESH_TIMES_UPPER_LIMIT);
+        }
+        return "ok";
+    }
+
     /**
      * 抢单
+     *
      * @param publishTaskInfo
      * @return
      */
     @Override
-    public String addOrder(PublishTaskInfo publishTaskInfo){
+    public String addOrder(PublishTaskInfo publishTaskInfo) {
         //新增订单信息
         OrderInfo orderInfo = new OrderInfo();
         orderInfo.setId(IdGenerator.generateUUID());
@@ -341,20 +476,20 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         String date = f.format(new Date(System.currentTimeMillis()));
         //查询订单集合
         List<OrderInfo> orderInfoList = orderInfoService.selectOrderInfoList();//调用Service中的方法
-        if(orderInfoList.size() > 0){
+        if (orderInfoList.size() > 0) {
             //取第一条数据的编号
             String n = orderInfoList.get(0).getOrderNo();
             //截取编号后6位
             int intNumber = Integer.parseInt(n.substring(10));
             intNumber++;
             String orderNumber = String.valueOf(intNumber);
-            for (int i = 0; i < 6; i++){
-                 orderNumber = orderNumber.length() < 6 ? "0" + orderNumber : orderNumber;
+            for (int i = 0; i < 6; i++) {
+                orderNumber = orderNumber.length() < 6 ? "0" + orderNumber : orderNumber;
             }
-             //编号自增
-             orderNumber = "CY" + date + orderNumber;
-             orderInfo.setOrderNo(orderNumber);
-        }else{
+            //编号自增
+            orderNumber = "CY" + date + orderNumber;
+            orderInfo.setOrderNo(orderNumber);
+        } else {
             //如果当天数据为空，生成第一条数据
             String orderNumber = "CY" + date + "000001";
             orderInfo.setOrderNo(orderNumber);
@@ -380,13 +515,13 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED.getName());
         orderInfo.setCargoOwnerStatusKey(StatusEnum.OWNER_PENDING_STATEMENT.getFlag());
         orderInfo.setCargoOwnerStatus(StatusEnum.OWNER_PENDING_STATEMENT.getName());
-        boolean one =  orderInfoService.insert(orderInfo);
+        boolean one = orderInfoService.insert(orderInfo);
 
         // 向货主发送信息
         NewsInfo newsInfo = new NewsInfo();
         newsInfo.setCrtCommonId(orderInfo.getCommonId());
         newsInfo.setReCommonId(orderInfo.getCargoCommonId());
-        newsInfo.setNewsContent("司机 "+orderInfo.getDriverName()+"师傅 已接单，订单编号"+orderInfo.getOrderNo()+"。");
+        newsInfo.setNewsContent("司机 " + orderInfo.getDriverName() + "师傅 已接单，订单编号" + orderInfo.getOrderNo() + "。");
         newsInfo.setNumber(orderInfo.getOrderNo());
         newsInfo.setBussId(orderInfo.getId());
         newsInfo.setNewsTypeKey("2");
@@ -408,7 +543,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         repaymentInfo.setId(IdGenerator.generateUUID());
         repaymentInfo.setOrderId(orderInfo.getId());
         boolean four = repaymentInfoService.insert(repaymentInfo);
-        if( one && two && tre && four){
+        if (one && two && tre && four) {
             return "ok";
         } else {
             return "NG";
@@ -416,8 +551,6 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
     }
 
 
-
-
     /**
      * 审核
      *
@@ -426,7 +559,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String examine(PublishTaskInfo publishTaskInfo){
+    public String examine(PublishTaskInfo publishTaskInfo) {
         //查询列表
         PublishTaskInfo publishTaskInfo1 = this.selectById(publishTaskInfo.getId());
 
@@ -449,7 +582,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 //                webSocket.sendOneMessage(messageDO);
             }
 //            驳回
-            else if("2".equals(publishTaskInfo.getFlag())){
+            else if ("2".equals(publishTaskInfo.getFlag())) {
                 publishTaskInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 publishTaskInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
 //                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
@@ -465,7 +598,6 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 //                messageDO.setPath("XXXXX");
 //                webSocket.sendOneMessage(messageDO);
             }
-
             //更改信息
             this.updateById(publishTaskInfo1);
             return "OK";

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

@@ -48,7 +48,7 @@
             OR lower(contacts) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(contact_phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
-        ORDER BY topping_flag DESC ,create_date DESC
+        ORDER BY topping_flag DESC ,update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>

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

@@ -2,4 +2,72 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.CargoOwnerCompInfoMapper">
 
+    <!-- 获得所属公司总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        select
+        count(c.id)
+        FROM cargo_owner_comp_info c
+        LEFT JOIN cargo_owner_info co on co.id = c.cargo_owner_id and co.delete_flag = 0
+        WHERE c.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND c.status_key = '5'
+            </if>
+            <if test="searchType == 2">
+                AND c.status_key = '7'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '9'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(co.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(co.phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.company) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+    </select>
+
+
+
+    <!-- 所属公司列表查询 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo">
+        SELECT
+        c.id,
+        co.name as name,
+        co.phone as phone,
+        co.card_number as cardNumber,
+        c.company as company,
+        c.certificate_address_url as certificateAddressUrl,
+        c.authorization_deadline as authorizationDeadline,
+        c.status_key as statusKey,
+        c.status as status,
+        c.create_date as createDate,
+        c.update_date as updateDate,
+        cu.avatar_url as avatarUrl
+        FROM cargo_owner_comp_info c
+        LEFT JOIN cargo_owner_info co on co.id = c.cargo_owner_id and co.delete_flag = 0
+        LEFT JOIN common_user cu on cu.id = co.common_id and cu.delete_flag = 0
+        WHERE c.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND c.status_key = '5'
+            </if>
+            <if test="searchType == 2">
+                AND c.status_key = '7'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '9'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(co.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(co.phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.company) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        ORDER BY c.update_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>

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

@@ -2,12 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.CargoOwnerInfoMapper">
 
-
-
     <!-- 获得货主总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
-        count(1)
+        count(id)
         FROM cargo_owner_info
         WHERE
         delete_flag = '0'
@@ -37,41 +35,41 @@
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo">
         SELECT
-        id,
-        name
-        common_id as commonId,
-        comp_id as compId,
-        card_address_url as cardAddressUrl,
-        card_back_address_url as cardBackAddressUrl,
-        phone ,
-        card_number as cardNumber,
-        card_validity_date as cardValidityDate,
-        disable_status_flag as disableStatusFlag,
-        authentication_status_key as authenticationStatusKey,
-        authentication_status as authenticationStatus,
-        update_date as updateDate
-        FROM cargo_owner_info
-        WHERE
-        delete_flag = '0'
+        c.id,
+        c.name,
+        c.common_id as commonId,
+        c.comp_id as compId,
+        c.card_address_url as cardAddressUrl,
+        c.card_back_address_url as cardBackAddressUrl,
+        c.phone,
+        c.card_number as cardNumber,
+        c.card_validity_date as cardValidityDate,
+        c.authentication_status_key as authenticationStatusKey,
+        c.authentication_status as authenticationStatus,
+        c.update_date as updateDate,
+        cu.avatar_url as avatarUrl
+        FROM cargo_owner_info c
+        LEFT JOIN common_user cu on cu.id = c.common_id and cu.delete_flag = 0
+        WHERE c.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND authentication_status_key = '1'
+                AND c.authentication_status_key = '1'
             </if>
             <if test="searchType == 2">
-                AND authentication_status_key = '3'
+                AND c.authentication_status_key = '3'
             </if>
             <if test="searchType == 3">
-                AND authentication_status_key = '5'
+                AND c.authentication_status_key = '5'
             </if>
             <if test="searchType == 4">
-                AND authentication_status_key = '7'
+                AND c.authentication_status_key = '7'
             </if>
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(name) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            AND (lower(c.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
-        ORDER BY d.update_date DESC
+        ORDER BY c.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>

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

@@ -13,13 +13,16 @@
             AND (lower(company_name) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
     </select>
-    <!-- 获得公司列表 -->
+
+
+    <!-- 获得已认证所有公司列表 -->
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo">
         SELECT
         id,
         company_name as companyName,
-        legal_person_name as legalPersonName
+        legal_person_name as legalPersonName,
+        advance_freight_service as advanceFreightService
         FROM company_info
         WHERE delete_flag = '0'
         AND status_key = '5'
@@ -28,4 +31,76 @@
         </if>
         ORDER BY create_date DESC
     </select>
+
+
+    <!-- 获得公司总数后台管理 -->
+    <select id="getCountByConditions" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(c.id)
+        FROM company_info c
+        LEFT JOIN common_user cu on cu.id = c.common_id and cu.delete_flag = 0
+        WHERE c.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND c.status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND c.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '5'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(c.legal_person_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.company_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(cu.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+    </select>
+    <!-- 获得公司列表后台管理 -->
+    <select id="getListByConditions" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo">
+        SELECT
+        c.id,
+        c.company_name as companyName,
+        c.unified_social_credit_code as unifiedSocialCreditCode,
+        c.legal_person_name as legalPersonName,
+        c.phone,
+        c.registered_paid_amount as registeredPaidAmount,
+        c.land_ownership as landOwnership,
+        c.site_lease_date as siteLeaseDate,
+        c.business_term_date as businessTermDate,
+        c.business_license_address_url as businessLicenseAddressUrl,
+        c.property_address_url as propertyAddressUrl,
+        c.advance_freight_service as advanceFreightService,
+        c.status_key as statusKey,
+        c.status,
+        c.create_date as createDate,
+        c.update_date as updateDate,
+        cu.phone as accountNumber,
+        cu.avatar_url as avatarUrl
+        FROM company_info c
+        LEFT JOIN common_user cu on cu.id = c.common_id and cu.delete_flag = 0
+        WHERE c.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND c.status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND c.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '5'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(c.legal_person_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.company_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(cu.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        ORDER BY c.create_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>

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

@@ -1,107 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.DriverCarInfoMapper">
-    <!-- 获得司机总数 -->
+    <!-- 获得车辆总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
-        count(1)
-        from(
-        SELECT
-        d.id
+        count(c.id)
         FROM driver_info d
-        left join driver_car_info c on d.id=c.driver_id
-        left join driver_payee_info p on d.id=p.driver_id
-        WHERE
-        d.delete_flag = '0'
-        <if test="residentCityProvincial != null and residentCityProvincial != ''">
-            AND d.resident_city_provincial = #{residentCityProvincial}
-        </if>
-        <if test="residentCityMunicipal != null and residentCityMunicipal != ''">
-            AND d.resident_city_municipal = #{residentCityMunicipal}
-        </if>
+        left join driver_car_info c on d.id=c.driver_id and c.delete_flag = 0
+        WHERE d.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND d.authentication_status_key = '1'
+                AND c.status_key = '1'
             </if>
             <if test="searchType == 2">
-                AND d.authentication_status_key = '7'
+                AND c.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '5'
             </if>
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(d.driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(d.driver_phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(d.number_card) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(c.car_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
-        <if test="pcFlag != null and pcFlag != ''">
-            <if test="pcFlag == 0">
-                AND d.common_id = #{commonId}
-            </if>
-            <if test="pcFlag == 1">
-                AND d.comp_id = #{compId}
-            </if>
-        </if>
-        group by
-        d.id
-        ) t
-
     </select>
-    <!-- 司机列表查询 -->
+    <!-- 车辆列表查询 -->
     <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo">
         SELECT
-        d.id,
+        c.id,
         d.driver_name as driverName,
-        d.cover,
-        d.number_card as numberCard,
         d.driver_phone as driverPhone,
-        d.resident_city_provincial as residentCityProvincial,
-        d.resident_city_municipal as residentCityMunicipal,
-        d.disable_status_flag as disableStatusFlag,
-        d.authentication_status_key as authenticationStatusKey,
-        d.authentication_status as authenticationStatus,
-        d.disable_reasons as disableReasons,
-        d.address_url as addressUrl,
+        d.number_card as numberCard,
+        c.car_number as carNumber,
+        c.address_url as addressUrl,
         d.card_address_url as cardAddressUrl,
-        p.payee_address_url as payeeAddressUrl,
-        p.card_address_url as cardAddressUrl1,
-        d.update_date as updateDate
+        d.card_back_address_url as cardBackAddressUrl,
+        c.status,
+        c.update_date as updateDate,
+        cu.avatar_url as avatarUrl
         FROM driver_info d
-        left join driver_car_info c on d.id=c.driver_id
-        left join driver_payee_info p on d.id=p.driver_id
-        WHERE
-        d.delete_flag = '0'
-        <if test="residentCityProvincial != null and residentCityProvincial != ''">
-            AND d.resident_city_provincial = #{residentCityProvincial}
-        </if>
-        <if test="residentCityMunicipal != null and residentCityMunicipal != ''">
-            AND d.resident_city_municipal = #{residentCityMunicipal}
-        </if>
+        left join driver_car_info c on d.id=c.driver_id and c.delete_flag = 0
+        LEFT JOIN common_user cu on cu.id = d.common_id and cu.delete_flag = 0
+        WHERE d.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND d.authentication_status_key = '1'
+                AND c.status_key = '1'
             </if>
             <if test="searchType == 2">
-                AND d.authentication_status_key = '7'
+                AND c.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '5'
             </if>
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(d.driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(d.driver_phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(d.number_card) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(c.car_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
-        <if test="pcFlag != null and pcFlag != ''">
-            <if test="pcFlag == 0">
-                AND d.common_id = #{commonId}
-            </if>
-            <if test="pcFlag == 1">
-                AND d.comp_id = #{compId}
-            </if>
-        </if>
-        group by
-        d.id
-        ORDER BY d.update_date DESC
+        ORDER BY c.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>

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

@@ -6,7 +6,7 @@
     <!-- 获得司机总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
     select
-    count(1)
+    count(id)
     FROM driver_info
     WHERE
     delete_flag = '0'
@@ -38,44 +38,48 @@
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo">
         SELECT
-        id,
-        driver_name as driverName,
-        cover,
-        number_card as numberCard,
-        driver_phone as driverPhone,
-        resident_city_provincial as residentCityProvincial,
-        resident_city_municipal as residentCityMunicipal,
-        disable_status_flag as disableStatusFlag,
-        authentication_status_key as authenticationStatusKey,
-        authentication_status as authenticationStatus,
-        disable_reasons as disableReasons,
-        address_url as addressUrl,
-        card_address_url as cardAddressUrl,
-    --         payee_address_url as payeeAddressUrl,
-    --         card_address_url as cardAddressUrl1,
-        update_date as updateDate
-        FROM driver_info
-        WHERE
-        delete_flag = '0'
+        d.id,
+        d.common_id as commonId,
+        d.driver_name as driverName,
+        d.driver_phone as driverPhone,
+        d.number_card as numberCard,
+        d.card_address_url as cardAddressUrl,
+        d.card_back_address_url as cardBackAddressUrl,
+        d.driver_license_home_page as driverLicenseHomePage,
+        d.driver_license_back_page as driverLicenseBackPage,
+        d.driving_license_home_page as drivingLicenseHomePage,
+        d.driving_license_back_page as drivingLicenseBackPage,
+        d.trailer_license_home_page as trailerLicenseHomePage,
+        d.trailer_license_back_page as trailerLicenseBackPage,
+        d.qualification_certificate as qualificationCertificate,
+        d.operation_certificate as operationCertificate,
+        d.trailer_operation_certificate as trailerOperationCertificate,
+        d.authentication_status_key as authenticationStatusKey,
+        d.authentication_status as authenticationStatus,
+        d.create_date as createDate,
+        d.update_date as updateDate,
+        c.avatar_url as avatarUrl
+        FROM driver_info d
+        LEFT JOIN common_user c on c.id = d.common_id and c.delete_flag = 0
+        WHERE d.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND authentication_status_key = '1'
+                AND d.authentication_status_key = '1'
             </if>
             <if test="searchType == 2">
-                AND authentication_status_key = '3'
+                AND d.authentication_status_key = '3'
             </if>
             <if test="searchType == 3">
-                AND authentication_status_key = '5'
+                AND d.authentication_status_key = '5'
             </if>
             <if test="searchType == 4">
-                AND authentication_status_key = '7'
+                AND d.authentication_status_key = '7'
             </if>
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(driver_phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(number_card) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(number_card) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            AND (lower(d.driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(d.driver_phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(d.number_card) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         ORDER BY d.update_date DESC
         <if test="currentPage != null and currentPage != ''">

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

@@ -19,6 +19,7 @@
         id,
         crt_common_id as crtCommonId,
         re_common_id as reCommonId,
+        news_title as newsTitle,
         news_content as newsContent,
         number as number,
         news_type_key as newsTypeKey,

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

@@ -50,65 +50,67 @@
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo">
         SELECT
-        id,
-        order_no as orderNo,
-        goods_name as goodsName,
-        send_private as sendPrivate,
-        send_city as sendCity,
-        send_area as sendArea,
-        unload_private as unloadPrivate,
-        unload_city as unloadCity,
-        unload_area as unloadArea,
-        comp_name as compName,
-        cargo_owner as cargoOwner,
-        distance,
-        freight,
-        billing_method as billingMethod,
-        order_status as orderStatus,
-        order_status_key as orderStatusKey,
-        create_date as createDate,
-        update_date as updateDate
-        FROM order_info
-        WHERE delete_flag = '0'
-        AND common_id = #{commonId}
+        o.id,
+        o.order_no as orderNo,
+        o.goods_name as goodsName,
+        o.send_private as sendPrivate,
+        o.send_city as sendCity,
+        o.send_area as sendArea,
+        o.unload_private as unloadPrivate,
+        o.unload_city as unloadCity,
+        o.unload_area as unloadArea,
+        o.comp_name as compName,
+        o.cargo_owner as cargoOwner,
+        o.distance,
+        o.freight,
+        o.billing_method as billingMethod,
+        o.order_status as orderStatus,
+        o.order_status_key as orderStatusKey,
+        o.create_date as createDate,
+        o.update_date as updateDate,
+        c.id as carrierId
+        FROM order_info o
+        LEFT JOIN carrier_info c on c.order_id = o.id and c.delete_flag = 0
+        WHERE o.delete_flag = '0'
+        AND o.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(send_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_area) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            AND (lower(o.order_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.cargo_owner) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.send_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.unload_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.unload_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.unload_area) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND order_status_key = '1'
-                OR order_status_key = '3'
+                AND o.order_status_key = '1'
+                OR o.order_status_key = '3'
             </if>
             <if test="searchType == 2">
-                AND order_status_key = '5'
-                OR order_status_key = '7'
-                OR order_status_key = '9'
-                OR order_status_key = '11'
-                OR order_status_key = '13'
+                AND o.order_status_key = '5'
+                OR o.order_status_key = '7'
+                OR o.order_status_key = '9'
+                OR o.order_status_key = '11'
+                OR o.order_status_key = '13'
             </if>
             <if test="searchType == 3">
-                AND order_status_key = '15'
-                OR order_status_key = '17'
-                OR order_status_key = '19'
-                OR order_status_key = '21'
+                AND o.order_status_key = '15'
+                OR o.order_status_key = '17'
+                OR o.order_status_key = '19'
+                OR o.order_status_key = '21'
             </if>
             <if test="searchType == 4">
-                AND order_status_key = '23'
-                OR order_status_key = '29'
+                AND o.order_status_key = '23'
+                OR o.order_status_key = '29'
             </if>
             <if test="searchType == 5">
-                AND order_status_key = '25'
-                OR order_status_key = '27'
+                AND o.order_status_key = '25'
+                OR o.order_status_key = '27'
             </if>
         </if>
-        ORDER BY create_date DESC
+        ORDER BY o.create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>
@@ -173,75 +175,78 @@
     <select id="getListsByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo">
         SELECT
-        id,
-        order_no as orderNo,
-        goods_name as goodsName,
-        send_private as sendPrivate,
-        send_city as sendCity,
-        send_area as sendArea,
-        unload_private as unloadPrivate,
-        unload_city as unloadCity,
-        unload_area as unloadArea,
-        comp_name as compName,
-        cargo_owner as cargoOwner,
-        distance,
-        freight,
-        billing_method as billingMethod,
-        order_status as orderStatus,
-        order_status_key as orderStatusKey,
-        create_date as createDate,
-        update_date as updateDate
-        FROM order_info
-        WHERE delete_flag = '0'
-        AND cargo_common_id = #{cargoCommonId}
+        o.id,
+        o.order_no as orderNo,
+        o.goods_name as goodsName,
+        o.send_private as sendPrivate,
+        o.send_city as sendCity,
+        o.send_area as sendArea,
+        o.unload_private as unloadPrivate,
+        o.unload_city as unloadCity,
+        o.unload_area as unloadArea,
+        o.comp_name as compName,
+        o.cargo_owner as cargoOwner,
+        o.driver_name as driverName,
+        o.distance,
+        o.freight,
+        o.billing_method as billingMethod,
+        o.cargo_owner_status as cargoOwnerStatus,
+        o.cargo_owner_status_key as cargoOwnerStatusKey,
+        o.create_date as createDate,
+        o.update_date as updateDate,
+        d.driver_call as driverCall
+        FROM order_info o
+        LEFT JOIN driver_info d on d.common_id = o.common_id and d.delete_flag = 0
+        WHERE o.delete_flag = '0'
+        AND o.cargo_common_id = #{cargoCommonId}
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(order_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_area) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            AND (lower(o.order_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.send_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.unload_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.unload_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(o.unload_area) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND cargo_owner_status_key = '1'
+                AND o.cargo_owner_status_key = '1'
             </if>
             <if test="searchType == 2">
-                AND cargo_owner_status_key = '3'
+                AND o.cargo_owner_status_key = '3'
             </if>
             <if test="searchType == 3">
-                AND cargo_owner_status_key = '5'
-                OR cargo_owner_status_key = '7'
-                OR cargo_owner_status_key = '9'
-                OR cargo_owner_status_key = '11'
-                OR cargo_owner_status_key = '13'
+                AND o.cargo_owner_status_key = '5'
+                OR o.cargo_owner_status_key = '7'
+                OR o.cargo_owner_status_key = '9'
+                OR o.cargo_owner_status_key = '11'
+                OR o.cargo_owner_status_key = '13'
             </if>
             <if test="searchType == 4">
-                AND cargo_owner_status_key = '15'
-                OR cargo_owner_status_key = '17'
-                OR cargo_owner_status_key = '19'
-                OR cargo_owner_status_key = '21'
+                AND o.cargo_owner_status_key = '15'
+                OR o.cargo_owner_status_key = '17'
+                OR o.cargo_owner_status_key = '19'
+                OR o.cargo_owner_status_key = '21'
             </if>
             <if test="searchType == 5">
-                AND cargo_owner_status_key = '23'
+                AND o.cargo_owner_status_key = '23'
             </if>
             <if test="searchType == 6">
-                AND cargo_owner_status_key = '25'
+                AND o.cargo_owner_status_key = '25'
             </if>
             <if test="searchType == 7">
-                AND cargo_owner_status_key = '27'
+                AND o.cargo_owner_status_key = '27'
             </if>
             <if test="searchType == 8">
-                AND cargo_owner_status_key = '29'
+                AND o.cargo_owner_status_key = '29'
             </if>
             <if test="searchType == 9">
-                AND cargo_owner_status_key = '31'
-                OR cargo_owner_status_key = '33'
+                AND o.cargo_owner_status_key = '31'
+                OR o.cargo_owner_status_key = '33'
             </if>
         </if>
-        ORDER BY create_date DESC
+        ORDER BY o.create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>

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

@@ -2,4 +2,65 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.PatformAnagementEgulationsMapper">
 
+    <!-- 获得规定总数后台管理 -->
+    <select id="getCountByConditions" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(id)
+        FROM patform_anagement_egulations
+        WHERE delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND status_key = '5'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(version_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(compilation_unit) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(editor) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+    </select>
+    <!-- 获得规定列表后台管理 -->
+    <select id="getListByConditions" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.PatformAnagementEgulations">
+        SELECT
+        id,
+        compilation_unit as compilationUnit,
+        editor,
+        submitter,
+        version_number as versionNumber,
+        version_description as versionDescription,
+        content,
+        status_key as statusKey,
+        status,
+        create_date as createDate,
+        update_date as updateDate
+        FROM patform_anagement_egulations
+        WHERE delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND status_key = '5'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(version_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(compilation_unit) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(editor) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        ORDER BY create_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.ProvinceCityInfoMapper">
+
+</mapper>

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

@@ -4,70 +4,112 @@
     <!-- 获得任务总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
-        COUNT(id)
-        FROM publish_task_info
-        WHERE delete_flag = '0'
-        AND common_id = #{commonId}
+        COUNT(p.id)
+        FROM publish_task_info p
+        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        WHERE p.delete_flag = '0'
+        <if test="commonId != null and commonId != ''">
+            AND p.common_id = #{commonId}
+        </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_city) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            AND (lower(p.task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND p.status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND p.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND p.status_key = '5'
+            </if>
         </if>
     </select>
     <!-- 获得任务列表 -->
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo">
         SELECT
-        id,
-        task_no as taskNo,
-        cargo_owner as cargoOwner,
-        goods_name as goodsName,
-        send_private as sendPrivate,
-        send_city as sendCity,
-        send_area as sendArea,
-        send_detailed_address as sendDetailedAddress,
-        send_longitude as sendLongitude,
-        send_latitude as sendLatitude,
-        unsend_longitude as unsendLongitude,
-        unsend_latitude as unsendLatitude,
-        unload_private as unloadPrivate,
-        unload_city as unloadCity,
-        unload_area as unloadArea,
-        unload_detailed_address as unloadDetailedAddress,
-        distance,
-        billing_method as billingMethod,
-        freight_price as freightPrice,
-        freight_advance as freightAdvance,
-        sender,
-        sender_phone as senderPhone,
-        receiver,
-        receiver_phone as receiverPhone,
-        weight,
-        loading_date_start as loadingDateStart,
-        loading_date_end as loadingDateEnd,
-        car_length_small as carLengthSmall,
-        car_length as carLength,
-        load_weight_small as loadWeightSmall,
-        load_weight as loadWeight,
-        task_description as taskDescription,
-        task_validity as taskValidity,
-        car_model as carModel,
-        status,
-        create_date as createDate,
-        update_date as updateDate
-        FROM publish_task_info
-        WHERE delete_flag = '0'
-        AND common_id = #{commonId}
+        p.id,
+        p.task_no as taskNo,
+        p.cargo_owner as cargoOwner,
+        p.goods_name as goodsName,
+        p.send_private as sendPrivate,
+        p.send_city as sendCity,
+        p.send_area as sendArea,
+        p.send_detailed_address as sendDetailedAddress,
+        p.send_longitude as sendLongitude,
+        p.send_latitude as sendLatitude,
+        p.unsend_longitude as unsendLongitude,
+        p.unsend_latitude as unsendLatitude,
+        p.unload_private as unloadPrivate,
+        p.unload_city as unloadCity,
+        p.unload_area as unloadArea,
+        p.unload_detailed_address as unloadDetailedAddress,
+        p.distance,
+        p.billing_method as billingMethod,
+        p.freight_price as freightPrice,
+        p.freight_advance as freightAdvance,
+        p.sender,
+        p.sender_phone as senderPhone,
+        p.receiver,
+        p.receiver_phone as receiverPhone,
+        p.weight,
+        p.loading_date_start as loadingDateStart,
+        p.loading_date_end as loadingDateEnd,
+        p.car_length_small as carLengthSmall,
+        p.car_length as carLength,
+        p.load_weight_small as loadWeightSmall,
+        p.load_weight as loadWeight,
+        p.task_description as taskDescription,
+        p.task_validity as taskValidity,
+        p.car_model as carModel,
+        p.show_hide as showHide,
+        p.refresh_times as refreshTimes,
+        p.status,
+        p.create_date as createDate,
+        p.update_date as updateDate,
+        c.name as cargoOwnerName,
+        c.phone as cargoOwnerPhone,
+        cu.avatar_url as cargoOwnerPortrait
+        FROM publish_task_info p
+        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
+        WHERE p.delete_flag = '0'
+        <if test="commonId != null and commonId != ''">
+            AND p.common_id = #{commonId}
+        </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(unload_city) like lower(CONCAT('%',#{searchKeyWord},'%')))
-        </if>
-        ORDER BY create_date DESC
+            AND (lower(p.task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.send_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_private) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_area) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(p.unload_city) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND p.status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND p.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND p.status_key = '5'
+            </if>
+        </if>
+        ORDER BY p.create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>
@@ -100,6 +142,20 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
     </select>
 
     <!-- 获得货源推荐列表 -->
@@ -159,6 +215,20 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
         UNION ALL
         SELECT
         p.id,
@@ -210,6 +280,20 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
         ) t
         ORDER BY
         t.createDate DESC,
@@ -272,6 +356,20 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
         ORDER BY p.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
@@ -337,6 +435,20 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
         UNION ALL
         SELECT
         p.id,
@@ -390,13 +502,27 @@
             AND (lower(p.unload_private) like lower(CONCAT('%',#{unLoadingPlace},'%'))
             OR lower(p.unload_area) like lower(CONCAT('%',#{unLoadingPlace},'%')))
         </if>
+        <if test="loadingList != null and loadingList.size > 0">
+            and(
+            <foreach collection="loadingList" item="loadingListValue" open="(" close=")" separator="or">
+                lower(p.send_area) like lower(CONCAT('%',#{loadingListValue},'%'))
+            </foreach>
+            )
+        </if>
+        <if test="unloadingList != null and unloadingList.size > 0">
+            and(
+            <foreach collection="unloadingList" item="unloadingListValue" open="(" close=")" separator="or">
+                lower(p.unload_area) like lower(CONCAT('%',#{unloadingListValue},'%'))
+            </foreach>
+            )
+        </if>
         ) t
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
 
-    <!-- 获得货源列表 -->
+    <!-- 获得周边信息列表 -->
     <select id="getAllListsByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo">
         SELECT