From 1e779629fc4257df807a48280f3fc23eae752653 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 23 五月 2024 16:11:16 +0800
Subject: [PATCH] bug修复
---
meiya-rest/src/main/java/com/sinata/rest/modular/member/service/impl/MemUserServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/member/service/impl/MemUserServiceImpl.java b/meiya-rest/src/main/java/com/sinata/rest/modular/member/service/impl/MemUserServiceImpl.java
index dabc81a..e3a8381 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/member/service/impl/MemUserServiceImpl.java
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/member/service/impl/MemUserServiceImpl.java
@@ -32,6 +32,7 @@
import com.sinata.rest.modular.system.model.SystemNotice;
import com.sinata.rest.modular.system.service.ISmsRecordService;
import com.sinata.rest.modular.system.service.ISystemSetService;
+import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -373,6 +374,7 @@
@Override
@Transactional
public ApiUtils applySaleUser(BodyApplySaleUser body) {
+ log.info("推荐他人入司，入参：{}", body);
MallOrder mallOrder = mallOrderService.getById(body.getOrderNo());
log.info("推荐他人入司，订单：{}", mallOrder);
if (mallOrder == null || mallOrder.getOrderType() == EnumMallGoodsGroupType.GOODS.index || mallOrder.getUseUserId() != 0) {
@@ -453,12 +455,14 @@
// .build().insert();
// }
// } else {
- // 添加邀请关系
- MemUserRelation.builder()
- .id(user.getId())
- .parentId(shareUserRelation.getId())
- .relationPath(shareUserRelation.getRelationPath() + "/" + user.getId())
- .build().insert();
+ // 添加更新用户关系
+ memUserRelationService.saveOrUpdate(
+ MemUserRelation.builder()
+ .id(user.getId())
+ .parentId(shareUserRelation.getId())
+ .relationPath(shareUserRelation.getRelationPath() + "/" + user.getId())
+ .build()
+ );
// }
// 订单材料受赠人，0未申请入司
@@ -470,7 +474,7 @@
public void applySaleUserUpdate(BodyApplySaleUser body, MemUser user, Integer equityUserId, String equityOrderNo) {
// 判断是否已经申请入司
- Assert.isFalse(user.getIsLeaveOffice() != -1, "该用户已有入司申请！");
+ Assert.isFalse(user.getAuditState()==1 && user.getIsLeaveOffice() == 0, "该用户已有入司申请！");
user = user.setCardType(body.getCardType())
.setRealName(body.getRealName())
@@ -644,4 +648,8 @@
}
}
+ @Override
+ public List<MemUser> queryLevelUpUserList() {
+ return baseMapper.queryLevelUpUserList();
+ }
}
--
Gitblit v1.7.1