fix

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

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @SearchBean(tables = "distribute_poster_goods dp inner join goods_don g on g.id = dp.goods_id" +
-		" left join user_distribute ud on ud.goods_id = g.id and ud.deleted is true :uid:",
+		" left join user_plat_distribute_rate ud on ud.goods_id = g.id :uid:",
 		where = "g.status is true and g.deleted is true",
 		orderBy = "dp.update_time desc")
 public class DistributePosterGoodsFrontView {
@@ -45,7 +45,7 @@ public class DistributePosterGoodsFrontView {
 	@DbField("g.is_sku_distribute")
 	private Boolean isSkuRate;
 
-	@DbField("ud.id")
+	@DbField("ud.distribute_id")
 	private Long distributeId;
 
 	@DbField("g.min_price")

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

@@ -12,6 +12,7 @@ import com.cyksj.mapper.GoodsDonSkuMapper;
 import com.cyksj.mapper.OrderDonMapper;
 import com.cyksj.mapper.manage.coupon.CouponUserMapper;
 import com.cyksj.mapper.manage.distribute.DistributeGeneralSkuRateMapper;
+import com.cyksj.mapper.manage.distribute.UserDistributeMapper;
 import com.cyksj.mapper.manage.distribute.UserPlatSkuDistributeRateMapper;
 import com.cyksj.model.dto.UserWhoami;
 import com.cyksj.model.entity.*;
@@ -83,6 +84,8 @@ public class UserController {
 
     private final GoodsDonSkuMapper skuMapper;
 
+    private final UserDistributeMapper userDistributeMapper;
+
     @GetMapping(value = "/wx/whoami")
     public Result<UserWhoami> whoami() {
         long userId = StpUserUtil.getLoginIdAsLong();
@@ -442,10 +445,15 @@ public class UserController {
     @GetMapping("/get/ds/poster/goods")
     public Result<List<DistributePosterGoodsFrontView>> getPosterGoods() {
         long userId = StpUserUtil.getLoginIdAsLong();
-        List<DistributePosterGoodsFrontView> searchAll = beanSearcher.searchAll(DistributePosterGoodsFrontView.class, MapUtils
-                .flatBuilder(request.getParameterMap())
-                .put("uid", String.format(" and ud.user_id = %s", userId))
-                .build());
+        UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class)
+                .eq(UserDistribute::getUserId, userId)
+                .eq(UserDistribute::getDeleted, 1)
+                .last("limit 1"));
+        MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
+        if (userDistribute != null) {
+            builder.put("uid", String.format(" and ud.distribute_id = %s", userId));
+        }
+        List<DistributePosterGoodsFrontView> searchAll = beanSearcher.searchAll(DistributePosterGoodsFrontView.class, builder.build());
         searchAll.forEach(e -> {
             if (e.getIsSkuRate()) {
                 BigDecimal price = e.getPrice();
@@ -454,9 +462,9 @@ public class UserController {
                         .eq(GoodsDonSku::getPrice, price)
                         .last("limit 1"));
                 if (sku != null) {
-                    if (e.getDistributeId() != null) {
+                    if (userDistribute != null) {
                         UserPlatSkuDistributeRate userPlatSkuDistributeRate = userPlatSkuDistributeRateMapper.selectOne(Wrappers.lambdaQuery(UserPlatSkuDistributeRate.class)
-                                .eq(UserPlatSkuDistributeRate::getDistributeId, e.getDistributeId())
+                                .eq(UserPlatSkuDistributeRate::getDistributeId, userDistribute.getId())
                                 .eq(UserPlatSkuDistributeRate::getGoodsId, e.getGoodsId())
                                 .eq(UserPlatSkuDistributeRate::getSkuId, sku.getId())
                                 .last("limit 1"));