1

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","hy_release_goods_info");
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","enabled_info");
     }
 
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/EnabledInfoController.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 2023-07-17
+ */
+@RestController
+@RequestMapping("/enabledInfo")
+public class EnabledInfoController {
+
+}
+

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

@@ -0,0 +1,58 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.io.Serializable;
+
+
+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;
+
+/**
+ * <p>
+ * 记录启用信息
+ * </p>
+ *
+ * @author Gdc
+ * @since 2023-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("enabled_info")
+public class EnabledInfo extends BaseModel<EnabledInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 职员ID
+     */
+    private String staffId;
+    /**
+     * 公司ID
+     */
+    private String compId;
+    /**
+     * 功能类型(1跳过司机车辆审核)
+     */
+    private String functionType;
+    /**
+     * 是否启用的 0:否 1:是
+     */
+    private String enabled;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.EnabledInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录启用信息 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2023-07-17
+ */
+public interface EnabledInfoMapper extends BaseMapper<EnabledInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.EnabledInfo;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 记录启用信息 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2023-07-17
+ */
+public interface IEnabledInfoService extends IService<EnabledInfo> {
+
+}

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

@@ -6,19 +6,13 @@ 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.HyCommonSysParameter;
-import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverCarInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.NewsInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.Root;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.DriverCarInfoMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.ICommonSysParameterService;
-import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.yh.saas.plugin.yiliangyiyun.service.IDriverInfoService;
-import com.yh.saas.plugin.yiliangyiyun.service.INewsInfoService;
 import com.yh.saas.plugin.yiliangyiyun.util.*;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +48,8 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
     @Autowired
     private IDriverCarInfoService driverCarInfoService;
     @Autowired
+    private IEnabledInfoService enabledInfoService;
+    @Autowired
     private GeTuiUtils geTuiUtils;
     @Value("${com.changyuntong.env}")
     private String ENV;
@@ -125,10 +121,36 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
         if (hyDriverCarInfos.size() > 0) {
             throw new YException(YExceptionEnum.DRIVER_CAR_ERROR);
         }
-        hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-        hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-        hyDriverCarInfo.setEscalationStatusKey(StatusEnum.PLATFORM_UNDER_REVIEW.getFlag());
-        hyDriverCarInfo.setEscalationStatus(StatusEnum.PLATFORM_UNDER_REVIEW.getName());
+        EnabledInfo enabledInfo=enabledInfoService.selectOne(new EntityWrapper<EnabledInfo>()
+                .eq("function_type","1"));
+        if (enabledInfo!=null){
+            //自动跳过车辆审核
+            if ("1".equals(enabledInfo.getEnabled())) {
+                hyDriverCarInfo.setStatusKey(StatusEnum.TASK_REJECT.getFlag());
+                hyDriverCarInfo.setStatus(StatusEnum.TASK_REJECT.getName());
+                hyDriverCarInfo.setEscalationStatusKey(StatusEnum.NOT_REPORTED.getFlag());
+                hyDriverCarInfo.setEscalationStatus(StatusEnum.NOT_REPORTED.getName());
+                hyDriverCarInfo.setReportedStatusKey(StatusEnum.NO_REPORTED.getFlag());
+                hyDriverCarInfo.setReportedStatus(StatusEnum.NO_REPORTED.getName());
+                hyDriverCarInfo.setDrivingOverdueFlag("0");
+                hyDriverCarInfo.setTrailerOverdueFlag("0");
+                hyDriverCarInfo.setOperationOverdueFlag("0");
+                hyDriverCarInfo.setTrailerOperationOverdueFlag("0");
+                hyDriverCarInfo.setRejectReasonDescription(null);
+            }
+            else {
+                hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+                hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+                hyDriverCarInfo.setEscalationStatusKey(StatusEnum.PLATFORM_UNDER_REVIEW.getFlag());
+                hyDriverCarInfo.setEscalationStatus(StatusEnum.PLATFORM_UNDER_REVIEW.getName());
+            }
+        }
+        else {
+            hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            hyDriverCarInfo.setEscalationStatusKey(StatusEnum.PLATFORM_UNDER_REVIEW.getFlag());
+            hyDriverCarInfo.setEscalationStatus(StatusEnum.PLATFORM_UNDER_REVIEW.getName());
+        }
 //        //查询车辆类型key值
 //        HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
 //                .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo.getVehicleType()));

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

