From c9b82feb62c72d7f19ad2716211137cc2db6b701 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 13:19:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/java/com/jilongda/manage/controller/TOrderController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
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 0f8c184..6f1dd1c 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
@@ -175,8 +175,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())
--
Gitblit v1.7.1