1

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/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/service/impl/CommonUserServiceImpl.java

@@ -457,6 +457,10 @@ 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()));
+            userDTO.setDriverId(driverInfo.getId());
+        }
         return userDTO;
     }
 

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;
     }