From 6813f67d383fa725627822d2aa3f8efb6de868ee Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 6 Jan 2024 18:04:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/src/views/member/index.vue | 2 -- .../userManager/entity/MtInvitation.java | 20 +++++++++++++++---- .../mapper/MtInvitationMapper.java | 3 ++- .../userManager/service/LJUserService.java | 6 ------ .../service/MtInvitationService.java | 5 +++++ .../service/UserBalanceService.java | 6 ++++-- .../service/impl/LJUserServiceImpl.java | 16 +++++++++------ .../service/impl/MtInvitationServiceImpl.java | 10 ++++++++++ .../service/impl/UserBalanceServiceImpl.java | 14 ++++++++++--- .../pagesHome/oilRecharge/oilRecharge.vue | 4 ++-- gasStation-uni/pagesMy/VIP/vip.vue | 19 ++++++++++++++++-- .../pagesRefuel/orderSuccess/index.vue | 6 ++++-- 12 files changed, 81 insertions(+), 30 deletions(-) diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index cb7887a81..f40b6f868 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -741,13 +741,11 @@ export default { this.$modal.msgError("手机号已存在"); }else { addUser(this.form).then(res => { - if (res.data == 1) { this.$modal.msgSuccess("新增会员成功"); this.open = false; this.openUser = false; this.getList(); this.getUserList(); - } }); } }) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtInvitation.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtInvitation.java index 6d84b96e1..f164ac6cb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtInvitation.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtInvitation.java @@ -1,7 +1,14 @@ package com.fuint.business.userManager.entity; +import java.io.Serializable; import java.util.Date; -import com.fuint.repository.model.base.BaseEntity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fuint.framework.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -11,9 +18,14 @@ import lombok.Data; * @since 2023-11-28 16:04:50 */ @Data -public class MtInvitation extends BaseEntity { - private static final long serialVersionUID = -81875140284347711L; - +@TableName("mt_invitation") +@ApiModel(value = "MtInvitation对象", description = "邀请注册表") +public class MtInvitation extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("会员ID") + @TableId(value = "ID", type = IdType.AUTO) private Integer id; /** * 用户id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtInvitationMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtInvitationMapper.java index 053db280c..70246e7de 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtInvitationMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtInvitationMapper.java @@ -1,5 +1,6 @@ package com.fuint.business.userManager.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.userManager.entity.MtInvitation; @@ -13,7 +14,7 @@ import java.util.List; * @author wangh * @since 2023-11-28 16:04:50 */ -public interface MtInvitationMapper { +public interface MtInvitationMapper extends BaseMapper { /** * 通过ID查询单条数据 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java index e80c6ce33..cfbd733ec 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java @@ -34,12 +34,6 @@ public interface LJUserService extends IService { */ LJUser queryUserByUserId(int userId); - /** - * - * @return - */ - LJUser queryUserByUserId(); - /** * 查询所有会员信息 * @return diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/MtInvitationService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/MtInvitationService.java index 4129f1c8c..4687edfd6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/MtInvitationService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/MtInvitationService.java @@ -55,4 +55,9 @@ public interface MtInvitationService { */ boolean deleteById(Integer id); + /** + * 根据会员id和店铺id删除用户邀请注册信息 + * @param userId + */ + void deleteByUserIdAndeStoreId(Integer userId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java index f0429eba6..201848a54 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/UserBalanceService.java @@ -3,6 +3,8 @@ package com.fuint.business.userManager.service; import com.baomidou.mybatisplus.extension.service.IService; import com.fuint.business.userManager.entity.UserBalance; +import java.util.List; + /** * 会员储值卡信息 业务层 */ @@ -16,7 +18,7 @@ public interface UserBalanceService extends IService { public int insertUserBalance(UserBalance balance); /** - * 根据用户id删除会员储值信息 + * 根据用户id和店铺id删除会员储值信息 * @param userId */ public void deleteUserBalanceByUserId(Integer userId); @@ -33,7 +35,7 @@ public interface UserBalanceService extends IService { * @param userId * @return */ - public UserBalance selectUserBalance(int userId); + public List selectUserBalance(int userId); /** * 根据用户id和店铺id查询用户余额信息 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java index 132c2df24..8a32922ce 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java @@ -74,11 +74,6 @@ public class LJUserServiceImpl extends ServiceImpl impleme return baseMapper.selectById(userId); } - @Override - public LJUser queryUserByUserId() { - return null; - } - /** * 查询所有会员信息 * @return @@ -201,14 +196,23 @@ public class LJUserServiceImpl extends ServiceImpl impleme return list; } + @Autowired + private MtInvitationService invitationService; + /** * 根据id删除会员信息 * @param id */ @Override public void deleteUserById(Integer id) { - baseMapper.deleteById(id); balanceService.deleteUserBalanceByUserId(id); + + List userBalances = balanceService.selectUserBalance(id); + if (userBalances.size()==0){ + baseMapper.deleteById(id); + } + + invitationService.deleteByUserIdAndeStoreId(id); } @Autowired diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtInvitationServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtInvitationServiceImpl.java index 03f109d97..7b21b430a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtInvitationServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtInvitationServiceImpl.java @@ -1,5 +1,6 @@ package com.fuint.business.userManager.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.userManager.entity.MtInvitation; @@ -86,4 +87,13 @@ public class MtInvitationServiceImpl implements MtInvitationService { public boolean deleteById(Integer id) { return this.mtInvitationMapper.deleteById(id) > 0; } + + @Override + public void deleteByUserIdAndeStoreId(Integer userId) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("userId",userId); + queryWrapper.eq("storeId",nowAccountInfo.getStoreId()); + mtInvitationMapper.delete(queryWrapper); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java index ec0947c21..267fc6404 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java @@ -3,6 +3,8 @@ package com.fuint.business.userManager.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.storeInformation.entity.LJStore; +import com.fuint.business.storeInformation.service.ILJStoreService; import com.fuint.business.userManager.entity.LJUserGrade; import com.fuint.business.userManager.entity.UserBalance; import com.fuint.business.userManager.mapper.UserBalanceMapper; @@ -10,9 +12,11 @@ import com.fuint.business.userManager.service.LJUserGradeService; import com.fuint.business.userManager.service.UserBalanceService; import com.fuint.common.dto.AccountInfo; import com.fuint.common.util.TokenUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 会员储值卡信息 业务层 @@ -23,6 +27,8 @@ public class UserBalanceServiceImpl extends ServiceImpl(); queryWrapper.eq("mt_user_id",userId); + queryWrapper.eq("chain_store_id",store.getChainStoreId()); baseMapper.delete(queryWrapper); } @@ -44,11 +53,10 @@ public class UserBalanceServiceImpl extends ServiceImpl selectUserBalance(int userId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("mt_user_id",userId); - UserBalance balance = baseMapper.selectOne(queryWrapper); - return balance; + return baseMapper.selectList(queryWrapper); } @Override diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue index aa650fcea..ff065868e 100644 --- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue +++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue @@ -283,14 +283,14 @@ if (this.staffId == '') { uni.showToast({ title: "员工为必填项", - icon: Error + icon: "error" }) return } if (this.carValueId == '') { uni.showToast({ title: "储值卡为必填项", - icon: Error + icon: "error" }) return } diff --git a/gasStation-uni/pagesMy/VIP/vip.vue b/gasStation-uni/pagesMy/VIP/vip.vue index fdbe793df..d2ded7e26 100644 --- a/gasStation-uni/pagesMy/VIP/vip.vue +++ b/gasStation-uni/pagesMy/VIP/vip.vue @@ -15,7 +15,10 @@ - {{item.name}} + + {{item.name}} + (当前等级) + 升级会员享更多特权