From d6778b4c38c3c9dd70da46715efdaaafc366ab5f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 Nov 2021 18:38:39 +0800
Subject: [PATCH] 20211108

---
 gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 2ed4d87..fd5d6e7 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
@@ -102,13 +102,13 @@
             for (JhyOrder order : addressExist) {
                 String orderAddr = order.getArea() + order.getAddress() + order.getUnitName() + order.getHouseNumber();
 
-                if (orderAddr.equals(addressInfo.getAddressArea() + addressInfo.getDetailAddress() + addressInfo.getUnitName() + addressInfo.getHouseNumber())) {
+                if (orderAddr.equals(addressInfo.getAddressArea() + addressInfo.getDetailAddress() + addressInfo.getHouseName() + addressInfo.getUnitName() + addressInfo.getHouseNumber())) {
                     throw new RestException(-3, "同一地址仅能有一单在进行中");
                 }
             }
         }
 
-        jhyOrder.setAddress(addressInfo.getDetailAddress());
+        jhyOrder.setAddress(addressInfo.getDetailAddress()+addressInfo.getHouseName());
         jhyOrder.setUnitName(addressInfo.getUnitName());
         jhyOrder.setHouseNumber(addressInfo.getHouseNumber());
         jhyOrder.setUsername(addressInfo.getRelaName());

--
Gitblit v1.9.1