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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/mapping/redpack/RedPackWinInviteMapper.xml

@@ -83,18 +83,6 @@
   LIMIT 1
  </select>
  
  <select id="getByUidAndTeamUidAndType" resultMap="BaseResultMap">
     SELECT * FROM yeshi_ec_red_pack_win_invite d
   WHERE d.`rwr_uid` = #{uid} AND d.`rwr_team_uid` = #{teamUid} AND d.`rwr_type` = #{type}
   LIMIT 1
  </select>
  
  <select id="getByUidAndTeamUidAndTypeMonth" resultMap="BaseResultMap">
     SELECT * FROM yeshi_ec_red_pack_win_invite d
   WHERE d.`rwr_uid` = #{uid} AND d.`rwr_team_uid` = #{teamUid} AND d.`rwr_type` = #{type}
        AND DATE_FORMAT(d.rwr_create_time,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m') 
   LIMIT 1
  </select>
  
  <select id="getRewardList" resultMap="BaseResultMap">
     SELECT * FROM yeshi_ec_red_pack_win_invite d
@@ -112,4 +100,46 @@
     SELECT IFNULL(SUM(d.`rwr_money`),0) FROM yeshi_ec_red_pack_win_invite d
   WHERE d.`rwr_uid` = #{uid}
  </select>
  
  
  <select id="getWinListByBossIdAndTeamUid" resultMap="BaseResultMap">
     SELECT * FROM yeshi_ec_red_pack_win_invite d
   WHERE d.`rwr_uid` = #{uid} AND d.`rwr_team_uid` = #{teamUid}
  </select>
  
  <select id="getWinTopListByBossId" resultMap="BaseResultMap">
     SELECT SUM(d.`rwr_money`)AS rwr_money,d.`rwr_team_uid`,MIN(d.`rwr_id`) AS orderId FROM `yeshi_ec_red_pack_win_invite` d
   WHERE d.`rwr_uid` = #{uid} AND d.`rwr_type` <![CDATA[<>]]> 'newUserReward'
   GROUP BY d.`rwr_team_uid`
   ORDER BY orderId
   LIMIT #{start},#{count}
  </select>
  
  <select id="countWinTopListByBossId" resultType="Long">
     SELECT IFNULL(COUNT(DISTINCT d.`rwr_team_uid`),0) FROM `yeshi_ec_red_pack_win_invite` d
   WHERE d.`rwr_uid` = #{uid} AND d.`rwr_type` <![CDATA[<>]]> 'newUserReward'
  </select>
  
  <select id="countTeamNumByTid" resultType="Long">
    SELECT COUNT(dd.`rwr_id`) FROM yeshi_ec_red_pack_win_invite dd
   WHERE dd.`rwr_uid` = #{uid} AND dd.`rwr_type` = 'zeroStageReward' 
      AND dd.`rwr_id` <![CDATA[<=]]> (SELECT d.`rwr_id` FROM `yeshi_ec_red_pack_win_invite` d
      WHERE d.`rwr_uid` = #{uid}  AND d.rwr_team_uid = #{teamUid}  AND d.`rwr_type` = 'zeroStageReward')
  </select>
  
  
   <select id="query" resultMap="BaseResultMap">
     SELECT * FROM `yeshi_ec_red_pack_win_invite` d
   WHERE 1=1 <if test="key != null and key != ''">AND d.`rwr_uid` = #{key}</if>
      <if test="type != null">AND d.`rwr_type`= #{type}</if>
   ORDER BY d.rwr_id DESC
   LIMIT #{start},#{count}
  </select>
  
  <select id="count" resultType="Long">
     SELECT COUNT(DISTINCT d.`rwr_id`) FROM `yeshi_ec_red_pack_win_invite` d
   WHERE 1=1 <if test="key != null and key != ''">AND d.`rwr_uid` = #{key}</if>
      <if test="type != null">AND d.`rwr_type`= #{type}</if>
  </select>
  
</mapper>