Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 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);



}