From 6bc568611d0430c94f30e41736d7809e32a64273 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 11 九月 2024 15:18:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/current/CurrentUserDTO.java | 3 +++
src/main/java/com/mzl/flower/service/supplier/StationService.java | 4 ++++
src/main/java/com/mzl/flower/service/system/UserService.java | 5 +++++
3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/current/CurrentUserDTO.java b/src/main/java/com/mzl/flower/dto/response/current/CurrentUserDTO.java
index 7d12c3b..c3cdf51 100644
--- a/src/main/java/com/mzl/flower/dto/response/current/CurrentUserDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/current/CurrentUserDTO.java
@@ -53,4 +53,7 @@
@ApiModelProperty(value = "当前积分")
private Integer currentPoint;
+
+ @ApiModelProperty(value = "是否总仓权限")
+ private Boolean mainWarehouse;
}
diff --git a/src/main/java/com/mzl/flower/service/supplier/StationService.java b/src/main/java/com/mzl/flower/service/supplier/StationService.java
index 198eb34..cfc730d 100644
--- a/src/main/java/com/mzl/flower/service/supplier/StationService.java
+++ b/src/main/java/com/mzl/flower/service/supplier/StationService.java
@@ -96,4 +96,8 @@
List<StationDTO> list = stationMapper.queryList( name);
return list;
}
+
+ public Boolean getMainWarehouse(String userId) {
+ return stationMapper.selectCount(new LambdaQueryWrapper<Station>().like(Station::getUserIds, userId))>0;
+ }
}
diff --git a/src/main/java/com/mzl/flower/service/system/UserService.java b/src/main/java/com/mzl/flower/service/system/UserService.java
index 3ddf79c..e5286b5 100644
--- a/src/main/java/com/mzl/flower/service/system/UserService.java
+++ b/src/main/java/com/mzl/flower/service/system/UserService.java
@@ -21,6 +21,7 @@
import com.mzl.flower.service.customer.CustomerService;
import com.mzl.flower.service.partner.PartnerService;
import com.mzl.flower.service.point.CustomerPointService;
+import com.mzl.flower.service.supplier.StationService;
import com.mzl.flower.service.supplier.SupplierService;
import com.mzl.flower.utils.TreeBuilderUtil;
import com.mzl.flower.utils.UUIDGenerator;
@@ -79,6 +80,8 @@
@Autowired
private CustomerPointMapper customerPointMapper;
+ @Autowired
+ private StationService stationService;
public User findUserByOpenId(String openId, String sessionKey, String unionId
@@ -208,6 +211,8 @@
result.setSupplierDTO(supplierService.getCurrentSupplier());
}else if(Constants.USER_TYPE.partner.name().equals(user.getType())){
result.setPartnerDTO(partnerService.getCurrentPartner());
+ }else if (Constants.USER_TYPE.admin.name().equals(user.getType())){
+ result.setMainWarehouse(stationService.getMainWarehouse(user.getId()));
}
result.setBindWechat(wechatMapper.selectCount(new LambdaQueryWrapper<UserWechat>()
.eq(UserWechat::getUserId, userId)) > 0);
--
Gitblit v1.9.3