ufo / yohoufo-fore · Commits

Go to a project

Authored by caoyan
Commit 9b259589ab75a7c63f6cf58cffd1ecf23000d901 2 parents fc5e15ad b83b3413

Merge branch 'dev_物权转移' into test6.8.6

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
... ... @@ -402,6 +402,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
//发送定时mq
yhProducer.send(TopicConstants.MQ_TOPIC_CONFIRM_OWNER_DELAY, insertItem, null, 3*24*60);//3天
// yhProducer.send(TopicConstants.MQ_TOPIC_CONFIRM_OWNER_DELAY, insertItem, null, 5);
return result;
}
... ... @@ -556,13 +557,12 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
//申请人申请状态
TransferRecordsHistory history = transferRecordsHistoryMapper.selectByToUid(tagId, nfcUid, null);
if(null == history) {
result.setApplyStatus(OPERATE_TYPE_NO_APPLY);//未申请
}else if(history.getStatus().equals(OPERATE_TYPE_APPLYING) && !(history.getToUid().equals(String.valueOf(uid)))) {
result.setApplyStatus(OPERATE_TYPE_NO_APPLY);
if(null != history && history.getToUid().equals(String.valueOf(uid))) {
result.setApplyStatus(history.getStatus());
}else if(null != history && history.getStatus().equals(OPERATE_TYPE_APPLYING)){//非本申请人
result.setApplyStatus(OPERATE_TYPE_CANNOT_APPLY);
return;
}else {
result.setApplyStatus(history.getStatus());
}
Map<Integer,ProfileInfoRsp> profileMap = userInfoProxyService.queryIcoAndMobile(Lists.newArrayList(String.valueOf(uid)));
... ... @@ -586,7 +586,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
String message = "向" + result.getCurrentOwner() + "申请成为新主人";
String tip = "";
if(result.getApplyStatus().equals(OPERATE_TYPE_REJECT)) {
tip = "当前物权所有⼈人拒绝物权转移";
tip = "当前物权所有⼈拒绝物权转移";
}else if(result.getApplyStatus().equals(OPERATE_TYPE_TIMEOUT)) {
tip = "当前主人确认申请超时，您可以重新发起申请";
}
... ...