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

yujian

2020-03-24 f15acf7f2d57db3a32c574b0dfc21f564dca6024

 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 {



@@ -26,15 +28,14 @@
    */

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

   

	


   /**

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

    * 

    * @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,14 +54,12 @@
    */

   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;

   

   /**

    * 结算金额