From f489850355bae6d690b2d3e6d0627f90bde79b1d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 06 九月 2024 18:59:51 +0800
Subject: [PATCH] 1.优惠券记录新增category查询字段 2.小程序-商品历史记录根据更新时间排序 3.优惠券-用户优惠券控制已下架的优惠券不可重新上架，及当前优惠券的已经发放的情况下不可再次下发
---
src/main/java/com/mzl/flower/service/system/UserService.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
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 6b1b93d..855ec56 100644
--- a/src/main/java/com/mzl/flower/service/system/UserService.java
+++ b/src/main/java/com/mzl/flower/service/system/UserService.java
@@ -13,10 +13,14 @@
import com.mzl.flower.dto.response.system.MenuTreeDTO;
import com.mzl.flower.dto.response.system.UserDetailsDTO;
import com.mzl.flower.dto.response.system.UserListDTO;
+import com.mzl.flower.entity.point.CustomerPoint;
import com.mzl.flower.entity.system.*;
+import com.mzl.flower.enums.TrueOrFalseEnum;
+import com.mzl.flower.mapper.point.CustomerPointMapper;
import com.mzl.flower.mapper.system.*;
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.SupplierService;
import com.mzl.flower.utils.TreeBuilderUtil;
import com.mzl.flower.utils.UUIDGenerator;
@@ -72,6 +76,10 @@
@Autowired
private EmployeeMapper employeeMapper;
+
+ @Autowired
+ private CustomerPointMapper customerPointMapper;
+
public User findUserByOpenId(String openId, String sessionKey, String unionId
, String imgUrl, String nickname,String userType){
@@ -187,6 +195,15 @@
if(Constants.USER_TYPE.customer.name().equals(user.getType())){
result.setCustomerDTO(customerService.getCurrentCustomer());
+ //查询积分
+ CustomerPoint customerPoint = customerPointMapper.selectOne(new LambdaQueryWrapper<CustomerPoint>()
+ .eq(CustomerPoint::getUserId, userId));
+ if(customerPoint == null){
+ result.setCurrentPoint(0);
+ }else{
+ Integer currentPoint =customerPoint.getTotalPoint()-customerPoint.getUsedPoint()-customerPoint.getExpiredPoint();
+ result.setCurrentPoint(currentPoint>=0?currentPoint:0);
+ }
}else if(Constants.USER_TYPE.supplier.name().equals(user.getType())){
result.setSupplierDTO(supplierService.getCurrentSupplier());
}else if(Constants.USER_TYPE.partner.name().equals(user.getType())){
@@ -455,4 +472,10 @@
}
+ public List<User> getVipGradeUserList(String getVipGrade) {
+ QueryWrapper<User> queryWrapper=new QueryWrapper<>();
+ queryWrapper.lambda().eq(User::getDeleted, TrueOrFalseEnum.FALSE.isFlag())
+ .eq(User::getVipGrade,getVipGrade);
+ return userMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.9.3