修改

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

@@ -97,12 +97,6 @@ public class CommonUser extends BaseModel<CommonUser> {
     @TableField(exist = false)
     private String verifyCode;
 
-    /**
-     * 身份信息
-     */
-    @TableField(exist = false)
-    private String  identityFlag ;
-
     /**
      * 身份信息
      */
@@ -125,6 +119,17 @@ public class CommonUser extends BaseModel<CommonUser> {
     @TableField(exist = false)
     private String token ;
 
+    /**
+     * 禁用标识（1禁用2启用）
+     */
+    @TableField(exist = false)
+    private String disableFlag;
+    /**
+     * 身份标识（1货主2司机）
+     */
+    @TableField(exist = false)
+    private String identityFlag;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -97,6 +97,22 @@ public class HyCargoOwnerInfo extends BaseModel<HyCargoOwnerInfo> {
      * 后台管理状态
      */
     private String backStageStatus;
+    /**
+     * 禁用前状态key
+     */
+    private String disablingStatusKey;
+    /**
+     * 禁用前状态
+     */
+    private String disablingStatus;
+    /**
+     * 禁用前后台管理状态key
+     */
+    private String disablingBackStatusKey;
+    /**
+     * 禁用前后台管理状态
+     */
+    private String disablingBackStatus;
     /**
      * 刷新次数
      */

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

@@ -137,6 +137,22 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
      * 后台管理状态
      */
     private String backStageStatus;
+    /**
+     * 禁用前状态key
+     */
+    private String disablingStatusKey;
+    /**
+     * 禁用前状态
+     */
+    private String disablingStatus;
+    /**
+     * 禁用前后台管理状态key
+     */
+    private String disablingBackStatusKey;
+    /**
+     * 禁用前后台管理状态
+     */
+    private String disablingBackStatus;
     /**
      * 身份证过期标识（1是）
      */

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

@@ -60,7 +60,7 @@ public class ExceptionDefinition {
             new ServiceExceptionDefinition(11011, "用户电话已经存在，不能添加");
 
     public static  ServiceExceptionDefinition USER_CAN_NOT_ACTICE =
-            new ServiceExceptionDefinition(11012, "用户处于冻结状态，请联系管理员");
+            new ServiceExceptionDefinition(11012, "账号审核中！");
 
     public static  ServiceExceptionDefinition USER_PHONE_HAS_ENTRY =
             new ServiceExceptionDefinition(11013, "手机号为空");

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

@@ -234,19 +234,19 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
                 newsInfoService.addNewsInfo(newsInfo);
             }
             // 禁用
-            else if("3".equals(hyCargoOwnerInfo.getFlag())){
-                hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
-                hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
-                hyCargoOwnerInfo1.setBackStageStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
-                hyCargoOwnerInfo1.setBackStageStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
-            }
-            //启用
-            else if("4".equals(hyCargoOwnerInfo.getFlag())){
-                hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
-                hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
-                hyCargoOwnerInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
-                hyCargoOwnerInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
-            }
+//            else if("3".equals(hyCargoOwnerInfo.getFlag())){
+//                hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+//                hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+//                hyCargoOwnerInfo1.setBackStageStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+//                hyCargoOwnerInfo1.setBackStageStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+//            }
+//            //启用
+//            else if("4".equals(hyCargoOwnerInfo.getFlag())){
+//                hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+//                hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+//                hyCargoOwnerInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
+//                hyCargoOwnerInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
+//            }
             //更改信息
             this.updateById(hyCargoOwnerInfo1);
             return "OK";

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverInfoService;
 import org.apache.commons.collections.CollectionUtils;
@@ -298,6 +299,72 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String editUserInfo(CommonUser commonUser) throws ServiceException {
+        //货主
+        if ("1".equals(commonUser.getIdentityFlag())){
+            //查询货主信息
+            HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
+                    .eq("common_id",commonUser.getId()).eq("delete_flag","0"));
+            if (hyCargoOwnerInfo != null){
+                //禁用
+                if("1".equals(commonUser.getDisableFlag())){
+                    hyCargoOwnerInfo.setDisablingStatusKey(hyCargoOwnerInfo.getAuthenticationStatusKey());
+                    hyCargoOwnerInfo.setDisablingStatus(hyCargoOwnerInfo.getAuthenticationStatus());
+                    hyCargoOwnerInfo.setDisablingBackStatusKey(hyCargoOwnerInfo.getBackStageStatusKey());
+                    hyCargoOwnerInfo.setDisablingBackStatus(hyCargoOwnerInfo.getBackStageStatus());
+                    hyCargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+                    hyCargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+                    hyCargoOwnerInfo.setBackStageStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+                    hyCargoOwnerInfo.setBackStageStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+                    commonUser.setStatus(0);
+                }
+                //启用
+                else {
+                    hyCargoOwnerInfo.setAuthenticationStatusKey(hyCargoOwnerInfo.getDisablingStatusKey());
+                    hyCargoOwnerInfo.setAuthenticationStatus(hyCargoOwnerInfo.getDisablingStatus());
+                    hyCargoOwnerInfo.setBackStageStatus(hyCargoOwnerInfo.getDisablingBackStatusKey());
+                    hyCargoOwnerInfo.setBackStageStatusKey(hyCargoOwnerInfo.getDisablingBackStatus());
+                    hyCargoOwnerInfo.setDisablingStatusKey(null);
+                    hyCargoOwnerInfo.setDisablingStatus(null);
+                    hyCargoOwnerInfo.setDisablingBackStatusKey(null);
+                    hyCargoOwnerInfo.setDisablingBackStatus(null);
+                    commonUser.setStatus(1);
+                }
+                cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+            }
+        }
+        //司机
+        else {
+            //查询司机信息
+            HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
+                    .eq("common_id",commonUser.getId()).eq("delete_flag","0"));
+            if (hyDriverInfo != null){
+                //禁用
+                if("1".equals(commonUser.getDisableFlag())){
+                    hyDriverInfo.setDisablingStatusKey(hyDriverInfo.getAuthenticationStatusKey());
+                    hyDriverInfo.setDisablingStatus(hyDriverInfo.getAuthenticationStatus());
+                    hyDriverInfo.setDisablingBackStatusKey(hyDriverInfo.getBackStageStatusKey());
+                    hyDriverInfo.setDisablingBackStatus(hyDriverInfo.getBackStageStatus());
+                    hyDriverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+                    hyDriverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+                    hyDriverInfo.setBackStageStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+                    hyDriverInfo.setBackStageStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+                    commonUser.setStatus(0);
+                }
+                //启用
+                else {
+                    hyDriverInfo.setAuthenticationStatusKey(hyDriverInfo.getDisablingStatusKey());
+                    hyDriverInfo.setAuthenticationStatus(hyDriverInfo.getDisablingStatus());
+                    hyDriverInfo.setBackStageStatus(hyDriverInfo.getDisablingBackStatusKey());
+                    hyDriverInfo.setBackStageStatusKey(hyDriverInfo.getDisablingBackStatus());
+                    hyDriverInfo.setDisablingStatusKey(null);
+                    hyDriverInfo.setDisablingStatus(null);
+                    hyDriverInfo.setDisablingBackStatusKey(null);
+                    hyDriverInfo.setDisablingBackStatus(null);
+                    commonUser.setStatus(1);
+                }
+                driverInfoService.updateById(hyDriverInfo);
+            }
+        }
         this.updateById(commonUser);
         return "ok";
     }
@@ -490,7 +557,6 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
             throw new AppServiceException(ExceptionDefinition.USER_PHONE_OR_PASSWORD_NOT_CORRECT);
         }
 
