diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestMessageEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestMessageEntity.java index 80e69a5d7..a729146a5 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestMessageEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestMessageEntity.java @@ -28,15 +28,13 @@ public class InvestMessageEntity extends InvestBaseEntity { /** * 数据主键ID */ - @JsonIgnore - //@io.swagger.annotations.ApiModelProperty(value = "数据主键ID", name = "tid") + @io.swagger.annotations.ApiModelProperty(value = "数据主键ID", name = "tid") private Long tid; /** * 数据类型:0-招商任务;1-客户需求 */ - @JsonIgnore - //@io.swagger.annotations.ApiModelProperty(value = "数据类型:0-招商任务;1-客户需求", name = "type") + @io.swagger.annotations.ApiModelProperty(value = "数据类型:0-招商任务;1-客户需求", name = "type") private EnumFollowType type; /** * 消息内容 diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageResult.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageResult.java index 3aeebee39..725611355 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageResult.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageResult.java @@ -27,5 +27,14 @@ public class InvestPageResult { private boolean hasNextPage = false ; + public Collection getRecords() { + return records; + } + public void setRecords(Collection records) { + this.records = records; + if (total > (records.size() + current * size)) { + hasNextPage = true; + } + } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index c796f97ba..af6b28910 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -340,15 +340,10 @@ public class InvestBizServiceImpl implements InvestBizService { @Override public boolean saveCustomerAndDemand(InvestDemandDto demandDto) { InvestHelper.notNull(demandDto, demandDto.getCustomer(), demandDto.getDemand()); - InvestCustomerEntity customerEntityDB = customerService.getByIdNotNull(demandDto.getCustomer().getId()); - if (Objects.isNull(customerEntityDB)) { - customerEntityDB = demandDto.getCustomer(); - customerService.save(customerEntityDB); - } else { - customerService.updateById(demandDto.getCustomer()); - } + InvestCustomerEntity customerEntity = demandDto.getCustomer() ; + customerService.save(customerEntity); InvestDemandEntity demandEntity = demandDto.getDemand(); - demandEntity.setCustomerId(customerEntityDB.getId()); + demandEntity.setCustomerId(customerEntity.getId()); return demandService.save(demandEntity); } @@ -356,9 +351,16 @@ public class InvestBizServiceImpl implements InvestBizService { @Override public boolean updateCustomerAndDemand(InvestDemandDto demandDto) { InvestHelper.notNull(demandDto, demandDto.getCustomer(), demandDto.getDemand()); + Long customerId = demandDto.getCustomer().getId(); + if (Objects.isNull(customerId)) { + customerId = demandDto.getDemand().getCustomerId(); + demandDto.getCustomer().setId(customerId); + } customerService.updateById(demandDto.getCustomer()); InvestDemandEntity demandEntity = demandDto.getDemand(); - demandEntity.setCustomerId(demandDto.getCustomer().getId()); + if (Objects.isNull(demandEntity.getCustomerId())) { + demandEntity.setCustomerId(customerId); + } return demandService.updateById(demandEntity); }