zoujiajian hace 1 año
padre
commit
32b0942af4

+ 3 - 0
netflix-dao/src/main/java/com/cyksj/model/views/GiftCardGoodsSkuFrontView.java

@@ -46,6 +46,9 @@ public class GiftCardGoodsSkuFrontView {
 	@DbField("g.title")
 	private String gcGoodsTitle;
 
+	@DbField("g.logo")
+	private String goodsLogo;
+
 	@DbField("sku.spec_val")
 	private String gcSpecVal;
 

+ 7 - 0
netflix-dao/src/main/java/com/cyksj/model/views/UserBenefitsFrontView.java

@@ -7,6 +7,7 @@ import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -40,6 +41,9 @@ public class UserBenefitsFrontView {
 	@DbField("g.title")
 	private String title;
 
+	@DbField("g.logo")
+	private String goodsLogo;
+
 	/**
 	 * 实物套餐权益 生效套餐ids
 	 */
@@ -61,6 +65,9 @@ public class UserBenefitsFrontView {
 	@DbField("sku.spec_val")
 	private String specVal;
 
+	@DbField("sku.price")
+	private BigDecimal price;
+
 	/**
 	 * 续费减免配置
 	 */

+ 2 - 1
netflix-web/src/main/java/com/cyksj/web/controller/user/UserBenefitsFrontController.java

@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -81,7 +82,7 @@ public class UserBenefitsFrontController {
 		List<UserBenefitsFrontView> userBenefitsFrontViews;
 		if (o == null) {
 			userBenefitsFrontViews = beanSearcher.searchAll(UserBenefitsFrontView.class, MapUtils.builder().onlySelect(UserBenefitsFrontView::getId, UserBenefitsFrontView::getType, UserBenefitsFrontView::getDescription).build());
-			classifications = userBenefitsFrontViews.stream().collect(Collectors.groupingBy(UserBenefitsFrontView::getType));
+			classifications = userBenefitsFrontViews.stream().collect(Collectors.groupingBy(UserBenefitsFrontView::getType, LinkedHashMap::new, Collectors.toList()));
 			redisService.set(key, classifications, RedisService.key.USER_BENEFITS_KEY.getTimeout() + RandomUtil.randomInt(1800));
 		} else {
 			classifications = (Map<UserBenefits.Type, List<UserBenefitsFrontView>>) o;