From cf2deb37da116d7e2877f741971db4fa207e8617 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Jul 2021 10:36:39 +0800
Subject: [PATCH] fix
---
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..8b89b3d 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(address.toString())) {
+ 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