diff --git a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java index 7dce32b..6fab8ca 100644 --- a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java +++ b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java @@ -2798,6 +2798,7 @@ public class HfMerService { tbPlussMerchantAuditRecordMapper.insert(merchantAuditRecord); + tbPlussMerchantHfInfo.setStatus("2"); //商户入驻待审核 tbPlussMerchantHfInfo.setUpdateTime(new Date()); tbPlussMerchantHfInfoMapper.updateByPrimaryKey(tbPlussMerchantHfInfo); diff --git a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/LklAuditService.java b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/LklAuditService.java index dac85b9..529bd89 100644 --- a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/LklAuditService.java +++ b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/LklAuditService.java @@ -388,13 +388,14 @@ public class LklAuditService { channelStatus.setCallbackstatus("0"); channelStatus.setRemark("拉卡拉审核中"); channelStatus.setMerchantid(String.valueOf(arry.get("merchantNo"))); + channelStatus.setMercname(null); if(ObjectUtil.isEmpty(channelStatus.getId())){ channelStatus.setCreatetime(new Date()); tbPlussMerchantChannelStatusMapper.insert(channelStatus); }else { channelStatus.setUpdatetime(new Date()); - tbPlussMerchantChannelStatusMapper.updateByPrimaryKey(channelStatus); + tbPlussMerchantChannelStatusMapper.updateByPrimaryKeySelective(channelStatus); } TbPlussMerchantAuditRecord merchantAuditRecord = new TbPlussMerchantAuditRecord(); @@ -426,7 +427,8 @@ public class LklAuditService { tbPlussMerchantChannelStatusMapper.insert(channelStatus); }else { channelStatus.setUpdatetime(new Date()); - tbPlussMerchantChannelStatusMapper.updateByPrimaryKey(channelStatus); + channelStatus.setMercname(null); + tbPlussMerchantChannelStatusMapper.updateByPrimaryKeySelective(channelStatus); } TbPlussMerchantAuditRecord merchantAuditRecord = new TbPlussMerchantAuditRecord(); @@ -503,7 +505,8 @@ public class LklAuditService { // 修改商户状态 mcs.setStatus("6"); mcs.setApplicationid(String.valueOf(arry.get("reviewRelatedId"))); - tbPlussMerchantChannelStatusMapper.updateByPrimaryKey(mcs); + mcs.setMercname(null); + tbPlussMerchantChannelStatusMapper.updateByPrimaryKeySelective(mcs); } else { MsgException.throwException("修改进件信息失败"); } diff --git a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/ys/YSAuditServiceV3.java b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/ys/YSAuditServiceV3.java index 5318a3f..67d7887 100644 --- a/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/ys/YSAuditServiceV3.java +++ b/newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/ys/YSAuditServiceV3.java @@ -458,8 +458,8 @@ public class YSAuditServiceV3 { mcs.setApplicationid(extra.getString("sysFlowId")); mcs.setThirdstatus(TbPlussMerchantChannelStatus.AUDIT_THIRD_STATUS_AUDITING); mcs.setInterfaceversion(INTERFACE_VERSION); + mcs.setMercname(null); merchantChannelStatusMapper.updateByPrimaryKeySelective(mcs); - } /**