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

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

@@ -410,32 +410,6 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
             DBConnection();
             String sUserId = null;
             String password = null;
-            if (excSelect("select * from t_user t where t.MOBILE = '" + commonUser.getPhone() + "'", this.coon) > 0) {
-                excUpdate("update t_user t set t.LAST_LOGIN_TIME = now() where t.MOBILE = '" + commonUser.getPhone() + "'", this.coon);
-                sUserId = excSelect1("select * from t_user t where t.MOBILE = '" + commonUser.getPhone() + "'", this.coon);
-            } else {
-                password = MD5Util.encrypt(commonUser.getPhone(), "123456");
-                excInsert("insert into t_user (USERNAME,PASSWORD,REALNAME,STATUS,MOBILE,CREATE_TIME,MODIFY_TIME,LAST_LOGIN_TIME,AVATAR,OPER_ID) " +
-                        "VALUES ('" + commonUser.getPhone() + "','" + password + "','" + userDO.getUserName() + "',1,'" + commonUser.getPhone() + "',NOW(),NOW(),NOW(),'https://liangxin.zthymaoyi.com/upload/default.jpg','"
-                        + UUID.randomUUID().toString(true) + "')", this.coon);
-                Long user_id = excSelect("select * from t_user t where t.MOBILE = '" + commonUser.getPhone() + "'", this.coon);
-                sUserId = excSelect1("select * from t_user t where t.MOBILE = '" + commonUser.getPhone() + "'", this.coon);
-                excInsert("insert into t_user_role (USER_ID,ROLE_ID) " +
-                        "VALUES (" + user_id + ",7)", this.coon);
-                excInsert("insert into t_user_config (USER_ID,THEME,LAYOUT,MULTI_PAGE,FIX_SIDERBAR,FIX_HEADER,COLOR) " +
-                        "VALUES (" + user_id + ",'dark','side','0','1','1','rgb(66, 185, 131)')", this.coon);
-
-            }
-            close();
-            DBConnection1();
-            if (excSelect2("select * from s_user t where t.id = '" + sUserId + "'", this.coon1) != null) {
-                excUpdate("update s_user t set t.last_oper_time = now() where t.id = '" + sUserId + "'", this.coon1);
-            } else {
-                excInsert("insert into s_user (id,nick_name,user_name,password,avatar,money,status,oper_time,last_oper_time) " +
-                        "VALUES ('" + sUserId + "','" + userDO.getUserName() + "','" + commonUser.getPhone() + "','" + password + "','https://liangxin.zthymaoyi.com/upload/default.jpg','0.0',0,NOW(),NOW())", this.coon1);
-            }
-            close1();
-            userDO.setLiangxinId(sUserId);
             this.updateById(userDO);
         }
         //返回用户DTO
@@ -544,32 +518,6 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
             DBConnection();
             String sUserId = null;
             password = null;
-            if (excSelect("select * from t_user t where t.MOBILE = '" + commonUser.getPhone() + "'", this.coon) > 0) {
-                excUpdate("update t_user t set t.LAST_LOGIN_TIME = now() where t.MOBILE = '" + commonUser.getPhone() + "'", this.coon);
-                sUserId = excSelect1("select * from t_user t where t.MOBILE = '" + commonUser.getPhone() + "'", this.coon);
-            } else {
-                password = MD5Util.encrypt(commonUser.getPhone(), "123456");
-                excInsert("insert into t_user (USERNAME,PASSWORD,REALNAME,STATUS,MOBILE,CREATE_TIME,MODIFY_TIME,LAST_LOGIN_TIME,AVATAR,OPER_ID) " +
-                        "VALUES ('" + commonUser.getPhone() + "','" + password + "','" + userDO.getUserName() + "',1,'" + commonUser.getPhone() + "',NOW(),NOW(),NOW(),'https://liangxin.zthymaoyi.com/upload/default.jpg','"
-                        + UUID.randomUUID().toString(true) + "')", this.coon);
-                Long user_id = excSelect("select * from t_user t where t.MOBILE = '" + commonUser.getPhone() + "'", this.coon);
-                sUserId = excSelect1("select * from t_user t where t.MOBILE = '" + commonUser.getPhone() + "'", this.coon);
-                excInsert("insert into t_user_role (USER_ID,ROLE_ID) " +
-                        "VALUES (" + user_id + ",7)", this.coon);
-                excInsert("insert into t_user_config (USER_ID,THEME,LAYOUT,MULTI_PAGE,FIX_SIDERBAR,FIX_HEADER,COLOR) " +
-                        "VALUES (" + user_id + ",'dark','side','0','1','1','rgb(66, 185, 131)')", this.coon);
-
-            }
-            close();
-            DBConnection1();
-            if (excSelect2("select * from s_user t where t.id = '" + sUserId + "'", this.coon1) != null) {
-                excUpdate("update s_user t set t.last_oper_time = now() where t.id = '" + sUserId + "'", this.coon1);
-            } else {
-                excInsert("insert into s_user (id,nick_name,user_name,password,avatar,money,status,oper_time,last_oper_time) " +
-                        "VALUES ('" + sUserId + "','" + userDO.getUserName() + "','" + commonUser.getPhone() + "','" + password + "','https://liangxin.zthymaoyi.com/upload/default.jpg','0.0',0,NOW(),NOW())", this.coon1);
-            }
-            close1();
-            userDO.setLiangxinId(sUserId);
             this.updateById(userDO);
         }
         //返回用户DTO

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

