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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/dividents/TeamDividentsSourceOrderMapper.java

@@ -25,7 +25,8 @@
    * @throws
    */
   List<TeamDividentsSourceOrder> lisByUidAndPreSendTimeAndState(@Param("uid") Long uid,
         @Param("preSendTime") Date preSendTime,   @Param("state") int state, @Param("start") long start, @Param("count") int count);
         @Param("preSendTime") Date preSendTime, @Param("state") int state, @Param("start") long start,
         @Param("count") int count);

   long countByUidAndPreSendTimeAndState(@Param("uid") Long uid, @Param("preSendTime") Date preSendTime,
         @Param("state") int state);
@@ -58,7 +59,8 @@
    * int 返回类型
    * @throws
    */
   int setStateByUidAndState(@Param("uid") Long uid, @Param("targetState") int targetState, @Param("state") int state, @Param("beiZhu") String beiZhu);
   int setStateByUidAndState(@Param("uid") Long uid, @Param("targetState") int targetState, @Param("state") int state,
         @Param("beiZhu") String beiZhu);

   /**
    * 根据订单信息检索
@@ -73,4 +75,7 @@
   TeamDividentsSourceOrder selectByOrderNoAndSourceType(@Param("orderNo") String orderNo,
         @Param("sourceType") int sourceType);

   List<TeamDividentsSourceOrder> listByOrderNoOrSourceUid(@Param("orderNo") String orderNo, @Param("uid") Long uid,
         @Param("start") long start, @Param("count") int count);

}