fix

Helius

2021-07-23 bfb8d3b963f9653ac420b965f1eecadb887ca537

 gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java

@@ -91,6 +91,20 @@
                address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
            }
        }

        List<JhyOrder> addressExist = jhyOrderMapper.selectJhyOrderListByStatus(StrUtil.split("1,2", ','), jhyOrder.getUserId());
        if (CollUtil.isNotEmpty(addressExist)) {
            for (JhyOrder order : addressExist) {
                String orderAddr = order.getArea() + order.getAddress();

                log.info("orderAddr====>>>>{}", orderAddr);
                log.info("address===>{}", address);
                if (orderAddr.equals(address.toString())) {
                    throw new RestException(-3, "同一地址仅能有一单在进行中");
                }
            }
        }

        jhyOrder.setAddress(address.toString());

        jhyOrder.setUsername(addressInfo.getRelaName());
@@ -161,6 +175,10 @@
            throw new RestException(-3, "订单不存在");
        }

        if (order.getUserId().equals(jhyInfo.getUserId())) {
            throw new RestException(-3, "不能抢自己的单");
        }

        order.setJhyId(userId);
        order.setStatus(JhyOrder.ORDER_STATUS_IMG);
        jhyOrderMapper.updateByPrimaryKey(order);