商品数据从视图中获取判断

blade-common/src/main/java/org/springblade/common/enums/NumberEnum.java

@@ -0,0 +1,65 @@
+package org.springblade.common.enums;
+
+/**
+ * @author Rain
+ */
+
+public enum NumberEnum {
+
+
+	/**
+	 *	1
+	 */
+	ONE(1),
+
+	/**
+	 *	2
+	 */
+	TWO(2),
+
+	/**
+	 *	3
+	 */
+	THREE(3),
+
+	/**
+	 *	4
+	 */
+	FOUR(4),
+
+	/**
+	 *	5
+	 */
+	FIVE(5),
+
+	/**
+	 *	6
+	 */
+	SIX(6),
+
+	/**
+	 *	7
+	 */
+	SEVEN(7),
+
+	/**
+	 *	8
+	 */
+	EIGHT(8),
+
+	/**
+	 *	9
+	 */
+	NINE(9),
+
+	/**
+	 * 	10
+	 */
+	TEN(10);
+
+	public final Integer number;
+
+	NumberEnum(Integer number) {
+		this.number = number;
+	}
+}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.Message;
 import org.springblade.client.feign.IMessageClient;
+import org.springblade.common.enums.NumberEnum;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -31,6 +32,8 @@ import org.springblade.salesPart.productLaunch.mapper.ProductLaunchMapper;
 import org.springblade.salesPart.serial.service.IPjpfSerialService;
 import org.springblade.salesPart.share.entity.SharePutOnShelves;
 import org.springblade.salesPart.share.mapper.SharePutOnShelvesMapper;
+import org.springblade.salesPart.shopping.entity.ShoppingMallDetail;
+import org.springblade.salesPart.shopping.mapper.ShoppingMallDetailMapper;
 import org.springblade.salesPart.shoppingCart.mapper.ShoppingCartMapper;
 import org.springblade.salesPart.shoppingCart.service.IShoppingCartService;
 import org.springblade.salesPart.vo.ShoppingCartVO;
@@ -79,6 +82,8 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 
 	private final IPaymentClient paymentClient;
 
+	private final ShoppingMallDetailMapper shoppingMallDetailMapper;
+
 
 	/**
 	 * 保存修改购物车信息
@@ -1366,6 +1371,9 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 		if (org.springframework.util.ObjectUtils.isEmpty(srcOrder) || srcOrder.getIsDeleted() == 1) {
 			return R.fail("该订单无效，请重新下单");
 		}
+		if (srcOrder.getActualPaymentStatus().equals(NumberEnum.TWO.number)) {
+			return R.fail("该订单已支付，请勿重复支付");
+		}
 		List<PjOrder> orderAllList = new ArrayList<>();
 		orderAllList.add(srcOrder);
 		String billNo = srcOrder.getOrdNo();
@@ -1381,13 +1389,14 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 		if (org.springframework.util.CollectionUtils.isEmpty(orderItemsList)) {
 			return R.fail("该订单商品数据已全部无效，请重新下单");
 		}
-		List<PjProductLaunch> pjProductLaunchList = productLaunchMapper.selectList(new LambdaQueryWrapper<PjProductLaunch>().eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
-			.eq(PjProductLaunch::getIsDeleted, 0).eq(PjProductLaunch::getUpAndDownShelves, 1));
+		List<Long> goodsIds = orderItemsList.stream().map(PjOrderItems::getGoodsId).distinct().collect(Collectors.toList());
+		List<ShoppingMallDetail> pjProductLaunchList = shoppingMallDetailMapper.selectList(new LambdaQueryWrapper<ShoppingMallDetail>().eq(ShoppingMallDetail::getTenantId, AuthUtil.getTenantId())
+			.eq(ShoppingMallDetail::getIsDeleted, 0).in(ShoppingMallDetail::getGoodsId, goodsIds));
 		if (org.springframework.util.CollectionUtils.isEmpty(pjProductLaunchList)) {
 			return R.fail("该订单商品数据已全部下架，请重新下单");
 		}
 		for (PjOrderItems item : orderItemsList) {
-			PjProductLaunch productLaunch = pjProductLaunchList.stream().filter(x -> x.getGoodsId().equals(item.getGoodsId())).findFirst().orElse(null);
+			ShoppingMallDetail productLaunch = pjProductLaunchList.stream().filter(x -> x.getGoodsId().equals(item.getGoodsId())).findFirst().orElse(null);
 			if (productLaunch == null) {
 				return R.fail("该订单商品-“" + item.getGoodsName() + "”-已下架，请重新下单");
 			}