From 8269efac48716a328c12a4e836a4efb4a5f277d9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 02 Aug 2021 17:09:35 +0800
Subject: [PATCH] 20210802
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 16 ++++++++++++++++
1 files changed, 16 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 e76dca1..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());
@@ -161,6 +173,10 @@
throw new RestException(-3, "订单不存在");
}
+ if (order.getUserId().equals(jhyInfo.getUserId())) {
+ throw new RestException(-3, "不能抢自己的单");
+ }
+
order.setJhyId(userId);
order.setStatus(JhyOrder.ORDER_STATUS_IMG);
jhyOrderMapper.updateByPrimaryKey(order);
--
Gitblit v1.9.1