店铺数量不足提示

ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserMapper.java

@@ -236,4 +236,11 @@ public interface SysUserMapper extends ExtendMapper<SysUser> {
 	 * @return
 	 */
 	List<SelectData<Void>> getReviewList(@Param("userId") Long whichUserId,@Param("roleCode") String roleCode);
+
+	/**
+	 * 修改数量
+	 * @param userId
+	 * @return
+	 */
+	int operationsDistributeNum(Long userId);
 }

ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserService.java

@@ -227,10 +227,12 @@ public interface SysUserService extends ExtendService<SysUser> {
 
 	/**
 	 * 扣减数量
+	 *
 	 * @param userId
+	 * @param storeName
 	 * @return
 	 */
-	Boolean deductionQuantity(Long userId);
+	Boolean deductionQuantity(Long userId, String storeName);
 
 	/**
 	 * 获取该公司重审列表

ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysUserServiceImpl.java

@@ -535,19 +535,21 @@ public class SysUserServiceImpl extends ExtendServiceImpl<SysUserMapper, SysUser
 	}
 
 	@Override
-	public Boolean deductionQuantity(Long userId) {
+	public Boolean deductionQuantity(Long userId, String storeName) {
 		SysUserBalanceVO balanceVO = baseMapper.userBalance(userId);
 		if (!adminUserChecker.isAdminUser(balanceVO.getWhichUserId())) {
 			SysUser sysUser = baseMapper.selectById(balanceVO.getWhichUserId());
 			if (sysUser.getChargingStatus() == 1) {
 				Integer residueClueNum = balanceVO.getResidueClueNum();
 				if (residueClueNum < 1) {
-					throw new BadRequestException("用户" + balanceVO.getUsername() + "可用数量不足!");
+					throw new BadRequestException("店铺:" + storeName + "可用数量不足!");
 				}
 				return baseMapper.operationsNum(userId, balanceVO.getResidueClueNum() - 1) > 0;
 			}
+			if (sysUser.getChargingStatus() == 0) {
+				return baseMapper.operationsDistributeNum(userId) > 0;
+			}
 		}
-
 		return Boolean.FALSE;
 	}
 

ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -175,6 +175,10 @@
 	</update>
 
 
+	<update id="operationsDistributeNum">
+		UPDATE sys_user SET distribute_num = distribute_num + 1 WHERE user_id = #{userId}
+	</update>
+
 	<select id="listSelectSonListData" resultType="com.baiye.domain.SelectData">
 		select su.username as name,
 		su.user_id as value

admin/src/main/java/com/baiye/modules/distribute/dto/StoreUserDTO.java

@@ -0,0 +1,25 @@
+package com.baiye.modules.distribute.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springdoc.api.annotations.ParameterObject;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Enzo
+ * @date 2023-10-20
+ */
+@Data
+@Schema(title = "门店管理dto")
+@ParameterObject
+public class StoreUserDTO {
+	@Schema(description = "门店名称")
+	private String storeName;
+
+	@Schema(description = "用户id")
+	private Long userId;
+
+	@Schema(description = "用户id")
+	private Long storeId;
+}

admin/src/main/java/com/baiye/modules/distribute/mapper/StoreUserMapper.java

@@ -1,11 +1,20 @@
 package com.baiye.modules.distribute.mapper;
 
 import com.baiye.extend.mybatis.plus.mapper.ExtendMapper;
+import com.baiye.modules.distribute.dto.StoreUserDTO;
 import com.baiye.modules.distribute.entity.StoreUserEntity;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author wjt
  * @date 2023/9/15
  */
 public interface StoreUserMapper  extends ExtendMapper<StoreUserEntity> {
+
+	/**
+	 * 查询列表
+	 * @param storeId
+	 * @return
+	 */
+    StoreUserDTO selectByStoreDTOByStoreId(@Param("storeId") Long storeId);
 }

admin/src/main/java/com/baiye/modules/distribute/service/StoreUserService.java

@@ -1,6 +1,7 @@
 package com.baiye.modules.distribute.service;
 
 import com.baiye.extend.mybatis.plus.service.ExtendService;
+import com.baiye.modules.distribute.dto.StoreUserDTO;
 import com.baiye.modules.distribute.entity.StoreUserEntity;
 import com.baiye.system.model.dto.SysUserNameRoleDTO;
 
@@ -28,9 +29,9 @@ public interface StoreUserService extends ExtendService<StoreUserEntity> {
 	void insertStoreUser(Long storeId, Long userId);
 
 	/**
-	 *
+	 * 店铺查询用户id
 	 * @param storeId
 	 * @return
 	 */
-	Long findUserIdByStoreId(Long storeId);
+	StoreUserDTO findUserIdByStoreId(Long storeId);
 }

admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java

@@ -13,9 +13,11 @@ import com.baiye.modules.distribute.converter.CustomConverter;
 import com.baiye.modules.distribute.dto.ChangeCustomDTO;
 import com.baiye.modules.distribute.dto.ClueDTO;
 import com.baiye.modules.distribute.dto.CustomDTO;
+import com.baiye.modules.distribute.dto.StoreUserDTO;
 import com.baiye.modules.distribute.entity.CustomEntity;
 import com.baiye.modules.distribute.entity.CustomStoreEntity;
 import com.baiye.modules.distribute.entity.StoreEntity;
+import com.baiye.modules.distribute.entity.StoreUserEntity;
 import com.baiye.modules.distribute.mapper.CustomMapper;
 import com.baiye.modules.distribute.qo.CustomQo;
 import com.baiye.modules.distribute.service.*;
@@ -177,14 +179,14 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 			List<CustomStoreEntity> customStores = customStoreService.selectListByCustomId(id);
 			if (CollUtil.isNotEmpty(customStores)) {
 				for (CustomStoreEntity store : customStores) {
-					Long userId = storeUserService.findUserIdByStoreId(store.getStoreId());
+					StoreUserDTO entity = storeUserService.findUserIdByStoreId(store.getStoreId());
-					if (ObjectUtil.isNotNull(userId) && userId > 0) {
+					if (ObjectUtil.isNotNull(entity) && ObjectUtil.isNotNull(entity.getUserId())) {
 						// 扣减余额
-						Boolean result = sysUserService.deductionQuantity(userId);
+						Boolean result = sysUserService.deductionQuantity(entity.getUserId(), entity.getStoreName());
 						if (Boolean.TRUE.equals(result)) {
 							ClueDTO clueDTO = ClueDTO.builder().originName(ClueSourceEnum.STORE_DISTRIBUTION.getDescription()).remark
 									(customEntity.getRemark()).nid(AESUtils.encrypt(customEntity.getCustomNid(), securityProperties.getPasswordSecretKey())).assignedBy
-											(userId).createBy(customEntity.getCompanyId()).assignedName(store.getStoreName()).otherClue(otherClue).build();
+											(entity.getUserId()).createBy(customEntity.getCompanyId()).assignedName(store.getStoreName()).otherClue(otherClue).build();
 							list.add(clueDTO);
 						}
 					}

admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreUserServiceImpl.java

@@ -2,6 +2,7 @@ package com.baiye.modules.distribute.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl;
+import com.baiye.modules.distribute.dto.StoreUserDTO;
 import com.baiye.modules.distribute.entity.StoreUserEntity;
 import com.baiye.modules.distribute.mapper.StoreUserMapper;
 import com.baiye.modules.distribute.service.StoreUserService;
@@ -9,14 +10,11 @@ import com.baiye.security.util.SecurityUtils;
 import com.baiye.system.model.dto.SysUserNameRoleDTO;
 import com.baiye.system.properties.BusinessProperties;
 import com.baiye.system.service.SysUserService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author wjt
@@ -52,14 +50,8 @@ public class StoreUserServiceImpl extends ExtendServiceImpl<StoreUserMapper, Sto
 	}
 
 	@Override
-	public Long findUserIdByStoreId(Long storeId) {
+	public StoreUserDTO findUserIdByStoreId(Long storeId) {
-		List<StoreUserEntity> storeUserEntities = baseMapper.selectList
+		return baseMapper.selectByStoreDTOByStoreId(storeId);
-				(Wrappers.<StoreUserEntity>lambdaQuery().eq(StoreUserEntity::getStoreId, storeId)
-						.orderByDesc(StoreUserEntity::getId));
-		if (CollUtil.isNotEmpty(storeUserEntities)) {
-			return storeUserEntities.get(0).getUserId();
-		}
-		return 0L;
 	}
 
 }

admin/src/main/resources/mapper/StoreUserMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.baiye.modules.distribute.mapper.StoreUserMapper">
+	<sql id="Base_Alias_Column_List">
+		st.id as storeId,
+		st.store_name,
+		tsu.user_id
+	</sql>
+
+	<select id="selectByStoreDTOByStoreId" resultType="com.baiye.modules.distribute.dto.StoreUserDTO">
+
+		SELECT
+
+		<include refid="Base_Alias_Column_List"/>
+		FROM tb_store st
+		left join tb_store_user tsu on st.id = tsu.store_id
+		where tsu.id = #{storeId}
+	</select>
+</mapper>