java/qijisheng.git

			@@ -41,6 +41,9 @@
			import java.time.LocalDateTime;
			import java.time.ZoneOffset;
			import java.util.*;
			import java.util.concurrent.ArrayBlockingQueue;
			import java.util.concurrent.ThreadPoolExecutor;
			import java.util.concurrent.TimeUnit;
			import java.util.stream.Collectors;

			@Slf4j
			@@ -142,6 +145,9 @@
			throw new RuntimeException("根据类型（1=服务商品，2=单品商品）获取商品数据失败");
			}
			List<Integer> goodsIds = data.stream().map(Goods::getId).collect(Collectors.toList());
			if(goodsIds.isEmpty()){
			return new ArrayList<>();
			}
			//查询符合商品类型的商品数据
			List<ShoppingCart> list = this.list(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid)
			.in(ShoppingCart::getGoodsId, goodsIds).eq(ShoppingCart::getStatus, 1));
			@@ -1428,8 +1434,18 @@
			orderBalancePayment.setDistributionAmount(distributionAmount);
			orderBalancePaymentService.save(orderBalancePayment);
			}

			commissionService.calculationCommissionUser(order.getId());
			return R.ok(order.getId().toString());
			}










			public String getNumber(Integer size){
			@@ -1523,6 +1539,8 @@
			for (Integer goodsId : goodsIds) {
			goodsClient.editGoodsNum(goodsId, 1);
			}

			commissionService.calculationCommissionUser(order.getId());
			return R.ok();
			}