Merge remote-tracking branch 'origin/master'

guyue

4 天以前 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java

@@ -4,6 +4,7 @@
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityWarpper;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.system.warpper.CouponsListVo;
@@ -315,4 +316,19 @@
     * @throws Exception
     */
    void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType) throws Exception;

    /**
     * 获取未支付的跨城订单
     */
    List<UnPayOrderVO> getUnpayCrossCityOrders(Integer uid) throws Exception;

    /**
     * 添加申诉
     */
    void addAppeal(Integer uid, Integer orderId,String abnormalIntro, String abnormalImg);

    void promotion(Integer orderId);

    List<Map<String, Object>> queryMyTripList(Integer uid, Integer pageNum, Integer size) throws Exception;
    List<Map<String, Object>> queryMyTripListAll(Integer uid) throws Exception;
}