From 6e23a1d4d7c2e56f229b5391efdc38210f70fc8d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 13:56:54 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TOrderController.java | 19 +++++++++++--------
manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java | 5 ++++-
manage/src/main/java/com/jilongda/manage/authority/controller/LoginController.java | 3 +++
manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java | 8 ++------
4 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/authority/controller/LoginController.java b/manage/src/main/java/com/jilongda/manage/authority/controller/LoginController.java
index 16c7952..7801b9f 100644
--- a/manage/src/main/java/com/jilongda/manage/authority/controller/LoginController.java
+++ b/manage/src/main/java/com/jilongda/manage/authority/controller/LoginController.java
@@ -131,6 +131,9 @@
}
}
+ public static void main(String[] args) {
+
+ }
@ApiOperation(value = "发送验证码", notes = "发送验证码")
@PostMapping(value = "sendMsg")
public ApiResult<String> sendMsg(@Validated @RequestBody VerificationCodeDTO dto) throws Exception {
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java b/manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java
index e3ef7c1..49751d8 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java
@@ -138,13 +138,9 @@
@ApiOperation(value = "通过品牌id查询镜片系列列表-添加销售订单用 过滤没有生成库存的系列")
@GetMapping(value = "/seriesListOrder")
public ApiResult<List<TLensSeries>> seriesListOrder(Integer brandId) {
- List<TLensGoods> list = lensGoodsService.lambdaQuery().list();
- List<Integer> collect = list.stream().map(TLensGoods::getSeriesId).distinct().collect(Collectors.toList());
- if (list.isEmpty()){
- return ApiResult.success(new ArrayList<TLensSeries>());
- }
+
List<TLensSeries> lensSeries = lensSeriesService.lambdaQuery().eq(TLensSeries::getBrandId, brandId)
- .in(TLensSeries::getId,collect).list();
+ .list();
return ApiResult.success(lensSeries);
}
@ApiOperation(value = "通过系列id查询球/非球 返回参数1为球 2非球 3双飞")
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
index f410ed4..53263d6 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
@@ -222,10 +222,11 @@
}else {
split = orderGood.getLLens().split(",");
}
- TBrand brand = brandService.lambdaQuery().eq(TBrand::getName, orderGood.getBrandName())
- .eq(TBrand::getType, 2).one();
- TLensSeries lensSeries = lensSeriesService.lambdaQuery().eq(TLensSeries::getName, orderGood.getSeriesName())
- .eq(TLensSeries::getBrandId, brand.getId()).one();
+// TBrand brand = brandService.lambdaQuery().eq(TBrand::getName, orderGood.getBrandName())
+// .eq(TBrand::getType, 2).one();
+ TLensSeries lensSeries = lensSeriesService.lambdaQuery()
+ .eq(TLensSeries::getId, orderGood.getSeriesId())
+ .one();
TLensGoods one = lensGoodsService.lambdaQuery()
.eq(StringUtils.hasLength(orderGood.getSeriesName()),TLensGoods::getSeriesId, lensSeries.getId())
.eq(StringUtils.hasLength(orderGood.getRefractiveIndex()),TLensGoods::getRefractiveIndex, orderGood.getRefractiveIndex())
@@ -280,12 +281,14 @@
lensWarehousingDetailService.save(tLensWarehousingDetail);
}else {
- orderService.removeById(dto);
- return ApiResult.failed("商品库存不足");
+ if (lensSeries.getType()==1){
+ orderService.removeById(dto);
+ return ApiResult.failed("商品库存不足");
+ }
}
}else{
- TModel one1 = modelService.lambdaQuery().eq(TModel::getName, orderGood.getModelName())
- .eq(TModel::getColor, orderGood.getColor()).one();
+ TModel one1 = modelService.lambdaQuery()
+ .eq(TModel::getId, orderGood.getModelId()).one();
BigDecimal cost = one1.getCost();
orderGood.setCost(cost);
TFrameGoods one = frameGoodsService.lambdaQuery()
diff --git a/manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java b/manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java
index 3f33780..af349c9 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java
@@ -67,11 +67,14 @@
@ApiModelProperty(value = "镜片-系列名称")
@TableField("seriesName")
private String seriesName;
+ @ApiModelProperty(value = "镜片-系列id")
+ @TableField("seriesId")
+ private Integer seriesId;
@ApiModelProperty(value = "镜架-型号名称")
@TableField("modelName")
private String modelName;
- @ApiModelProperty(value = "镜架型号id 前端忽略")
+ @ApiModelProperty(value = "镜架型号id")
@TableField("modelId")
private Integer modelId;
@ApiModelProperty(value = "类型 1镜架 2镜片")
--
Gitblit v1.7.1