Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

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

@@ -3,7 +3,9 @@
import java.math.BigDecimal;



import com.yeshi.fanli.entity.order.InviteOrderSubsidy;

import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.exception.order.InviteOrderSubsidyException;

import com.yeshi.fanli.exception.order.OrderTeamRewardException;



public interface InviteOrderSubsidyServiceV2 {



@@ -25,8 +27,6 @@
    * @return

    */

   public InviteOrderSubsidy getByOrderNoAndTypeForUpdate(Long uid, String orderNo, Integer type);

	
	


   /**

    * 添加或修改（按照订单号与来源）

@@ -34,7 +34,8 @@
    * @param orderId

    * @param sourceType

    */

   public void addOrUpdateByOrder(String orderId, int sourceType) throws InviteOrderSubsidyException;

   public void addOrUpdateByOrder(String orderId, int sourceType)

         throws InviteOrderSubsidyException, OrderTeamRewardException, CommonOrderException;



   /**

    * 根据订单号与来源查询

@@ -53,19 +54,17 @@
    */

   public void invalidByOrderIdAndSourceType(String orderId, int sourceType);



	
   /**

    * 使订单号对应的数据有效

    * @param orderId

    * @param sourceType

    */

   public void validByOrderIdAndSourceType(String orderId, int sourceType);

	
	
   public void validByOrderIdAndSourceType(String orderId, int sourceType) throws InviteOrderSubsidyException;



   /**

    * 结算金额

    * @param id

    * @param money

    */

   public void settleById(Long id,BigDecimal money);

   public void settleById(Long id, BigDecimal money);

}