From d0c47393cbf57134bd539c7cc0804c9c4cddef85 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 17:31:53 +0800
Subject: [PATCH] 20210707

---
 gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 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 290ded6..3add922 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
@@ -1,12 +1,15 @@
 package com.xzx.gc.order.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xzx.gc.common.constant.Constants;
 import com.xzx.gc.common.exception.RestException;
 import com.xzx.gc.common.utils.IdUtils;
+import com.xzx.gc.common.utils.LocationUtils;
 import com.xzx.gc.entity.*;
 import com.xzx.gc.order.dto.AddJhyOrderDto;
 import com.xzx.gc.order.dto.JhyOrderConfirmDto;
@@ -61,11 +64,16 @@
             throw new RestException(-3, "集货员不能下单");
         }
 
-        // TODO 判断地址附近500米是否有集物员
+        AddressInfo addressInfo = addressMapper.selectByPrimaryKey(orderDto.getAddressId());
+
+        List<JhyInfo> jhyInfos = jhyInfoMapper.selectJhyInfoListInAddressRange(addressInfo.getAddressId());
+        if (CollUtil.isEmpty(jhyInfos)) {
+            throw new RestException(-3, "该区域暂无集物员");
+        }
+
         String orderNo = idUtils.generate("JW", 10);
 
         JhyOrder jhyOrder = new JhyOrder();
-        AddressInfo addressInfo = addressMapper.selectByPrimaryKey(orderDto.getAddressId());
 
         jhyOrder.setOrderNo(orderNo);
         jhyOrder.setArea(addressInfo.getAddressArea());
@@ -155,7 +163,12 @@
             throw new RestException(-3, "无权限操作");
         }
 
-        order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
+        if (userId.equals(order.getJhyId())) {
+            order.setStatus(JhyOrder.ORDER_STATUS_WAITING);
+        } else {
+            order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
+        }
+
         jhyOrderMapper.updateByPrimaryKey(order);
     }
 

--
Gitblit v1.9.1