From bb5de381eca99064840181c6a6672f38143000b0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 Aug 2021 10:14:27 +0800
Subject: [PATCH] fix
---
gc-core/src/main/java/com/xzx/gc/entity/OrderInfo.java | 2 ++
gc-order/src/main/java/com/xzx/gc/order/mapper/OrderMapper.java | 2 ++
gc-order/src/main/resources/mapper/order/OrderMapper.xml | 5 +++++
gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java | 18 ++++++++++++++++++
4 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/OrderInfo.java b/gc-core/src/main/java/com/xzx/gc/entity/OrderInfo.java
index 8f3bfa6..32fd977 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/OrderInfo.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/OrderInfo.java
@@ -72,6 +72,8 @@
@ApiModelProperty("门牌号")
private String houseNumber;
+ private String houseName;
+
@ApiModelProperty("回收金额")
private transient String money;
diff --git a/gc-order/src/main/java/com/xzx/gc/order/mapper/OrderMapper.java b/gc-order/src/main/java/com/xzx/gc/order/mapper/OrderMapper.java
index 560eec5..a1c26bc 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/mapper/OrderMapper.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/mapper/OrderMapper.java
@@ -226,5 +226,7 @@
List<OrderInfo> selectOrderNoWaitAndCancel(@Param("userId") String userId);
List<InviteUserOrderVo> selectInviteUserOrderList(@Param("record") InviteUserOrderDetailsDto detailsDto);
+
+ List<OrderInfo> selectOrderWithWaitAndIng(@Param("userId") String userId);
}
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) {
diff --git a/gc-order/src/main/resources/mapper/order/OrderMapper.xml b/gc-order/src/main/resources/mapper/order/OrderMapper.xml
index eed1db4..aed20d3 100644
--- a/gc-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -1553,4 +1553,9 @@
) a
group by a.order_id
</select>
+
+ <select id="selectOrderWithWaitAndIng" resultType="com.xzx.gc.entity.OrderInfo">
+ select * from xzx_order_info
+ where order_status in ('1', '2') and create_user_id=#{userId}
+ </select>
</mapper>
--
Gitblit v1.9.1