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

---
 gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java       |    6 ++++++
 gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderDetailsVo.java    |    6 ++++++
 gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml          |    2 ++
 gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java |   24 +++++++++++++-----------
 4 files changed, 27 insertions(+), 11 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 18db30b..2ed4d87 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
@@ -87,22 +87,22 @@
         jhyOrder.setOrderNo(orderNo);
         jhyOrder.setArea(addressInfo.getAddressArea());
 
-        StringBuffer address = new StringBuffer();
-        address.append(addressInfo.getDetailAddress());
-        if (StrUtil.isNotBlank(addressInfo.getTagName())) {
-            address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : "");
-            if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) {
-                address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
-                address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
-            }
-        }
+//        StringBuffer address = new StringBuffer();
+//        address.append(addressInfo.getDetailAddress());
+//        if (StrUtil.isNotBlank(addressInfo.getTagName())) {
+//            address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : "");
+//            if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) {
+//                address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
+//                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();
+                String orderAddr = order.getArea() + order.getAddress() + order.getUnitName() + order.getHouseNumber();
 
-                if (orderAddr.equals(addressInfo.getAddressArea() + address)) {
+                if (orderAddr.equals(addressInfo.getAddressArea() + addressInfo.getDetailAddress() + addressInfo.getUnitName() + addressInfo.getHouseNumber())) {
                     throw new RestException(-3, "同一地址仅能有一单在进行中");
                 }
             }
@@ -159,6 +159,8 @@
         detailsVo.setLongitude(order.getLongitude());
         detailsVo.setLatitude(order.getLatitude());
         detailsVo.setAddress(order.getArea() + order.getAddress());
+        detailsVo.setUnitName(order.getUnitName());
+        detailsVo.setHouseNumber(order.getHouseNumber());
         detailsVo.setTotalPrice(total);
         detailsVo.setItems(items);
         return detailsVo;
diff --git a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderDetailsVo.java b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderDetailsVo.java
index 6920877..8972f8c 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderDetailsVo.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderDetailsVo.java
@@ -16,6 +16,12 @@
     @ApiModelProperty(value = "地址")
     private String address;
 
+    @ApiModelProperty(value = "单元栋")
+    private String unitName;
+
+    @ApiModelProperty(value = "门牌号")
+    private String houseNumber;
+
     @ApiModelProperty(value = "姓名")
     private String username;
 
diff --git a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
index af6ac72..452df57 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
@@ -28,6 +28,12 @@
     @ApiModelProperty(value = "地址")
     private String address;
 
+    @ApiModelProperty(value = "单元栋")
+    private String unitName;
+
+    @ApiModelProperty(value = "门牌号")
+    private String houseNumber;
+
     @ApiModelProperty(value = "经度")
     private String longitude;
 
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index f9cf0f2..60b288c 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -9,6 +9,8 @@
             ,a.username
             ,CONCAT(a.area, a.address) address
             ,a.longitude
+            ,a.unit_name unitName
+            ,a.house_number houseNumber
             ,a.latitude
             ,a.weight
             ,a.status

--
Gitblit v1.9.1