diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java index 7469b8e..84a80a6 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java @@ -169,6 +169,15 @@ public class LaKalaInterfaceImpl { MsgException.checkNull(idCard,"商户基本信息不完整"); MerchantChannelStatus mcs = mcsService.getByMerchantCodeNoChannel(merchantBaseInfo.getMerchantCode()); + + if(ObjectUtil.isEmpty(mcs)){ + log.info("审核失败,重新审核数据:{}",merchantBaseInfo.getMerchantCode()); + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("merchantCode",merchantBaseInfo.getMerchantCode()); + queryWrapper.eq("channel","5"); + queryWrapper.eq("status",2); + mcs=merchantChannelStatusMapper.selectOne(queryWrapper); + } String status=mcs.getStatus(); String thirdStatus=mcs.getThirdStatus(); MsgException.checkNull(mcs,"商户未提交审核"); @@ -210,7 +219,7 @@ public class LaKalaInterfaceImpl { startSb.append(merchantBaseInfo.getBussAuthStartTime()); } - if(ObjectUtil.isEmpty(merchantBaseInfo.getBuslicType()) ||"长期".equals(merchantBaseInfo.getBuslicType())){ + if(ObjectUtil.isEmpty(merchantBaseInfo.getBussAuthEndTime()) ||"长期".equals(merchantBaseInfo.getBuslicType())){ endSb.append("2099-12-31"); }else { if(merchantBaseInfo.getBussAuthEndTime().contains("年")){