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

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java

@@ -327,9 +327,15 @@
   public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type);



   /**

    * 激活免单券---订单已到账      TODO 待调用

    * 激活免单券---订单已到账   触发激活免单券

    * @param uid

    */

   public void activateFreeCoupon(Long uid);

   public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source);



   /**

    * 退回券

    * @param giveid

    */

   public void sendBackByGiveId(Long giveid);



}