Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/model/po/SysUserBankCard.java

@@ -37,6 +37,12 @@ public class SysUserBankCard implements Serializable {
     @TableField(value = "bank_account")
     private String bankAccount;
 
+    /**
+     * 开户行地址
+     */
+    @TableField(value = "bank_address")
+    private String bankAddress;
+
     /**
      * 提交人
      */

src/main/java/com/ydtech/modules/admin/model/vo/SysUserBankCardVO.java

@@ -28,6 +28,9 @@ public class SysUserBankCardVO {
     @ApiModelProperty(value = "开户行")
     private String bankAccount;
 
+    @ApiModelProperty(value = "开户行地址")
+    private String bankAddress;
+
     @ApiModelProperty(value = "userId")
     private String userId;
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserBankCardServiceImpl.java

@@ -1,10 +1,13 @@
 package com.ydtech.modules.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysUserBankCardMapper;
+import com.ydtech.modules.admin.model.SysPassword;
 import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
 import com.ydtech.modules.admin.service.SysUserBankCardService;
@@ -17,6 +20,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +34,8 @@ import java.util.List;
 public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMapper, SysUserBankCard>
         implements SysUserBankCardService {
 
+    @Resource
+    private SysUserBankCardService sysUserBankCardService;
 
     @Override
     public BasePageResult<SysUserBankCard> queryByVo(SysUserBankCardVO sysUserBankCardVO) {
@@ -44,6 +50,9 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         if (StringUtils.isNotEmpty(sysUserBankCardVO.getBankAccount())) {
             wrapper.eq(SysUserBankCard::getBankAccount, sysUserBankCardVO.getBankAccount());
         }
+        if (StringUtils.isNotEmpty(sysUserBankCardVO.getBankAddress())) {
+            wrapper.eq(SysUserBankCard::getBankAddress, sysUserBankCardVO.getBankAddress());
+        }
         Page<SysUserBankCard> insOrdersPage = page(page, wrapper);
         return new BasePageResult<>(sysUserBankCardVO.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
                 insOrdersPage.getRecords());
@@ -78,7 +87,11 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
     @Override
     @Transactional
     public void insertByBankNumber(SysUserBankCardVO sysUserBankCardVO) {
-
+        long count = sysUserBankCardService.count(new QueryWrapper<SysUserBankCard>()
+                .eq("bank_number", sysUserBankCardVO.getBankNumber()));
+        if (count > 0) {
+            throw new SystemException("该银行卡号以被绑定");
+        }
         String id = BaseController.getUser().getId();
         if (StringUtils.isNotEmpty(id)) {
             sysUserBankCardVO.setUserId(id);

src/main/resources/mapper/modules/admin/SysUserBankCardMapper.xml

@@ -8,13 +8,14 @@
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="bankNumber" column="bank_number" jdbcType="VARCHAR"/>
             <result property="bankAccount" column="bank_account" jdbcType="VARCHAR"/>
+            <result property="bankAddress" column="bank_address" jdbcType="VARCHAR"/>
             <result property="userId" column="user_id" jdbcType="VARCHAR"/>
             <result property="isDefault" column="is_default" jdbcType="TINYINT"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,bank_number,bank_account,
+        id,bank_number,bank_account,bank_address
         user_id,create_time
     </sql>
 
@@ -39,6 +40,7 @@
                   a.id as "id",
                   a.bank_number as "bankNumber",
                   a.bank_account as "bankAccount",
+                  a.bank_address as "bankAddress",
                   a.is_default as "isDefault",
                   a.user_id as "userId"
             from  sys_user_bank_card a