bug修改

xuhy

2025-01-08 9b7758506df05470401c6f4abf8cd9ea089ef762

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

@@ -13,6 +13,7 @@
import com.jilongda.manage.query.TOrderQuery;
import com.jilongda.manage.service.*;
import com.jilongda.manage.utils.LoginInfoUtil;
import com.jilongda.manage.utils.OssUploadUtil;
import com.jilongda.manage.vo.TModelVO;
import com.jilongda.manage.vo.TOptometryVO;
import com.jilongda.manage.vo.TOrderListVO;
@@ -24,6 +25,7 @@
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.math.BigDecimal;
import java.util.*;
@@ -68,6 +70,21 @@
    private TBrandService brandService;
    @Autowired
    private TOptometryService optometryService;
    @PostMapping("/obs-upload")
    @ApiOperation(value = "文件上传",tags = "管理后台-文件上传")
    public ApiResult<String> uploadOSS(@RequestPart("file") MultipartFile file) {
        try {
            // 上传并返回访问地址
            String fileName = file.getOriginalFilename();
            String prefix = fileName.substring(fileName.lastIndexOf("."));
            long fileSize = file.getSize();
            String url = OssUploadUtil.ossUpload("eyes/",file);
            return ApiResult.success(url);
        } catch (Exception e) {
            System.err.println("上传文件失败"+e);
            return ApiResult.failed(e.getMessage());
        }
    }
    @ApiOperation(value = "销售订单分页列表")
    @PostMapping(value = "/pageList")
    public ApiResult<PageInfo<TOrderListVO>> pageList(@RequestBody TOrderQuery query) {
@@ -76,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||
@@ -157,9 +174,12 @@
        if(Objects.nonNull(user)){
            dto.setStoreId(user.getStoreId());
        }

        if (dto.getUserId()!=null){
            TAppUser byId = tAppUserService.getById(dto.getUserId());
            dto.setName(byId.getName());
            dto.setPhone(byId.getPhone());
        }
        orderService.save(dto);

        List<TOptometryDetail> optometryDetails = dto.getOptometryDetails();
        if (!CollectionUtils.isEmpty(optometryDetails)){
            for (TOptometryDetail optometryDetail : optometryDetails) {
@@ -175,8 +195,15 @@
            orderGood.setOrderId(dto.getId());
            if (StringUtils.hasLength(orderGood.getSeriesName())){
                // 镜片
                orderGood.setRLens(orderGood.getRightLens());
                orderGood.setLLens(orderGood.getLeftLens());
                String rLens = orderGood.getRLens();
                String[] split = rLens.split(",");
                String[] split = null;
                if(StringUtils.hasLength(rLens)){
                    split = rLens.split(",");
                }else {
                    split = orderGood.getLLens().split(",");
                }
                TBrand one1 = brandService.lambdaQuery().eq(TBrand::getName, orderGood.getBrandName())
                        .eq(TBrand::getType, 2).one();
                TLensSeries one2 = lensSeriesService.lambdaQuery().eq(TLensSeries::getName, orderGood.getSeriesName())
@@ -196,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())
@@ -214,14 +241,14 @@
                    one.setTotal(one.getTotal()-1);
                    tFrameGoods.add(one);
                }else{
                    return ApiResult.failed("商品不存在");
                    return ApiResult.failed("商品库存不足");
                }
            }
        }
        orderGoodsService.saveBatch(orderGoods);
        lensGoodsService.updateBatchById(tLensGoods);
        frameGoodsService.updateBatchById(tFrameGoods);
        return ApiResult.success();
        return ApiResult.success(dto.getId());
    }

    @ApiOperation(value = "销售订单详情")