-
         CommonUser userDO = this.selectById(user.getId());
         //检查帐号是否已经冻结
         if (userDO.getStatus() == 0) {

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

@@ -243,19 +243,19 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
                 newsInfo.setNewsType("系统消息");
                 newsInfoService.addNewsInfo(newsInfo);
             }
-            // 禁用
-            else if("3".equals(hyDriverInfo.getFlag())){
-                hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
-                hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
-                hyDriverInfo1.setBackStageStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
-                hyDriverInfo1.setBackStageStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
-            }
-            else if("4".equals(hyDriverInfo.getFlag())){
-                hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
-                hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
-                hyDriverInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
-                hyDriverInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
-            }
+//            // 禁用
+//            else if("3".equals(hyDriverInfo.getFlag())){
+//                hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+//                hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+//                hyDriverInfo1.setBackStageStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+//                hyDriverInfo1.setBackStageStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+//            }
+//            else if("4".equals(hyDriverInfo.getFlag())){
+//                hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+//                hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+//                hyDriverInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
+//                hyDriverInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
+//            }
             //更改司机信息
             this.updateById(hyDriverInfo1);
             return "OK";

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/PositionUtil.java

@@ -3,6 +3,8 @@ package com.yh.saas.plugin.yiliangyiyun.util;
 import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.GpsView;
 
+import java.text.DecimalFormat;
+
 /**
  * 各地图API坐标转换;
  * WGS84坐标系：国际上通用的坐标系;
@@ -39,8 +41,9 @@ public class PositionUtil {
         double mgLat = lat + dLat;
         double mgLon = lon + dLon;
         GpsView gpsView = new GpsView();
-        gpsView.setMgLon(String.valueOf(mgLon));
-        gpsView.setMgLat(String.valueOf(mgLat));
+        DecimalFormat df = new DecimalFormat("0.000000");
+        gpsView.setMgLon(String.valueOf(df.format(mgLon)));
+        gpsView.setMgLat(String.valueOf(df.format(mgLat)));
         return gpsView;
     }
 

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

@@ -46,7 +46,7 @@
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerInfo">
         SELECT
         o.id,
-        o.common_id as commonId,
+        case when o.common_id is null then c.id else o.common_id end as commonId,
         case when o.name is null then c.user_name else o.name end as name,
         c.phone as phone,
         o.card_number as cardNumber,

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

@@ -55,7 +55,7 @@
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo">
         SELECT
         d.id,
-        d.common_id as commonId,
+        case when d.common_id is null then c.id else d.common_id end as commonId,
         case when d.driver_name is null then c.user_name else d.driver_name end as driverName,
         case when d.driver_phone is null then c.phone else d.driver_phone end as driverPhone,
         d.number_card as numberCard,