Merge remote-tracking branch 'origin/master'

xuhy

2024-12-31 e013e819f7d544c5c8c59e69ce42c3d10e2215e6

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

@@ -174,7 +174,11 @@
        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();
@@ -245,7 +249,7 @@
        orderGoodsService.saveBatch(orderGoods);
        lensGoodsService.updateBatchById(tLensGoods);
        frameGoodsService.updateBatchById(tFrameGoods);
        return ApiResult.success();
        return ApiResult.success(dto.getId());
    }

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