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

银盛以及部分逻辑

Browse Source
This commit is contained in:
liuyingfang
2023-04-27 18:39:50 +08:00
parent b5174dce3d
commit 87b056b47f
9 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java
View File

@@ -369,7 +369,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
extra.putAll(JSON.parseObject(req.getBusinessData()));
mcs.setApplicationId(extra.getString("sysFlowId"));
mcs.setThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_AUDITING);
//mcs.setInterfaceVersion(YsConfigV3.INTERFACE_VERSION);
mcs.setInterfaceVersion(YsConfigV3.INTERFACE_VERSION);
mcsService.saveOrUpdate(mcs);
AccountDTO accountDTO = accountService.getRealAccount(userId, Account.CHANNEL_TYPE_D1);
@@ -645,9 +645,9 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
case MerchantImage.ImageType.BUSINESS_LICENSE:
return "A001";
case MerchantImage.ImageType.IDCARD_FRONT:
return "A002";
case MerchantImage.ImageType.IDCARD_BACK:
return "A003";
case MerchantImage.ImageType.IDCARD_BACK:
return "A002";
case MerchantImage.ImageType.BANK_CARD_FRONT:
return "A004";
case MerchantImage.ImageType.BANK_CARD_BACK:

12
pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java
View File

@@ -1160,11 +1160,12 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
String certName = accountIdCard.getCertName();
bankCardDTO.setBankHolder(certName);
try {
aliyunService.checkBankCorrectNow(bankCardDTO.getPhone(), bankCardDTO.getBankCardNo(), accountIdCard.getCertNo(), certName);
} catch (MsgException e) {
throw new MsgException("银行卡信息校验不通过，请填写结算人【" + DesensitizedUtil.chineseName(certName) + "】的银行卡");
}
//TODO 先绕过四要素
// try {
// aliyunService.checkBankCorrectNow(bankCardDTO.getPhone(), bankCardDTO.getBankCardNo(), accountIdCard.getCertNo(), certName);
// } catch (MsgException e) {
// throw new MsgException("银行卡信息校验不通过，请填写结算人【" + DesensitizedUtil.chineseName(certName) + "】的银行卡");
// }
BankCard bankCard = Converter.INSTANCE.toEntity(bankCardDTO);
account.setBak((JSONObject) JSON.toJSON(bankCard));
@@ -1260,7 +1261,6 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
}
Notice notice = new Notice(1, 5, userApp);
//TODO 银行卡认证先绕过四要素检测
try {
aliyunService.checkBankCorrectNow(bankInfoDTO.getPhone(), bankInfoDTO.getBankCardNo(), idCard.getCertNo(), idCard.getCertName());
} catch (MsgException e) {

7
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java
View File

@@ -4,6 +4,7 @@ import cn.pluss.platform.SubMerchantApplyOrderService;
import cn.pluss.platform.channel.MerchProtocolService;
import cn.pluss.platform.channel.MerchantAuditService;
import cn.pluss.platform.channel.MerchantCertService;
import cn.pluss.platform.channel.ys.impl.YSAuditServiceV3;
import cn.pluss.platform.converter.Converter;
import cn.pluss.platform.entity.*;
import cn.pluss.platform.exception.MsgException;
@@ -82,6 +83,8 @@ public class MerchantChannelStatusServiceImpl extends ServiceImpl<MerchantChanne
@Autowired
private GeneralPushUtil generalPushUtil;
@Autowired
private YSAuditServiceV3 ysAuditServiceV3;
@Override
@@ -436,7 +439,9 @@ public class MerchantChannelStatusServiceImpl extends ServiceImpl<MerchantChanne
throw new MsgException("非待签约商户禁止该请求");
}
ysMerchProtocolService.sendProtocolMsg(mcs);
//ysMerchProtocolService.sendProtocolMsg(mcs);
//换成新的发送短信
ysAuditServiceV3.sendProtocolMsg(mcs);
}
/**

2
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java
View File

@@ -150,7 +150,7 @@ public class MerchantMenberServiceImpl extends ServiceImpl<MerchantMenberMapper,
}
// 使用验证码之后删除验证码
//TODO 线下的删除老是进行行锁，线上不影响
//phoneValidateCodeMapper.deletePhoneValidateCode(existValidateCode);
phoneValidateCodeMapper.deletePhoneValidateCode(existValidateCode);
MerchantStore ms = new MerchantStore();
ms.setMerchantCode(merchantCode);

4
pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/YsConfigV3.java
View File

@@ -41,9 +41,9 @@ public class YsConfigV3 {
public static final String BIZ_SUCCESS = "0000";
//银盛进件回调
public static final String AUDIT_NOTIFY_URL = "http://wxgzh.sxczgkj.cn/api/auditCallback/ysV3";
public static final String AUDIT_NOTIFY_URL = "https://ky.sxczgkj.cn/api/auditCallback/ysV3";
//银盛签约回调
public static final String AUDIT_SIGN_NOTIFY_URL = "http://wxgzh.sxczgkj.cn/api/auditCallback/ysSignV3";
public static final String AUDIT_SIGN_NOTIFY_URL = "https://ky.sxczgkj.cn/api/auditCallback/ysSignV3";
/** 成功 */
public static final String STATUS_SUCCESS = "00";