From a66a110341f794311b495dedd59280eaa1456d65 Mon Sep 17 00:00:00 2001 From: Burce Date: Thu, 10 Oct 2019 10:35:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86]adjust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/dto/InvestDemandDto.java | 1 + .../domain/po/InvestDemandEntity.java | 2 +- .../domain/po/InvestFollowRecordEntity.java | 2 +- .../domain/vo/invest/InvestDemandVo.java | 4 +- .../vo/invest/InvestFollowRecordVo.java | 6 ++- .../domain/vo/invest/InvestTaskVo.java | 3 +- .../iformall/service/invest/InvestHelper.java | 46 ++++++++++++++----- .../invest/impl/InvestBaseServiceImpl.java | 2 +- .../invest/impl/InvestBizServiceImpl.java | 33 +++++++------ .../impl/InvestFollowRecordServiceImpl.java | 2 +- 10 files changed, 61 insertions(+), 40 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/InvestDemandDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/InvestDemandDto.java index 1fe5bd370..4c74b8a05 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/InvestDemandDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/InvestDemandDto.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) public class InvestDemandDto extends InvestDemandEntity { + @io.swagger.annotations.ApiModelProperty(value = "customer", name = "customer",required = true) private InvestCustomerEntity customer; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java index 5f937e183..ee30ca561 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java @@ -39,7 +39,7 @@ public class InvestDemandEntity extends InvestBaseEntity { * 客户意向 */ @io.swagger.annotations.ApiModelProperty(value = "客户意向", name = "intent", - example = "{\"rent_area\":100,\"opening_time\": 2019-09-03}") + example = "{\"rent_area\":100,\"opening_time\": \"2019-09-03\"}") @LogColumn(COLUMN_TYPE) private String intent; /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java index 573067989..9570facc5 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java @@ -33,7 +33,7 @@ public class InvestFollowRecordEntity extends InvestBaseEntity { * 洽谈内容 */ @io.swagger.annotations.ApiModelProperty(value = "洽谈内容", name = "content",example = "{\n" + - " \"date\": \"2019-09-10 20:12:20\",\n" + + " \"date\": \"2019-09-03\",\n" + " \"address\": \"北京三里屯\",\n" + " \"text\": \"今天约了王老板,目标要签订框架协议\",\n" + " \"document\": [\"url1\",\"url2\"],\n" + diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandVo.java index fc1988ac1..50a10901e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandVo.java @@ -4,16 +4,14 @@ import com.iformall.domain.po.InvestCustomerEntity; import com.iformall.domain.po.InvestDemandEntity; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBrand; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; @Data -@Builder @EqualsAndHashCode(callSuper = true) public class InvestDemandVo extends InvestDemandEntity { - @io.swagger.annotations.ApiModelProperty(value = "customer", name = "customer",required = true) + @io.swagger.annotations.ApiModelProperty(value = "customer", name = "customer") private InvestCustomerEntity customer; @io.swagger.annotations.ApiModelProperty(value = "brand", name = "brand") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowRecordVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowRecordVo.java index fa1f0c118..9e7b89722 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowRecordVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowRecordVo.java @@ -1,22 +1,24 @@ package com.iformall.domain.vo.invest; import com.iformall.domain.po.*; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.List; @Data -@Builder @EqualsAndHashCode(callSuper = true) public class InvestFollowRecordVo extends InvestFollowRecordEntity { + @io.swagger.annotations.ApiModelProperty(value = "customer", name = "customer") private InvestCustomerEntity customer; + @io.swagger.annotations.ApiModelProperty(value = "brand", name = "brand") private WxBrand brand; + @io.swagger.annotations.ApiModelProperty(value = "memberInfo", name = "memberInfo") private List memberInfo ; + @io.swagger.annotations.ApiModelProperty(value = "ownerInfo", name = "ownerInfo") private MallUserInfo ownerInfo; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java index 8cdb6d1d3..4ed24ecd4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java @@ -2,14 +2,12 @@ package com.iformall.domain.vo.invest; import com.iformall.domain.po.InvestTaskEntity; import com.iformall.domain.po.MallUserInfo; -import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.List; @Data -@Builder @EqualsAndHashCode(callSuper = true) public class InvestTaskVo extends InvestTaskEntity { @@ -19,5 +17,6 @@ public class InvestTaskVo extends InvestTaskEntity { @io.swagger.annotations.ApiModelProperty(value = "targetInfo", name = "targetInfo") private T targetInfo; + @io.swagger.annotations.ApiModelProperty(value = "ownerInfo", name = "ownerInfo") private List ownerInfo ; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java index a5311c838..15b345b56 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java @@ -1,12 +1,15 @@ package com.iformall.service.invest; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.iformall.common.ErrorCode; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.exception.MallinkException; -import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.compress.utils.Lists; +import org.springframework.util.CollectionUtils; import java.text.MessageFormat; +import java.util.List; import java.util.Objects; public class InvestHelper { @@ -15,13 +18,41 @@ public class InvestHelper { Page page = new Page<>(); page.setCurrent(pageQuery.getPageNum()); page.setSize(pageQuery.getPageSize()); - page.setAscs(pageQuery.getAscs()); - page.setDescs(pageQuery.getDescs()); + page.setAscs(camelToUnderline(pageQuery.getAscs())); + page.setDescs(camelToUnderline(pageQuery.getDescs())); page.setOptimizeCountSql(true); page.setSearchCount(true); return page; } + private static List camelToUnderline(List orders) { + if (CollectionUtils.isEmpty(orders)) { + return orders; + } + + List newOrders = Lists.newArrayList(); + for (String order : orders) { + newOrders.add(StringUtils.camelToUnderline(order)); + } + return newOrders; + } + + /** + * @param objects the object to check + * @throws MallinkException if the object is {@code null} + */ + public static void notNull(final Object... objects) { + if (objects == null) { + throwException(ErrorCode.INVEST_PARAMETER_NOT_FOUND, "参数"); + } + + for (final Object val : objects) { + if (val == null) { + throwException(ErrorCode.INVEST_PARAMETER_NOT_FOUND, "参数"); + } + } + } + /** * @param object the object to check * @param message the exception message to use if the assertion fails @@ -44,15 +75,6 @@ public class InvestHelper { } } - /** - * @param values the objects to check - */ - public static void allNotNull(final Object... values) { - if (!ObjectUtils.allNotNull(values)) { - throwException(ErrorCode.INVEST_PARAMETER_NOT_FOUND, values.getClass().getTypeName()); - } - } - /** * @param expression * @param errorCode diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java index c695cac5b..009d07179 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java @@ -37,7 +37,7 @@ public class InvestBaseServiceImpl, T> extends ServiceIm @Override public InvestPageResult queryPage(InvestPageQuery params) { - InvestHelper.allNotNull(params); + InvestHelper.notNull(params); //1、分页信息 Page queryPage = buildQueryPage(params); //2、查询数据 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 da485ff38..a5372f49e 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 @@ -105,10 +105,10 @@ public class InvestBizServiceImpl implements InvestBizService { Map followContent = (Map) JSON.parseObject(item.getContent(), Map.class); String followMember = (String) followContent.get("member"); List ownerInfo = getMallUserInfos(followMember, usersMap); - InvestFollowRecordVo followRecordVo = InvestFollowRecordVo.builder() - .customer(customerEntity) - .memberInfo(ownerInfo) - .brand(brand).build(); + InvestFollowRecordVo followRecordVo = new InvestFollowRecordVo(); + followRecordVo.setCustomer(customerEntity); + followRecordVo.setMemberInfo(ownerInfo); + followRecordVo.setBrand(brand); followRecordVo.setOwnerInfo(usersMap.get(item.getOwner())); BeanUtils.copyProperties(item, followRecordVo); resultList.add(followRecordVo); @@ -130,7 +130,7 @@ public class InvestBizServiceImpl implements InvestBizService { @Transactional(rollbackFor = Exception.class) @Override public boolean saveCustomerAndDemand(InvestDemandDto demandDto) { - InvestHelper.allNotNull(demandDto); + InvestHelper.notNull(demandDto); InvestCustomerEntity customerEntity = demandDto.getCustomer(); InvestCustomerEntity customerEntityDB = customerService.getById(demandDto.getCustomerId()); if (Objects.nonNull(customerEntity)) { @@ -142,15 +142,16 @@ public class InvestBizServiceImpl implements InvestBizService { } InvestDemandEntity demandEntity = new InvestDemandEntity(); BeanUtils.copyProperties(demandDto, demandEntity); + demandEntity.setCustomerId(customerEntity.getId()); return demandService.save(demandEntity); } @Transactional(rollbackFor = Exception.class) @Override public boolean updateCustomerAndDemand(InvestDemandDto demandDto) { - InvestHelper.allNotNull(demandDto, demandDto.getCustomerId()); + InvestHelper.notNull(demandDto, demandDto.getCustomerId()); InvestCustomerEntity customerEntity = demandDto.getCustomer(); - InvestHelper.allNotNull(customerEntity); + InvestHelper.notNull(customerEntity); customerService.updateById(customerEntity); InvestDemandEntity demandEntity = new InvestDemandEntity(); BeanUtils.copyProperties(demandDto, demandEntity); @@ -176,12 +177,11 @@ public class InvestBizServiceImpl implements InvestBizService { } private InvestDemandVo buildDemindItem(InvestDemandEntity item, InvestCustomerEntity customer, WxBrand brand, WxShop shop, Map usersMap) { - InvestDemandVo resultItemVo = InvestDemandVo.builder() - .brand(brand) - .customer(customer) - .targetInfo(shop) - .ownerInfo(usersMap.get(item.getOwner())) - .build(); + InvestDemandVo resultItemVo = new InvestDemandVo(); + resultItemVo.setBrand(brand); + resultItemVo.setCustomer(customer); + resultItemVo.setTargetInfo(shop); + resultItemVo.setOwnerInfo(usersMap.get(item.getOwner())); BeanUtils.copyProperties(item, resultItemVo); return resultItemVo; } @@ -193,10 +193,9 @@ public class InvestBizServiceImpl implements InvestBizService { private InvestTaskVo buildTaskItem(InvestTaskEntity item, WxShop shop, Map usersMap) { List ownerInfo = getMallUserInfos(item.getOwner(), usersMap); - InvestTaskVo resultItemVo = InvestTaskVo.builder() - .targetInfo(shop) - .ownerInfo(ownerInfo) - .build(); + InvestTaskVo resultItemVo = new InvestTaskVo(); + resultItemVo.setTargetInfo(shop); + resultItemVo.setOwnerInfo(ownerInfo); BeanUtils.copyProperties(item, resultItemVo); return resultItemVo; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java index 10626d0d9..57614bb44 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java @@ -30,7 +30,7 @@ public class InvestFollowRecordServiceImpl extends InvestBaseServiceImpl