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

合并分支

This commit is contained in:
liuyingfang 2024-02-27 20:48:01 +08:00
parent 77f6f5d17b 3e8d330bdb
commit 6c77bdecbd
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java
View File

@ -2798,6 +2798,7 @@ public class HfMerService {
tbPlussMerchantAuditRecordMapper.insert(merchantAuditRecord); tbPlussMerchantAuditRecordMapper.insert(merchantAuditRecord);
tbPlussMerchantHfInfo.setStatus("2"); //商户入驻待审核 tbPlussMerchantHfInfo.setStatus("2"); //商户入驻待审核
tbPlussMerchantHfInfo.setUpdateTime(new Date()); tbPlussMerchantHfInfo.setUpdateTime(new Date());
tbPlussMerchantHfInfoMapper.updateByPrimaryKey(tbPlussMerchantHfInfo); tbPlussMerchantHfInfoMapper.updateByPrimaryKey(tbPlussMerchantHfInfo);

9
newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/LklAuditService.java
View File

@ -388,13 +388,14 @@ public class LklAuditService {
channelStatus.setCallbackstatus("0"); channelStatus.setCallbackstatus("0");
channelStatus.setRemark("拉卡拉审核中"); channelStatus.setRemark("拉卡拉审核中");
channelStatus.setMerchantid(String.valueOf(arry.get("merchantNo"))); channelStatus.setMerchantid(String.valueOf(arry.get("merchantNo")));
channelStatus.setMercname(null);
if(ObjectUtil.isEmpty(channelStatus.getId())){ if(ObjectUtil.isEmpty(channelStatus.getId())){
channelStatus.setCreatetime(new Date()); channelStatus.setCreatetime(new Date());
tbPlussMerchantChannelStatusMapper.insert(channelStatus); tbPlussMerchantChannelStatusMapper.insert(channelStatus);
}else { }else {
channelStatus.setUpdatetime(new Date()); channelStatus.setUpdatetime(new Date());
tbPlussMerchantChannelStatusMapper.updateByPrimaryKey(channelStatus); tbPlussMerchantChannelStatusMapper.updateByPrimaryKeySelective(channelStatus);
} }
TbPlussMerchantAuditRecord merchantAuditRecord = new TbPlussMerchantAuditRecord(); TbPlussMerchantAuditRecord merchantAuditRecord = new TbPlussMerchantAuditRecord();
@ -426,7 +427,8 @@ public class LklAuditService {
tbPlussMerchantChannelStatusMapper.insert(channelStatus); tbPlussMerchantChannelStatusMapper.insert(channelStatus);
}else { }else {
channelStatus.setUpdatetime(new Date()); channelStatus.setUpdatetime(new Date());
tbPlussMerchantChannelStatusMapper.updateByPrimaryKey(channelStatus); channelStatus.setMercname(null);
tbPlussMerchantChannelStatusMapper.updateByPrimaryKeySelective(channelStatus);
} }
TbPlussMerchantAuditRecord merchantAuditRecord = new TbPlussMerchantAuditRecord(); TbPlussMerchantAuditRecord merchantAuditRecord = new TbPlussMerchantAuditRecord();
@ -503,7 +505,8 @@ public class LklAuditService {
// 修改商户状态 // 修改商户状态
mcs.setStatus("6"); mcs.setStatus("6");
mcs.setApplicationid(String.valueOf(arry.get("reviewRelatedId"))); mcs.setApplicationid(String.valueOf(arry.get("reviewRelatedId")));
tbPlussMerchantChannelStatusMapper.updateByPrimaryKey(mcs); mcs.setMercname(null);
tbPlussMerchantChannelStatusMapper.updateByPrimaryKeySelective(mcs);
} else { } else {
MsgException.throwException("修改进件信息失败"); MsgException.throwException("修改进件信息失败");
} }

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

@ -458,8 +458,8 @@ public class YSAuditServiceV3 {
mcs.setApplicationid(extra.getString("sysFlowId")); mcs.setApplicationid(extra.getString("sysFlowId"));
mcs.setThirdstatus(TbPlussMerchantChannelStatus.AUDIT_THIRD_STATUS_AUDITING); mcs.setThirdstatus(TbPlussMerchantChannelStatus.AUDIT_THIRD_STATUS_AUDITING);
mcs.setInterfaceversion(INTERFACE_VERSION); mcs.setInterfaceversion(INTERFACE_VERSION);
mcs.setMercname(null);
merchantChannelStatusMapper.updateByPrimaryKeySelective(mcs); merchantChannelStatusMapper.updateByPrimaryKeySelective(mcs);
} }
/** /**