From 889546e3b4529c82c6e039fd8053f22ad414e9bd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 01 Dec 2021 10:47:43 +0800
Subject: [PATCH] fix
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
index e0d804d..4ef021c 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
@@ -100,9 +100,16 @@
List<JhyOrder> addressExist = jhyOrderMapper.selectJhyOrderListByStatus(StrUtil.split("1,2", ','), orderDto.getUserId());
if (CollUtil.isNotEmpty(addressExist)) {
for (JhyOrder order : addressExist) {
- String orderAddr = order.getArea() + order.getAddress() + order.getUnitName() + order.getHouseNumber();
+ String orderAddr = order.getArea()
+ + order.getAddress()
+ + (StrUtil.isEmpty(order.getUnitName())?"":order.getUnitName())
+ + (StrUtil.isEmpty(order.getHouseNumber())?"":order.getHouseNumber());
- if (orderAddr.equals(addressInfo.getAddressArea() + addressInfo.getDetailAddress() + addressInfo.getHouseName() + addressInfo.getUnitName() + addressInfo.getHouseNumber())) {
+ if (orderAddr.equals(addressInfo.getAddressArea()
+ + addressInfo.getDetailAddress()
+ + (StrUtil.isEmpty(addressInfo.getHouseName())?"":addressInfo.getHouseName())
+ + (StrUtil.isEmpty(addressInfo.getUnitName())?"":addressInfo.getUnitName())
+ + (StrUtil.isEmpty(addressInfo.getHouseNumber())?"":addressInfo.getHouseNumber()))) {
throw new RestException(-3, "同一地址仅能有一单在进行中");
}
}
--
Gitblit v1.9.1