Merge branch 'pxb' into xin

xin

5 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

 oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java

@@ -49,7 +49,7 @@

    OrderResponse getByOrderNum(String orderNum);

    void operationLog(OrderResponse order, OrderStatusEnum stateEnum);
    void operationLog(OrderResponse order, OrderStatusEnum stateEnum,String cardName);

    void updatePayStatus(String outTradeNo, PayStateEnum stateEnum, String payInfo, String timeEnd);

@@ -83,7 +83,7 @@
     */
    void download(List<Order> all, HttpServletResponse response) throws IOException;

    void closeOrder(String orderNum);
    void cancel(String orderNum);

    void statusOrder(StatusOrder statusOrder);
}