Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-23 ac8e9b9d4e5f15369c1c1df49c63378fb1ae6f7b

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/ShareGoodsActivityOrderService.java

@@ -23,7 +23,7 @@
    * @param order

    * @throws ShareGoodsActivityOrderException

    */

   public void addShareGoodsActivityOrder(Long uid, BigDecimal rate, Order order)

   public void addShareGoodsActivityOrder(Long uid, BigDecimal rate, String taoBaoOrderNo)

         throws ShareGoodsActivityOrderException;



   /**

@@ -41,6 +41,14 @@
    * @param orderId

    * @return

    */

   public List<ShareGoodsActivityOrder> listByOrderIdAndUid(Long uid, Long orderId);

   public List<ShareGoodsActivityOrder> listByOrderIdAndUid(Long uid, String taoBaoOrderNo);



   /**

    * 根据用户ID查询订单

    * 
    * @param uid

    * @return

    */

   public List<ShareGoodsActivityOrder> listByUid(Long uid);



}