From a75b18a4157ab486e0b51c438ac165ab3a08e3e0 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期四, 25 七月 2024 18:10:00 +0800 Subject: [PATCH] 代码提交 --- server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java index 1416905..5fdc7af 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java @@ -191,13 +191,7 @@ if (pageWrap.getModel().getAreaCode() != null) { queryWrapper.lambda().eq(Customer::getAreaCode, pageWrap.getModel().getAreaCode()); } - for(PageWrap.SortData sortData: pageWrap.getSorts()) { - if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { - queryWrapper.orderByDesc(sortData.getProperty()); - } else { - queryWrapper.orderByAsc(sortData.getProperty()); - } - } + queryWrapper.lambda().orderByDesc(Customer::getCreateDate ); return PageData.from(customerMapper.selectPage(page, queryWrapper)); } @@ -245,6 +239,7 @@ customerLog.setIsdeleted(Constants.ZERO); customerLog.setType(Constants.TWO); customerLog.setCrmStatus(Constants.ZERO); + customerLog.setName(StringUtils.isEmpty(member.getName())?member.getNickname():member.getName()); customerLog.setPhone(customer.getPhone()); customerLog.setBudget(renovationCalculatorDTO.getBudget().multiply(new BigDecimal(10000)).toString()); customerLog.setHouseStatus(renovationCalculatorDTO.getHouseStatus()); @@ -277,7 +272,8 @@ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛淇℃伅"); } if(StringUtils.isEmpty(member.getPhone())){ - throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈巿鏉冩墜鏈哄彿"); + member.setPhone(freeCustomizationDTO.getPhone()); + memberMapper.updateById(member); } Customer customer = customerMapper.selectOne(new QueryWrapper<Customer>().lambda() .eq(Customer::getPhone,freeCustomizationDTO.getPhone()).eq(Customer::getIsdeleted, Constants.ZERO).last("limit 1")); -- Gitblit v1.9.3