fanli-server.git

			@@ -24,6 +24,33 @@
			public void addOrder(BanLiShopOrder order) throws BanLiShopOrderException;

			/**
			* 构造订单
			*
			* @param pay
			* @param uid
			* @return
			* @throws BanLiShopOrderException
			*/
			public BanLiShopOrder createOrder(Long goodsSetPayId, String chargeAccount, Long uid)
			throws BanLiShopOrderException;;

			/**
			* 使订单失效
			*
			* @param id
			*/
			public void invalidOrderByOrderId(Long id, String desc);

			/**
			* 拒绝订单
			*
			* @param id
			* @param msg
			* @throws BanLiShopOrderException
			*/
			public void rejectOrder(Long id, String msg) throws BanLiShopOrderException;

			/**
			* 订单支付（用红包）
			*
			* @param orderId
			@@ -38,9 +65,8 @@
			* @param orderId
			* @throws BanLiShopOrderException
			*/
			public void payOrderByMoney(Long orderId,BigDecimal money) throws BanLiShopOrderException;


			public void payOrderByMoney(Long orderId, BigDecimal money) throws BanLiShopOrderException;

			public BanLiShopOrder selectByPrimaryKeyForUpdate(Long id);

			/**
			@@ -62,6 +88,26 @@
			public long countByUid(Long uid);

			/**
			* 根据用户ID,状态查询
			*
			* @param uid
			* @param stateList
			* @param page
			* @param pageSize
			* @return
			*/
			public List<BanLiShopOrder> listByUidAndState(Long uid, List<Integer> stateList, int page, int pageSize);

			/**
			* 根据用户ID,状态查询
			*
			* @param uid
			* @param stateList
			* @return
			*/
			public long countByUidAndState(Long uid, List<Integer> stateList);

			/**
			* 根据主键检索
			*
			* @param id
			@@ -76,4 +122,12 @@
			*/
			public void udpateSelectiveByPrimaryKey(BanLiShopOrder order);

			/**
			* 根据订单号查询
			*
			* @param orderNo
			* @return
			*/
			public BanLiShopOrder selectByOrderNo(String orderNo);

			}