From 9b774a0d10e522323a51053ae9b79e02af3accae Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 十二月 2024 13:29:13 +0800
Subject: [PATCH] add: 供应商子账号3
---
src/main/java/com/mzl/flower/service/supplier/SupplierSubService.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/supplier/SupplierSubService.java b/src/main/java/com/mzl/flower/service/supplier/SupplierSubService.java
index b73a886..7a61aef 100644
--- a/src/main/java/com/mzl/flower/service/supplier/SupplierSubService.java
+++ b/src/main/java/com/mzl/flower/service/supplier/SupplierSubService.java
@@ -36,6 +36,7 @@
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
@@ -248,20 +249,36 @@
}
public List<SupplierSub> getSubSupplier() {
+ List<SupplierSub> supplierSubs = new ArrayList<>();
SupplierDTO supplierDTO = supplierMapper.getCurrentSupplier(SecurityUtils.getUserId());
- if(ObjectUtils.isEmpty(supplierDTO)){
+ if (ObjectUtils.isEmpty(supplierDTO)) {
throw new ValidationException("供应商信息不存在");
}
- return supplierSubMapper.getSubSupplier(String.valueOf(supplierDTO.getId()));
+
+ List<SupplierSub> subSupplier = supplierSubMapper.getSubSupplier(String.valueOf(supplierDTO.getId()));
+ if (!CollectionUtils.isEmpty(subSupplier)) {
+ subSupplier.forEach(s -> {
+ s.setIsSub(true);
+ s.setType(0);
+ });
+ supplierSubs.addAll(subSupplier);
+ }
+ return supplierSubs;
}
public SupplierSub getById(Long id) {
return supplierSubMapper.selectById(id);
}
- public CurrentUserDTO getSwitchById(Long id) {
- SupplierSub supplierSub = supplierSubMapper.selectById(id);
- String userId = supplierSub.getUserId();
+ public CurrentUserDTO getSwitchById(Long id, int type) {
+ String userId = "";
+ if (type == 1) {
+ userId = SecurityUtils.getUserId();
+ }else {
+ SupplierSub supplierSub = supplierSubMapper.selectById(id);
+ supplierSub.setType(0);
+ userId = supplierSub.getUserId();
+ }
CurrentUserDTO result = new CurrentUserDTO();
@@ -319,8 +336,9 @@
}
}else if(Constants.USER_TYPE.supplier.name().equals(user.getType())){
result.setSupplierDTO(supplierService.getCurrentSupplier());
- SupplierSub sub = supplierSubMapper.getCurrentSupplier(SecurityUtils.getUserId());
+ SupplierSub sub = supplierSubMapper.getCurrentSupplier(userId);
if (!ObjectUtils.isEmpty(sub)) {
+ sub.setType(0);
result.setIsSubSupplier(true);
result.setSupplierSub(sub);
result.setSwitchFlag(true);
@@ -344,4 +362,31 @@
public User getUserById(String id){
return userMapper.selectById(id);
}
+
+ public List<SupplierSub> getAllSupplier() {
+ List<SupplierSub> supplierSubs = new ArrayList<>();
+ SupplierDTO supplierDTO = supplierMapper.getCurrentSupplier(SecurityUtils.getUserId());
+ if (!ObjectUtils.isEmpty(supplierDTO)) {
+ SupplierSub subParent = new SupplierSub();
+ subParent.setId((long) -1);
+ subParent.setUserId(supplierDTO.getUserId());
+ subParent.setSupplierId(supplierDTO.getId());
+ subParent.setName(supplierDTO.getName());
+ subParent.setContact(supplierDTO.getContactName());
+ subParent.setPhone(supplierDTO.getContactTel());
+ subParent.setIsEnabled(supplierDTO.getIsEnabled());
+ subParent.setIsSub(false);
+ subParent.setType(1);
+ supplierSubs.add(subParent);
+ }
+ List<SupplierSub> subSupplier = supplierSubMapper.getSubSupplier(String.valueOf(supplierDTO.getId()));
+ if (!CollectionUtils.isEmpty(subSupplier)) {
+ subSupplier.forEach(s->{
+ s.setIsSub(true);
+ s.setType(0);
+ });
+ supplierSubs.addAll(subSupplier);
+ }
+ return supplierSubs;
+ }
}
--
Gitblit v1.9.3