Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-07-02 a3e62581af85d8a7ecece3c446c499d12d3905dc

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

@@ -155,7 +155,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);
    }