Merge branch 'huacheng_push' into huacheng_test

zhaozhengjie

2022-09-09 b72d8fea21aa1cda28c44c57e3cee78c42db5847

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java

@@ -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);
@@ -714,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("未查询到用户信息");
        }