czg_team
/
newadmin
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改银盛判断

This commit is contained in:
liuyingfang 2024-04-09 15:33:56 +08:00
parent 357aea532e
commit 63b65d5c74
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/ys/YSAuditServiceV3.java
View File

@ -440,7 +440,7 @@ public class YSAuditServiceV3 {
throw new MsgException(req.getSubMsg()); throw new MsgException(req.getSubMsg());
} }
//再次检测 //再次检测
preCheck(userId, channel); // preCheck(userId, channel);
TbPlussMerchantChannelStatus mcs = new TbPlussMerchantChannelStatus(); TbPlussMerchantChannelStatus mcs = new TbPlussMerchantChannelStatus();
TbPlussMerchantBaseInfo mbi = merchantBaseInfoMapper.selectByUserId(userId); TbPlussMerchantBaseInfo mbi = merchantBaseInfoMapper.selectByUserId(userId);
@ -976,11 +976,7 @@ public class YSAuditServiceV3 {
TbPlussMerchantBaseInfo mbi = merchantBaseInfoMapper.selectByUserId(userId); TbPlussMerchantBaseInfo mbi = merchantBaseInfoMapper.selectByUserId(userId);
TbPlussMerchantChannelStatus existD1 = merchantChannelStatusMapper.getByCodeAndChannelFlag(mbi.getMerchantcode(), TbPlussAccount.CHANNEL_TYPE_D1); TbPlussMerchantChannelStatus existD1 = merchantChannelStatusMapper.getByCodeAndChannelFlag(mbi.getMerchantcode(), TbPlussAccount.CHANNEL_TYPE_D1);
//D1
if (existD1 != null && !TbPlussMerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(existD1.getStatus()) &&
!TbPlussMerchantChannelStatus.AUDIT_STATUS_SIGNED.equals(existD1.getStatus()) && !TbPlussMerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN.equals(existD1.getStatus())) {
throw new MsgException("当前D1通道存在未进件完成的的进件数据，不允许进件银盛");
}
//TODO 非营业执照商户同一结算人仅可申请两次实时到账 //TODO 非营业执照商户同一结算人仅可申请两次实时到账
if (MERCH_TYPE_MICRO.equals(mbi.getMerchanttype())) { if (MERCH_TYPE_MICRO.equals(mbi.getMerchanttype())) {
int ysCount = accountMapper.selectYSAuditSmallCount(String.valueOf(mbi.getUserid())); int ysCount = accountMapper.selectYSAuditSmallCount(String.valueOf(mbi.getUserid()));