Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/AllotController.java

@@ -17,6 +17,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -27,9 +27,6 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.trade.purchase.order.enums.OrderTypeEnum;
-import io.seata.core.exception.TransactionException;
-import io.seata.core.model.GlobalStatus;
-import io.seata.core.model.TransactionManager;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -1845,7 +1842,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 								&& s.getTenantId().equals(SecureUtil.getTenantId())
 						).findFirst().orElse(null);
 						if (oneStock == null) {
-							throw new SecurityException("撤销失败:未查询到库存信息");
+							throw new SecurityException("编号:"+oneStock.getCode()+"撤销失败:未查询到库存信息");
 						}
 						// 原单据的订货数量
 						BigDecimal orderQuantity = e.getOrderQuantity();
@@ -1856,7 +1853,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 						// 判断比较大小
 						if (orderQuantity.compareTo(lockingQuantity) > 0) {
-							throw new SecurityException("撤销失败:原单据的" + oneStock.getCode() + "订货数量大于锁定库存,无法释放 库存");
+							throw new SecurityException("撤销失败:原单据的" + oneStock.getCode() + "订货数量:"+orderQuantity+"大于锁定库存:"+lockingQuantity+",无法释放 库存");
 						}
 						// 增加可用库存
 						oneStock.setSurplusRouteQuantity(surplusRouteQuantity.add(orderQuantity));

blade-service/blade-stock/src/main/java/org/springblade/stock/feign/StockGoodsClient.java

@@ -24,6 +24,7 @@ import org.springblade.stock.service.IStockGoodsService;
 import org.springblade.stock.vo.StockGoodsVO;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -228,6 +229,7 @@ public class StockGoodsClient implements IStockGoodsClient {
 	 */
 	@Override
 	@PostMapping(UPDATE_STOCK)
+	@Transactional(rollbackFor = Exception.class)
 	public boolean updateStock(StockGoods stockGoods) {
 		return stockGoodsService.updateById(stockGoods);
 	}

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -20,6 +20,7 @@ package org.springblade.system.user.service.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.CommonConstant;
@@ -455,6 +456,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	 */
 	@Override
 	public List<User> selectUserIds(String userIds){
+		if (StringUtils.isBlank(userIds)) {return Collections.emptyList();}
+
 		List<Long> collect = Arrays.stream(userIds.split(","))
 			.map(s -> Long.parseLong(s.trim()))
 			.collect(Collectors.toList());

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -962,7 +962,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 					// 判断比较大小
 					if (orderQuantity.compareTo(lockingQuantity) > 0) {
-						throw new SecurityException("撤销失败:原单据的订货数量大于锁定库存,无法释放 库存");
+						throw new SecurityException(oneStock.getCode()+"撤销失败:原单据的订货数量大于锁定库存,无法释放 库存");
 					}
 					// 增加可用库存
 					oneStock.setSurplusRouteQuantity(surplusRouteQuantity.add(orderQuantity));