fix 过滤未上架品比例

netflix-dao/src/main/java/com/cyksj/model/views/UserDistributeView.java

@@ -14,7 +14,8 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@SearchBean(tables = "user_plat_distribute_rate up left join goods_don gd on gd.id = up.goods_id")
+@SearchBean(tables = "user_plat_distribute_rate up left join goods_don gd on gd.id = up.goods_id",
+		where = "gd.deleted is true and gd.status is true")
 public class UserDistributeView {
 	@DbField("up.id")
 	private Long id;

netflix-web/src/main/java/com/cyksj/web/controller/user/DistributePopularizeController.java

@@ -143,7 +143,7 @@ public class DistributePopularizeController {
 			//最高平台比例
 			distributePopularizeView.setHighestRate(userDistributeView.getRate());
 		}else {
-			GoodsDon goodsDon = goodsDonMapper.selectOne(Wrappers.lambdaQuery(GoodsDon.class).eq(GoodsDon::getDeleted, true).orderByDesc(GoodsDon::getRate).select(GoodsDon::getRate).last("limit 1"));
+			GoodsDon goodsDon = goodsDonMapper.selectOne(Wrappers.lambdaQuery(GoodsDon.class).eq(GoodsDon::getDeleted, true).eq(GoodsDon::getStatus, true).orderByDesc(GoodsDon::getRate).select(GoodsDon::getRate).last("limit 1"));
 			distributePopularizeView.setHighestRate(goodsDon.getRate());
 		}
 		List<DistributeWaitingSendPoints> distributeWaitingSendPoints = distributeWaitingSendPointsMapper.selectList(Wrappers.lambdaQuery(DistributeWaitingSendPoints.class).eq(DistributeWaitingSendPoints::getSendStatus, DistributeWaitingSendPoints.Status.waiting).eq(DistributeWaitingSendPoints::getSharedId, userId).select(DistributeWaitingSendPoints::getPoints));