diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 8432bc171..67ac1a33b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -253,6 +253,8 @@ public enum ErrorCodeEnum { CURRENT_STATUS_NOT_OPERATION(151005,"平台账号当前非审核状态！不能提交审核",null), CURRENT_ENTRY_STATUS_NOT_OPERATION(151006,"进件状态未审核！不能执行该操作",null), GET_YLS_CODE_FAIL(151006,"系统无云流水编码！无法获取TOKEN！请先维护该编码",null), + + BANK_EXIST(151007,"当前银行已存在，请直接选择！",null), ; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BankDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BankDAO.java index dbf3ea774..1bde6e264 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BankDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BankDAO.java @@ -33,6 +33,21 @@ public class BankDAO { return bankList; } + public Boolean insert(BanktypeDO banktypeDO){ + banktypeMapper.insertSelective(banktypeDO); + return Boolean.TRUE; + } + + public String queryMaxCode(){ + return banktypeMapper.queryMaxCode(); + } + + public BanktypeDO queryByName(String name){ + return banktypeMapper.queryByName(name); + } + + + public Page listBranchBank(BranchBankPageRequest request){ PageHelper.startPage(request.getPageNum(), request.getPageSize()); return bankdocMapper.listBranchBank(request); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BanktypeMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BanktypeMapper.java index 06c251273..b8695b6bc 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BanktypeMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BanktypeMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; import com.cool.store.entity.BanktypeDO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -40,4 +41,8 @@ public interface BanktypeMapper { List listBank(); + BanktypeDO queryByName(@Param("name") String name); + + String queryMaxCode(); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/BanktypeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BanktypeMapper.xml index 5400eab0d..5a446ec3d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/BanktypeMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/BanktypeMapper.xml @@ -89,4 +89,13 @@ order by name + + + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java index 28bd4571b..78bf8aea4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java @@ -19,4 +19,6 @@ public interface BankService { Boolean repayment(AuditRejectRequest request); + Boolean addBank(String name); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java index a6ed6d4c0..ff86eaaef 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java @@ -10,12 +10,14 @@ import com.cool.store.entity.BanktypeDO; import com.cool.store.entity.LineAuditInfoDO; import com.cool.store.entity.LineInfoDO; import com.cool.store.enums.*; +import com.cool.store.exception.ServiceException; import com.cool.store.mapper.LinePayMapper; import com.cool.store.request.AuditRejectRequest; import com.cool.store.request.BranchBankPageRequest; import com.cool.store.service.BankService; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.StringUtil; +import com.cool.store.utils.UUIDUtils; import com.github.pagehelper.Page; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -31,6 +33,7 @@ import java.text.MessageFormat; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Objects; /** * @author wxp @@ -124,4 +127,21 @@ public class BankServiceImpl extends LineFlowService implements BankService { return Boolean.TRUE; } + @Override + public Boolean addBank(String name) { + //校验银行是否存在 + BanktypeDO current = bankDAO.queryByName(name); + if (!Objects.isNull(current)){ + throw new ServiceException(ErrorCodeEnum.BANK_EXIST); + } + String currentMaxCode = bankDAO.queryMaxCode(); + BanktypeDO banktypeDO = new BanktypeDO(); + banktypeDO.setName(name); + banktypeDO.setCode(String.valueOf(Integer.valueOf(currentMaxCode)+1)); + banktypeDO.setCombinecode(CommonConstants.PATH_BAR); + banktypeDO.setPkBanktype(UUIDUtils.get8UUID()); + bankDAO.insert(banktypeDO); + return Boolean.TRUE; + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java index 11cce33cc..7e3cd53f7 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java @@ -35,6 +35,12 @@ public class BankController { return ResponseResult.success(result); } + @ApiOperation("添加银行") + @GetMapping("/addBank") + public ResponseResult listBank(@RequestParam(required = true) String name) { + return ResponseResult.success( bankService.addBank(name)); + } + @ApiOperation("支行列表查询") @PostMapping("/listBranchBank") public ResponseResult> listBranchBank(@RequestBody @Validated BranchBankPageRequest request) {