From 297b4b60ca499969eeccc1a5113810fdc2034486 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Jul 2021 10:47:20 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 0dba707..d47e691 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
@@ -91,6 +91,18 @@
address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
}
}
+
+ 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();
+
+ if (orderAddr.equals(addressInfo.getAddressArea() + address)) {
+ throw new RestException(-3, "同一地址仅能有一单在进行中");
+ }
+ }
+ }
+
jhyOrder.setAddress(address.toString());
jhyOrder.setUsername(addressInfo.getRelaName());
--
Gitblit v1.9.1