diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java index ec2f9a6a..34549cda 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java @@ -1155,17 +1155,19 @@ public class LakalaApiServiceImpl implements LakalaApiService { log.warn("商户分账业务申请异步回调:审核未通过,状态={}", auditStatus); if (lklLedgerMember != null) { shopMchEntryService.updateMerchEntryApprovalByMchId( - lklLedgerMember.getMch_id(), CommonConstant.MCH_APPR_STA_NOPASS, "商家分账业务审核未通过:" + auditStatusText + lklLedgerMember.getMch_id(), CommonConstant.MCH_APPR_STA_NOPASS, "拉卡拉分账业务审核未通过:" + auditStatusText ); } - return JSONUtil.createObj().put("code", "FAIL").put("message", "商家分账业务审核未通过!"); + return JSONUtil.createObj().put("code", "FAIL").put("message", "分账业务审核未通过,不处理业务!"); } - if (lklLedgerMember != null && CommonConstant.Enable.equals(lklLedgerMember.getAudit_status()) - && lklLedgerMerReceiverBindService.hasBindReceiver(merCupNo)) { - log.debug("商户分账业务申请异步回调:已绑定过接收方,applyId={}", applyId); - // TODO 已绑定过接收方,可以往下执行更新,绑定关系 - // return JSONUtil.createObj().put("code", "SUCCESS").put("message", "已绑定过接收方!"); + if (lklLedgerMember == null) { + log.warn("商户分账业务申请异步回调:未找到对应的商户分账申请记录,applyId={}", applyId); + return JSONUtil.createObj().put("code", "FAIL").put("message", "分账业务申请记录不存在!"); + } + + if (lklLedgerMember != null && lklLedgerMerReceiverBindService.hasBindReceiver(merCupNo)) { + log.debug("商户分账业务申请异步回调:已绑定过接收方,不影响进一步更新分账业务申请状态,applyId={}", applyId); } String merInnerNo = paramsJSON.getStr("merInnerNo"); @@ -1641,7 +1643,6 @@ public class LakalaApiServiceImpl implements LakalaApiService { // 7. 成功后更新商户绑定状态为已绑定 shopMchEntryService.updateMulStatus(mchId, merCupNo, 0, 0, 0, 0, 0, 1, CommonConstant.MCH_APPR_STA_PASS); - // 创建店铺,并初始化 // 新建一个正式的已审核通过的店铺,不要抛异常,使用补偿机制,可以独立初始化店铺 // 重要:包含了更改 merchEntryInfo 的状态, 使用法人、小微个人的手机号注册商家账号,作为店铺的管理员