@@ -21,11 +21,9 @@ import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -52,7 +50,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
     @Autowired
     private ICommonUserService commonUserService;
     @Autowired
-    private IOrderInfoService orderInfoService;
+    private IEnabledInfoService enabledInfoService;
     @Autowired
     private IDriverInfoService driverInfoService;
     @Autowired
@@ -163,12 +161,43 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         hyDriverInfo.setId(IdGenerator.generateUUID());
         hyDriverInfo.setFirstFlag("1");
         hyDriverInfo.setAdvancePayment(0.7d);
-        hyDriverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-        hyDriverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-        hyDriverInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
-        hyDriverInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
-        hyDriverInfo.setEscalationStatusKey(StatusEnum.PLATFORM_UNDER_REVIEW.getFlag());
-        hyDriverInfo.setEscalationStatus(StatusEnum.PLATFORM_UNDER_REVIEW.getName());
+        EnabledInfo enabledInfo=enabledInfoService.selectOne(new EntityWrapper<EnabledInfo>()
+                .eq("function_type","1"));
+        if (enabledInfo!=null){
+            //自动跳过司机审核
+            if ("1".equals(enabledInfo.getEnabled())){
+                hyDriverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                hyDriverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                hyDriverInfo.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
+                hyDriverInfo.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
+                hyDriverInfo.setEscalationStatusKey(StatusEnum.NOT_REPORTED.getFlag());
+                hyDriverInfo.setEscalationStatus(StatusEnum.NOT_REPORTED.getName());
+                hyDriverInfo.setReportedStatusKey(StatusEnum.NO_REPORTED.getFlag());
+                hyDriverInfo.setReportedStatus(StatusEnum.NO_REPORTED.getName());
+                hyDriverInfo.setOverdueFlag("0");
+                hyDriverInfo.setDriverOverdueFlag("0");
+                hyDriverInfo.setQualificationOverdueFlag("0");
+                hyDriverInfo.setRejectReason(null);
+                hyDriverInfo.setRejectReasonDescription(null);
+                hyDriverInfo.setPassOnce("1");
+            }
+            else {
+                hyDriverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+                hyDriverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+                hyDriverInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
+                hyDriverInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
+                hyDriverInfo.setEscalationStatusKey(StatusEnum.PLATFORM_UNDER_REVIEW.getFlag());
+                hyDriverInfo.setEscalationStatus(StatusEnum.PLATFORM_UNDER_REVIEW.getName());
+            }
+        }
+        else {
+            hyDriverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            hyDriverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            hyDriverInfo.setBackStageStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
+            hyDriverInfo.setBackStageStatus(StatusEnum.TO_BE_REVIEWED.getName());
+            hyDriverInfo.setEscalationStatusKey(StatusEnum.PLATFORM_UNDER_REVIEW.getFlag());
+            hyDriverInfo.setEscalationStatus(StatusEnum.PLATFORM_UNDER_REVIEW.getName());
+        }
         //判断司机电话是否唯一
         List<HyDriverInfo> hyDriverInfos =
                 this.selectList(new EntityWrapper<HyDriverInfo>()

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

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.EnabledInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.EnabledInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IEnabledInfoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 记录启用信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2023-07-17
+ */
+@Service
+public class EnabledInfoServiceImpl extends ServiceImpl<EnabledInfoMapper, EnabledInfo> implements IEnabledInfoService {
+
+}

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

@@ -1359,10 +1359,29 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         String qrCode =qrCodeUtil.generateQRCodeImageTask(publishTaskInfo.getId()+","+number,publishTaskInfo.getId(),publishTaskInfo.getSendArea()+" - "+publishTaskInfo.getUnloadArea()+"（"+publishTaskInfo.getFreightPrice()+tmp+"）");
         publishTaskInfo.setQrCode(qrCode);
         publishTaskInfo.setShowHide("1");
-        publishTaskInfo.setStatus(StatusEnum.TASK_REVIEWING.getName());
-        publishTaskInfo.setStatusKey(StatusEnum.TASK_REVIEWING.getFlag());
-        publishTaskInfo.setBackStageStatus(StatusEnum.PLATFORM_REVIEWED.getName());
-        publishTaskInfo.setBackStageStatusKey(StatusEnum.PLATFORM_REVIEWED.getFlag());
+        //查询货主是否为公司
+        if (publishTaskInfo.getCompId() != null && !publishTaskInfo.getCompId().isEmpty()) {
+            //查询该公司是否自动跳过平台审核
+            HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(publishTaskInfo.getCompId());
+            if ("1".equals(hyCompanyInfo.getSkipAudit())) {
+                publishTaskInfo.setStatusKey(StatusEnum.TASK_REJECT.getFlag());
+                publishTaskInfo.setStatus(StatusEnum.TASK_REJECT.getName());
+                publishTaskInfo.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
+                publishTaskInfo.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
+            }
+            else{
+                publishTaskInfo.setStatus(StatusEnum.TASK_REVIEWING.getName());
+                publishTaskInfo.setStatusKey(StatusEnum.TASK_REVIEWING.getFlag());
+                publishTaskInfo.setBackStageStatus(StatusEnum.PLATFORM_REVIEWED.getName());
+                publishTaskInfo.setBackStageStatusKey(StatusEnum.PLATFORM_REVIEWED.getFlag());
+            }
+        }
+        else{
+            publishTaskInfo.setStatus(StatusEnum.TASK_REVIEWING.getName());
+            publishTaskInfo.setStatusKey(StatusEnum.TASK_REVIEWING.getFlag());
+            publishTaskInfo.setBackStageStatus(StatusEnum.PLATFORM_REVIEWED.getName());
+            publishTaskInfo.setBackStageStatusKey(StatusEnum.PLATFORM_REVIEWED.getFlag());
+        }
         // 操作主表数据
         boolean one = this.insert(publishTaskInfo);
         if (one) {
@@ -1623,10 +1642,28 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                 orderInfo.setPayeeIdCard(hyCarCaptainInfo.getIdCard());
             }
         }
