java/zhihuishenqu.git

			@@ -283,7 +283,7 @@
			return R.fail("未查询到用户收货地址");
			}
			//查询用户信息
			SysUser user = userMapper.selectById(createOrderDto.getUserId());
			SysUser user = userMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,createOrderDto.getUserId()));
			if (user == null) {
			return R.fail("未查询到用户信息");
			}
			@@ -382,7 +382,7 @@
			@Override
			@Transactional(rollbackFor = Exception.class)
			public R syncCloseOrder() {
			log.info("定时器定时关闭超过30分钟未支付订单，并返回商品库存");
			log.info("定时器定时关闭超过5分钟未支付订单，并返回商品库存");
			Date nowDate = new Date();
			//获取当前时间减30分钟时间
			Date oldDate = DateUtils.addMinutes(nowDate, -5);
			@@ -675,6 +675,11 @@
			return orderBargain;
			}

			/**
			* 创建秒杀订单
			* @param orderDto 请求参数
			* @return 创建订单结果
			*/
			@Override
			public R startSeckill(StartSeckillOrderDto orderDto) {
			ComBatteryCommodityActivity commodityActivity = commodityActivityMapper.selectById(orderDto.getActivityId());
			@@ -709,7 +714,7 @@
			return R.fail("该商品库存不足，无法下单");
			}
			//查询用户信息
			SysUser user = userMapper.selectById(orderDto.getUserId());
			SysUser user = userMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,orderDto.getUserId()));
			if(user == null){
			return R.fail("未查询到用户信息");
			}
			@@ -722,6 +727,9 @@
			ComBatteryCommodityOrder commodityOrder = getCreateActivityOrder(commodity,userAddress,user,commoditySpecs,orderDto,nowDate,commodityActivity);
			Map<String,Object> resultMap = new HashMap<>(2);
			if(this.baseMapper.insert(commodityOrder) > 0){
			//更新活动商品库存
			commodityActivity.setCommoditySaleNum(commodityActivity.getCommoditySaleNum() + orderDto.getCount());
			commodityActivityMapper.updateById(commodityActivity);
			//更新商品库存
			commoditySpecs.setStock(commoditySpecs.getStock() - orderDto.getCount());
			commoditySpecsMapper.updateById(commoditySpecs);