fanli-server.git

			@@ -13,6 +13,7 @@
			import com.yeshi.fanli.entity.pdd.PDDOrder;
			import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
			import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
			import com.yeshi.fanli.entity.vipshop.VipShopOrder;
			import com.yeshi.fanli.exception.order.CommonOrderException;
			import com.yeshi.fanli.vo.order.CommonOrderVO;
			import com.yeshi.fanli.vo.order.OrderCountVO;
			@@ -173,6 +174,20 @@
			* @throws CommonOrderException
			*/
			public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException;


			/**
			* 添加唯品会订单
			* @Title: addVipShopOrder
			* @Description:
			* @param order
			* @param uid
			* @return
			* @throws CommonOrderException
			* List<CommonOrderAddResultDTO> 返回类型
			* @throws
			*/
			public List<CommonOrderAddResultDTO> addVipShopOrder(VipShopOrder order, Long uid) throws CommonOrderException;

			/**
			* 根据用户ID，订单状态，结算时间统计订单数量
			@@ -434,4 +449,17 @@
			*/
			public long countOrderByUidAndSettled(Long uid, BigDecimal payment);

			/**
			* 获取最新的淘宝订单号
			* @return
			*/
			public String getNewestOrderNoByTaoBao();

			/**
			* 根据订单号查询
			* @param orderNo
			* @return
			*/
			public List<CommonOrder> listByOrderNo(String orderNo);

			}