Merge branch 'subsidy_sku_func' into pre

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

@@ -4,6 +4,7 @@ import com.cyksj.model.entity.GoodsDon;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -22,6 +23,7 @@ import java.util.List;
 		where = "gs.status is true and gs.deleted is true and sku.status is true and g.deleted is true"
 		, groupBy = "g.id,g.title,g.tags,g.virtual_sold,g.sort_by",
 		orderBy = "g.sort_by asc, g.id")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class GoodsDonSubsidyDetailView {
 	@DbField("g.id")
 	private Long id;

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

@@ -1183,6 +1183,9 @@ public class GoodsDonController {
 		GoodsDonSubsidyDetailView subsidyDetail = null;
 		if (o == null) {
 			subsidyDetail = beanSearcher.searchFirst(GoodsDonSubsidyDetailView.class, MapUtils.builder().field(GoodsDonSubsidyDetailView::getId, id).build());
+			if (subsidyDetail == null) {
+				return GatewayResponse.SUCCESS.newBuilder().toResult();
+			}
 
 			subsidyDetail.setSpecs(beanSearcher.searchFirst(GoodsDonSpecFrontView.class, MapUtils.builder().field(GoodsDonSpecFrontView::getGoodsId, subsidyDetail.getId()).build()));
 			MapBuilder builder = MapUtils.builder().field(GoodsDonSkuSubsidyDetailView::getGoodsId, subsidyDetail.getId());