-        orderInfo.setOrderStatusKey(StatusEnum.OWNER_CONFIRMED.getFlag());
-        orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED.getName());
-        orderInfo.setCargoOwnerStatusKey(StatusEnum.OWNER_PENDING_STATEMENT.getFlag());
-        orderInfo.setCargoOwnerStatus(StatusEnum.OWNER_PENDING_STATEMENT.getName());
+        //查询货主是否为公司
+        if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
+            //查询该公司是否自动跳过平台审核 自动接单
+            HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
+            if ("1".equals(hyCompanyInfo.getSkipAudit())) {
+                orderInfo.setOrderStatusKey(StatusEnum.DRIVER_ORDER_LOADING.getFlag());
+                orderInfo.setOrderStatus(StatusEnum.DRIVER_ORDER_LOADING.getName());
+                orderInfo.setCargoOwnerStatusKey(StatusEnum.DRIVER_ORDER_LOADING.getFlag());
+                orderInfo.setCargoOwnerStatus(StatusEnum.DRIVER_ORDER_LOADING.getName());
+            } else {
+                orderInfo.setOrderStatusKey(StatusEnum.OWNER_CONFIRMED.getFlag());
+                orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED.getName());
+                orderInfo.setCargoOwnerStatusKey(StatusEnum.OWNER_PENDING_STATEMENT.getFlag());
+                orderInfo.setCargoOwnerStatus(StatusEnum.OWNER_PENDING_STATEMENT.getName());
+            }
+        }
+        else{
+            orderInfo.setOrderStatusKey(StatusEnum.OWNER_CONFIRMED.getFlag());
+            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);
 
         // 向货主发送信息

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/EnabledInfoMapper.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.EnabledInfoMapper">
+
+</mapper>