From b141df9bf9764db8567efebed48006e12ab1f657 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 14 Aug 2022 15:52:45 +0800
Subject: [PATCH] fix:jhy 停止下单
---
gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java
index 2d46c1c..a40d972 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java
@@ -12,6 +12,7 @@
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.text.StrBuilder;
import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageHelper;
@@ -340,6 +341,23 @@
orderInfoReq.setTownId(townId);
}
+ List<OrderInfo> orderInfos = orderMapper.selectOrderWithWaitAndIng(orderInfoReq.getCreateUserId());
+ if (CollUtil.isNotEmpty(orderInfos)) {
+ String address = addressInfo.getAddressArea() + addressInfo.getDetailAddress() + addressInfo.getHouseName() + addressInfo.getUnitName() + addressInfo.getHouseNumber();
+ for (OrderInfo orderInfo : orderInfos) {
+ orderInfoReq.setAddress(addressInfo.getDetailAddress());
+ orderInfoReq.setAddressArea(addressInfo.getAddressArea());
+ orderInfoReq.setUnitName(addressInfo.getUnitName());
+ orderInfoReq.setHouseNumber(addressInfo.getHouseNumber());
+ orderInfoReq.setHouseName(addressInfo.getHouseName());
+
+ String hasAddress = orderInfo.getAddressArea() + orderInfo.getAddress() + orderInfo.getHouseName() + addressInfo.getUnitName() + addressInfo.getHouseNumber();
+ if (ObjectUtil.equal(address, hasAddress)) {
+ throw new RestException("该地址已经存在正在进行的订单");
+ }
+ }
+ }
+
//更新用户的合伙人ID
if (partnerId != null) {
--
Gitblit v1.9.1