From f4ef9fccb3347fd364ca59575bf62fe5e4362f59 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Jul 2021 14:17:09 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 00c7482..0906376 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
@@ -150,6 +150,10 @@
             throw new RestException(-3, "不是集货员");
         }
 
+        if (JhyInfo.IS_JHY_N.equals(jhyInfo.getIsJhy())) {
+            throw new RestException(-3, "暂无法抢单");
+        }
+
         JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
         if (order == null) {
             throw new RestException(-3, "订单不存在");

--
Gitblit v1.9.1