zoujiajian 2 лет назад
Родитель
Сommit
2907c84311

+ 2 - 1
netflix-dao/src/main/java/com/cyksj/mapper/UserDistributeRankStatisticsRecordMapper.java

@@ -9,6 +9,7 @@ import com.cyksj.model.views.DistributeUserRankView;
 import com.cyksj.model.views.UserDistributeRankActivityView;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -30,5 +31,5 @@ public interface UserDistributeRankStatisticsRecordMapper extends BaseMapper<Use
 
 	UserActivityRankRobot getRobotRankInfo(@Param("robotId") Long robotId, @Param("filed") String filed, @Param("statisticsTime") String statisticsTime);
 
-	DistributeUserRankView getMoreSelfRank(@Param("rankId") Integer rankId, @Param("filed") String filed, @Param("statisticsTime") String statisticsTime);
+	DistributeUserRankView getMoreSelfRank(@Param("rankId") Integer rankId, @Param("orders") Integer orders, @Param("money") BigDecimal money, @Param("filed") String filed, @Param("statisticsTime") String statisticsTime);
 }

+ 6 - 0
netflix-dao/src/main/resources/mapper/UserDistributeRankStatisticsRecordMapper.xml

@@ -117,6 +117,12 @@
             <if test="rankId != null">
                 s.rank_id &lt; #{rankId}
             </if>
+            <if test="filed = 'orders'">
+                and s.orders > #{orders}
+            </if>
+            <if test="filed = 'money'">
+                and s.money > #{money}
+            </if>
         </where>
         order by rank_id desc limit 1
     </select>

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/distribute/DistributeRankController.java

@@ -107,7 +107,7 @@ public class DistributeRankController {
 		});
 		distributeUserRankPersonalView.setSelf(self);
 
-		DistributeUserRankView more = userDistributeRankStatisticsRecordMapper.getMoreSelfRank(self.getRankId(), orderByField, statisticsTime);
+		DistributeUserRankView more = userDistributeRankStatisticsRecordMapper.getMoreSelfRank(self.getRankId(), self.getOrders(), self.getMoney(), orderByField, statisticsTime);
 		if (more != null) {
 			if (type == 1) {
 				self.setGapOrders(more.getOrders() - self.getOrders());