Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/redpack/mapper/TaRedPacketHistoryMapper.java

@@ -30,5 +30,5 @@ public interface TaRedPacketHistoryMapper extends BaseMapper<TaRedPacketHistory>
      * @param orgId
      * @return
      */
-    List<TaRedPacketHistory> getRanking(String activityId, Integer orgId);
+    List<TaRedPacketHistory> getRanking(String activityId, Integer orgId ,Integer top);
 }

src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java

@@ -361,8 +361,16 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
     public ResponseBean getRanking(String drainageId) {
         //第一步根据drainggeid查询出红包表对应的记录
         TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
+
+        int top = 100;
+        if(taDrainage.getActivityType()=="RedPacket"){
+            TaRedPacket taRedPacket = taRedPacketMapper.selectById(taDrainage.getActivityId());
+            top = taRedPacket.getTopLimitPersons();
+        }
+
+//                .selectById(taDrainage.getActivityId())
         //第二步查询出这个H5对应的活动
-        List<TaRedPacketHistory> taRedPacketHistoryList = taRedPacketHistoryMapper.getRanking(taDrainage.getActivityId(), taDrainage.getOrgId());
+        List<TaRedPacketHistory> taRedPacketHistoryList = taRedPacketHistoryMapper.getRanking(taDrainage.getActivityId(), taDrainage.getOrgId(), top);
         return ResponseBean.success(taRedPacketHistoryList);
     }
 

src/main/resources/mapper/redpack/TaRedPacketHistoryMapper.xml

@@ -14,5 +14,6 @@
         LEFT JOIN ta_person p ON t.target_miniapp_person = p.person_id
         ORDER BY
         t.helpPersonNum DESC
+        limit #{top}
     </select>
 </mapper>