功能提交： 对获取供应商和客户的银行卡列表进行优化

bug 提交： 修改新增用户的sql

common/fire-dto/src/main/java/com/fire/dto/CustomerProduct.java

@@ -68,7 +68,7 @@ public class CustomerProduct {
     @TableField(exist = false)
     private String areaNum;
 
-    @ApiModelProperty(value = "运营商  1 ： 移动  2 ： 电信  3 ： 联通")
+    @ApiModelProperty(value = "运营商  1 ： 移动  2 ： 联通  3 ： 电信")
     @TableField(exist = false)
     private Integer operator;
 

common/fire-dto/src/main/java/com/fire/dto/FireProductInfo.java

@@ -102,9 +102,9 @@ public class FireProductInfo extends Model<FireProductInfo> {
     private Integer isDelete;
 
     /**
-     * 运营商  1 ： 移动  2 ： 电信  3 ： 联通
+     * 运营商  1 ： 移动  2 ： 联通  3 ： 电信
      */
-    @ApiModelProperty(value = "运营商 （1 ：移动  2 ：电信  3 ：联通【查询条件之一】)")
+    @ApiModelProperty(value = "运营商 （1 ：移动  2 ：联通  3 ：电信【查询条件之一】)")
     private Integer operator;
 
 

modules/admin/src/main/java/com/fire/admin/dto/FireProductInfoDto.java

@@ -85,9 +85,9 @@ public class FireProductInfoDto {
 
 
     /**
-     * 运营商  1 ： 移动  2 ： 电信  3 ： 联通
+     * 运营商  1 ： 移动  2 ： 联通  3 ： 电信
      */
-    @ApiModelProperty(value = "运营商 （1 ：移动  2 ：电信  3 ：联通【查询条件之一】)")
+    @ApiModelProperty(value = "运营商 （1 ：移动  2 ：联通  3 ：电信【查询条件之一】)")
     private Integer operator;
 
 

modules/admin/src/main/java/com/fire/admin/dto/RoleDTO.java

@@ -1,6 +1,7 @@
 package com.fire.admin.dto;
 
 import com.fire.dto.system.SysRoleMenu;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import java.util.List;
@@ -12,8 +13,7 @@ import java.util.List;
  * @Date 2019-04-23 21:26
  * @Version 1.0
  */
-@Setter
-@Getter
+@Data
 public class RoleDTO {
 
     private static final long serialVersionUID = 1L;

modules/admin/src/main/java/com/fire/admin/mapper/SysUserMapper.java

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-    @Insert("insert into sys_user (username,password,dept_id,job_id,phone,email,avatar,lock_flag,type) values (#{username},#{password},#{deptId},#{jobId},#{phone},#{email},#{avatar},#{lockFlag},#{type})")
+    @Insert("insert into sys_user (user_id,username,password,dept_id,job_id,phone,email,avatar,lock_flag,type) values (#{userId},#{username},#{password},#{deptId},#{jobId},#{phone},#{email},#{avatar},#{lockFlag},#{type})")
     @Options(useGeneratedKeys = true, keyProperty = "userId", keyColumn = "user_id")
     boolean insertUser(SysUser sysUser);
 

modules/admin/src/main/java/com/fire/admin/rest/BankCardRest.java

@@ -28,22 +28,11 @@ public class BankCardRest {
     @Resource
     private BankCardService bankCardService;
 
-    /**
-    * @Description:  TODO 获取银行卡列表
-    * @Param: [relationId, distinguish]
-    * @return: com.fire.dto.response.BaseRestResponse
-    * @Author: liuliu
-    * @Date: 2021/6/4 16:45
-    */
-    @PostMapping("/list")
+
+    @GetMapping("/list")
     @ApiOperation(value = "根据供应商或者客户获取该供应商或者客户的银行卡详情（distinguish：1-供应商 2-客户）", notes = "bankcard_list.py")
     public BaseRestResponse getBankCardList(Long relationId, Integer distinguish) {
-        List<BankCard> bankCardList = bankCardService.getBankCardList(relationId, distinguish);
-        if (bankCardList != null) {
-            return new BaseRestResponse(bankCardList);
-        } else {
-            return new BaseRestResponse(null);
-        }
+        return new BaseRestResponse(bankCardService.getBankCardList(relationId, distinguish));
     }
 
     @PostMapping("/add")
@@ -61,5 +50,4 @@ public class BankCardRest {
     }
 
 
-
 }

modules/admin/src/main/java/com/fire/admin/service/BankCardService.java

@@ -13,13 +13,13 @@ import java.util.List;
  */
 public interface BankCardService extends IService<BankCard> {
 
-    /**
-     * @Description: TODO  获取银行卡列表， distinguish  1-供应商 2-客户
-     * @Param: [supplierId, distinguish]
-     * @return: java.util.List<com.fire.dto.BankCard>
-     * @Author: liuliu
-     * @Date: 2021/6/3 15:00
-     */
+   /**
+   * @Description:  TODO 获取银行列表，distinguish ：1 供应商  2： 客户
+   * @Param: [relationId, distinguish]
+   * @return: java.util.List<com.fire.dto.BankCard>
+   * @Author: liuliu
+   * @Date: 2021/6/16 11:46
+   */
     List<BankCard> getBankCardList(Long relationId, Integer distinguish);
 
     void saveOrUpdateBankCards(List<BankCard> bankCards);

modules/admin/src/main/java/com/fire/admin/service/impl/BankCardServiceImpl.java

@@ -29,16 +29,22 @@ public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> i
     @Resource
     private JedisCluster jedisCluster;
 
+
+    /**
+     * @Description: TODO 获取银行列表，distinguish ：1 供应商  2： 客户
+     * @Param: [relationId, distinguish]
+     * @return: java.util.List<com.fire.dto.BankCard>
+     * @Author: liuliu
+     * @Date: 2021/6/16 11:44
+     */
     @Override
     public List<BankCard> getBankCardList(Long relationId, Integer distinguish) {
-        List<BankCard> bankCardList = new LambdaQueryChainWrapper<>(baseMapper)
-                .eq(relationId != null, BankCard::getRelationId, relationId)
-                .eq(distinguish != null, BankCard::getDistinguish, distinguish).list();
-        if (bankCardList != null) {
-            return bankCardList;
-        } else {
-            return null;
+        if (ObjectUtil.isNotEmpty(relationId) && ObjectUtil.isNotEmpty(distinguish)) {
+            return new LambdaQueryChainWrapper<>(baseMapper)
+                    .eq(relationId != null, BankCard::getRelationId, relationId)
+                    .eq(distinguish != null, BankCard::getDistinguish, distinguish).list();
         }
+        return null;
     }
 
     @Override
@@ -67,7 +73,7 @@ public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> i
 
     @Override
     public void deleteBankCards(Long bankId) {
-        if (bankId != null) {
+        if (ObjectUtil.isNotEmpty(bankId)) {
             int result = baseMapper.deleteById(bankId);
             if (result > 0) {
                 log.info("编号为：【{}】的银行卡删除成功!", bankId);

modules/admin/src/main/java/com/fire/admin/service/impl/CustomerServiceImpl.java

@@ -78,7 +78,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, CustomerInf
         if (!infoVos.isEmpty()) {
             infoVos.forEach(info -> {
                 // TODO  返回客户的银行卡信息
-                info.setBankCards(bankCardService.getBankCardList(Long.parseLong(String.valueOf(info.getCustomerId())), 2));
+                info.setBankCards(bankCardService.getBankCardList(info.getCustomerId(), 2));
             });
         }
         return customerInfoVoIPage;

modules/admin/src/main/java/com/fire/admin/service/impl/SysUserServiceImpl.java

@@ -91,12 +91,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = new SysUser();
         BeanUtils.copyProperties(userDto, sysUser);
         // 默认密码 123456
-       sysUser.setUserId( jedisCluster.incr(GLOBAL_ID_INCR.key()));
+        sysUser.setUserId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
         sysUser.setPassword(PreUtil.encode("123456"));
         log.info("新增用户数据为：【{}】", sysUser.toString());
         baseMapper.insertUser(sysUser);
         List<SysUserRole> userRoles = userDto.getRoleList().stream().map(item -> {
             SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
             sysUserRole.setRoleId(item);
             sysUserRole.setUserId(sysUser.getUserId());
             return sysUserRole;
@@ -270,7 +271,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public SysUser findSecurityUserByUser(SysUser sysUser) {
-      LambdaQueryWrapper<SysUser> select = Wrappers.<SysUser>lambdaQuery().select(SysUser::getUserId, SysUser::getUsername, SysUser::getPassword);
+        LambdaQueryWrapper<SysUser> select = Wrappers.<SysUser>lambdaQuery().select(SysUser::getUserId, SysUser::getUsername, SysUser::getPassword);
         if (StrUtil.isNotEmpty(sysUser.getUsername())) {
             select.eq(SysUser::getUsername, sysUser.getUsername());
         } else if (StrUtil.isNotEmpty(sysUser.getPhone())) {
@@ -278,9 +279,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         } else if (ObjectUtil.isNotNull(sysUser.getUserId()) && sysUser.getUserId() != 0) {
             select.eq(SysUser::getUserId, sysUser.getUserId());
         }
-        log.info("user 对象为：【{}】","---------------------");
+        log.info("user 对象为：【{}】", "---------------------");
         SysUser user = baseMapper.selectOne(select);
-        log.info("user 对象为：【{}】",user.toString());
+        log.info("user 对象为：【{}】", user.toString());
 
         return user;
     }