From d764a28d914571e7a6c62d85b6e81e70328ecfdb Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 23 十一月 2024 17:32:51 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java
index 8d5464e..6f7a36d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java
@@ -50,7 +50,7 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(YwCustomer ywCustomer) {
if(Objects.isNull(ywCustomer)
- || Objects.nonNull(ywCustomer.getType())
+ || Objects.isNull(ywCustomer.getType())
|| StringUtils.isBlank(ywCustomer.getName())
|| Objects.isNull(ywCustomer.getMember())
|| StringUtils.isBlank(ywCustomer.getMember().getName())
@@ -72,8 +72,8 @@
member.setCreateDate(new Date());
member.setIsdeleted(Constants.ZERO);
member.setStatus(Constants.ZERO);
- member.setCompanyType(ywCustomer.getId());
member.setType(Constants.memberType.customer);
+ member.setCustomerId(ywCustomer.getId());
this.checkMember(member);
memberMapper.insert(member);
@@ -128,7 +128,7 @@
@Override
public void updateById(YwCustomer ywCustomer) {
if(Objects.isNull(ywCustomer)
- || Objects.nonNull(ywCustomer.getType())
+ || Objects.isNull(ywCustomer.getType())
|| StringUtils.isBlank(ywCustomer.getName())
|| Objects.isNull(ywCustomer.getMemberId())
){
@@ -156,6 +156,7 @@
return ywCustomerMapper.selectById(id);
}
+ @Override
public YwCustomer getDetail(Integer id) {
YwCustomer ywCustomer = ywCustomerMapper.selectById(id);
if(Objects.isNull(ywCustomer)){
@@ -189,6 +190,7 @@
queryWrapper
.selectAll(YwCustomer.class)
.selectAs(Member::getName,YwCustomer::getMemberName)
+ .selectAs(Member::getPhone,YwCustomer::getMemberPhone)
.leftJoin(Member.class,Member::getId,YwCustomer::getMemberId)
.eq(YwCustomer::getIsdeleted,Constants.ZERO)
.like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getName()),YwCustomer::getName,model.getName())
--
Gitblit v1.9.3