bug修改

xuhy

2025-01-08 9b7758506df05470401c6f4abf8cd9ea089ef762

 manage/src/main/java/com/jilongda/manage/controller/TOrderController.java

@@ -93,18 +93,18 @@
            query.setEndTime(query.getEndTime()+" 23:59:59");
        }
        List<Integer> orderIds = new ArrayList<>();
        List<Integer> collect = tAppUserService.lambdaQuery()
                .eq(StringUtils.hasLength(query.getWxName()), TAppUser::getName, query.getWxName())
                .eq(StringUtils.hasLength(query.getPhone()), TAppUser::getName, query.getPhone()).list()
                .stream().map(TAppUser::getId).collect(Collectors.toList());
        if (StringUtils.hasLength(query.getWxName())||StringUtils.hasLength(query.getPhone())){
            query.setUserIds(collect);
            if (collect.isEmpty())return ApiResult.success(new PageInfo<>());
        }
//        List<Integer> collect = tAppUserService.lambdaQuery()
//                .eq(StringUtils.hasLength(query.getWxName()), TAppUser::getName, query.getWxName())
//                .eq(StringUtils.hasLength(query.getPhone()), TAppUser::getName, query.getPhone()).list()
//                .stream().map(TAppUser::getId).collect(Collectors.toList());
//        if (StringUtils.hasLength(query.getWxName())||StringUtils.hasLength(query.getPhone())){
//            query.setUserIds(collect);
//            if (collect.isEmpty())return ApiResult.success(new PageInfo<>());
//        }
        List<Integer> collect1 = orderGoodsService.lambdaQuery()
                .eq(StringUtils.hasLength(query.getBrandLens()), TOrderGoods::getBrandName, query.getBrandLens())
                .eq(StringUtils.hasLength(query.getSeries()), TOrderGoods::getSeriesName, query.getSeries())
                .eq((query.getType() != null), TOrderGoods::getType, query.getType())
                .eq(query.getType() != null, TOrderGoods::getType, query.getType())
                .eq(StringUtils.hasLength(query.getRefractiveIndex()), TOrderGoods::getRefractiveIndex, query.getRefractiveIndex()).list()
                .stream().map(TOrderGoods::getOrderId).collect(Collectors.toList());
        if (StringUtils.hasLength(query.getBrandLens())||StringUtils.hasLength(query.getSeries())||query.getType() != null||
@@ -223,7 +223,7 @@
                    one.setTotal(one.getTotal()-1);
                    tLensGoods.add(one);
                }else {
                    return ApiResult.failed("商品不存在");
                    return ApiResult.failed("商品库存不足");
                }
            }else{
                TModel one1 = modelService.lambdaQuery().eq(TModel::getName, orderGood.getModelName())
@@ -241,7 +241,7 @@
                    one.setTotal(one.getTotal()-1);
                    tFrameGoods.add(one);
                }else{
                    return ApiResult.failed("商品不存在");
                    return ApiResult.failed("商品库存不足");
                }
            }
        }