From cb9d40e12c5c51397e8a86c89b113b12becd48a6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 03 Jul 2021 18:04:33 +0800
Subject: [PATCH] fix jhy range
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 21 ++++++++++++++++++---
1 files changed, 18 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..28da66f 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,14 @@
package com.xzx.gc.order.service;
import cn.hutool.core.bean.BeanUtil;
+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;
@@ -57,15 +59,23 @@
public void addJhyOrder(AddJhyOrderDto orderDto) {
JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(orderDto.getUserId());
+ if (jhyInfo == null) {
+ throw new RestException(-3, "集物员不存在");
+ }
+
if (jhyInfo != null && JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
throw new RestException(-3, "集货员不能下单");
}
- // TODO 判断地址附近500米是否有集物员
+ AddressInfo addressInfo = addressMapper.selectByPrimaryKey(orderDto.getAddressId());
+ double distance = LocationUtils.getDistance(Convert.toDouble(jhyInfo.getLon()), Convert.toDouble(jhyInfo.getLat()), Convert.toDouble(addressInfo.getLongitude()), Convert.toDouble(addressInfo.getLatitude()));
+ if (distance > 500) {
+ 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 +165,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