fix 实物不做处理

netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -13,10 +13,12 @@ import com.cyksj.model.entity.GoodsDonSku;
 import com.cyksj.model.entity.GoodsDonSpec;
 import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.views.GoodsDonPopularizeView;
+import com.cyksj.model.views.GoodsDonSkuView;
 import com.cyksj.model.views.GoodsDonViews;
 import com.cyksj.task.StatisticsDataScheduler;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -124,9 +126,13 @@ public class GoodsDonController {
         GoodsDonViews views = beanSearcher.searchFirst(GoodsDonViews.class, MapUtils.builder().field(GoodsDonViews::getId, id).build());
 
         views.setSpecs(beanSearcher.searchFirst(GoodsDonSpec.class, MapUtils.builder().field(GoodsDonSpec::getGoodsId, views.getId()).build()));
-        views.setSkuList(beanSearcher.searchAll(GoodsDonSku.class, MapUtils.builder().field(GoodsDonSku::getGoodsId, views.getId()).field(GoodsDonSku::getStatus, true)
-                .orderBy(GoodsDonSku::getOrderBy).asc()
-                .build()));
+        MapBuilder builder = MapUtils.builder().field(GoodsDonSku::getGoodsId, views.getId()).field(GoodsDonSku::getStatus, true);
+
+        GoodsDonSkuView goodsDonSkuView = beanSearcher.searchFirst(GoodsDonSkuView.class, MapUtils.builder().field(GoodsDonSkuView::getSkuId, id).build());
+        if (goodsDonSkuView != null && goodsDonSkuView.getType() == 1) {
+            builder.orderBy(GoodsDonSku::getOrderBy).asc();
+        }
+        views.setSkuList(beanSearcher.searchAll(GoodsDonSku.class, builder.build()));
         return GatewayResponse.SUCCESS.newBuilder().toResult(views);
     }