7870947c3dc93f6d8b2db718eab551edfc709f9b..71bf751d248aff415c95b2bc09dc1bb0219c9428
2021-07-23 Helius
Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
71bf75 diff | tree
2021-07-23 Helius
fix
cf2deb diff | tree
1 files modified
4 ■■■ changed files
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java 4 ●●● patch | view | raw | blame | history
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
@@ -92,13 +92,11 @@
            }
        }
        List<JhyOrder> addressExist = jhyOrderMapper.selectJhyOrderListByStatus(StrUtil.split("1,2", ','), jhyOrder.getUserId());
        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();
                log.info("orderAddr====>>>>{}", orderAddr);
                log.info("address===>{}", address);
                if (orderAddr.equals(address.toString())) {
                    throw new RestException(-3, "同一地址仅能有一单在进行中");
                }