@@ -135,19 +135,18 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
         if (hyDriverCarInfo1 != null) {
             //通过
             if ("1".equals(hyDriverCarInfo.getFlag())) {
-                hyDriverCarInfo.setStatusKey(StatusEnum.TASK_REJECT.getFlag());
-                hyDriverCarInfo.setStatus(StatusEnum.TASK_REJECT.getName());
-                hyDriverCarInfo.setDrivingOverdueFlag("0");
-                hyDriverCarInfo.setTrailerOverdueFlag("0");
-                hyDriverCarInfo.setOperationOverdueFlag("0");
-                hyDriverCarInfo.setTrailerOperationOverdueFlag("0");
+                hyDriverCarInfo1.setStatusKey(StatusEnum.TASK_REJECT.getFlag());
+                hyDriverCarInfo1.setStatus(StatusEnum.TASK_REJECT.getName());
+                hyDriverCarInfo1.setDrivingOverdueFlag("0");
+                hyDriverCarInfo1.setTrailerOverdueFlag("0");
+                hyDriverCarInfo1.setOperationOverdueFlag("0");
+                hyDriverCarInfo1.setTrailerOperationOverdueFlag("0");
+                hyDriverCarInfo1.setRejectReasonDescription(null);
             }
             //驳回
             else if("2".equals(hyDriverCarInfo.getFlag())){
-                hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
-                hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_FAILED.getName());
-                this.updateById(hyDriverCarInfo);
-
+                hyDriverCarInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                hyDriverCarInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
             }
             //更改车辆状态信息
             this.updateById(hyDriverCarInfo1);

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

@@ -196,7 +196,6 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
     public String examine(HyDriverInfo hyDriverInfo) {
         //查询司机列表
         HyDriverInfo hyDriverInfo1 = this.selectById(hyDriverInfo.getId());
-
         if (hyDriverInfo1 != null) {
             //通过
             if ("1".equals(hyDriverInfo.getFlag())) {
@@ -221,7 +220,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
             else if("2".equals(hyDriverInfo.getFlag())){
                 hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
-                this.updateById(hyDriverInfo);
+
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setReCommonId(hyDriverInfo1.getCommonId());

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

@@ -43,6 +43,10 @@
         c.driving_license_back_page as drivingLicenseBackPage,
         c.trailer_license_home_page as trailerLicenseHomePage,
         c.trailer_license_back_page as trailerLicenseBackPage,
+        c.driving_overdue_flag as drivingOverdueFlag,
+        c.trailer_overdue_flag as trailerOverdueFlag,
+        c.operation_overdue_flag as operationOverdueFlag,
+        c.trailer_operation_overdue_flag as trailerOperationOverdueFlag,
         c.status,
         c.update_date as updateDate,
         cu.avatar_url as avatarUrl

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

@@ -57,11 +57,7 @@
         d.update_date as updateDate,
         d.overdue_flag as overdueFlag,
         d.driver_overdue_flag as driverOverdueFlag,
-        d.driving_overdue_flag as drivingOverdueFlag,
-        d.trailer_overdue_flag as trailerOverdueFlag,
         d.qualification_overdue_flag as qualificationOverdueFlag,
-        d.operation_overdue_flag as operationOverdueFlag,
-        d.trailer_operation_overdue_flag as trailerOperationOverdueFlag,
         c.avatar_url as avatarUrl
         FROM hy_driver_info d
         LEFT JOIN common_user c on c.id = d.common_id and c.delete_flag = 0