YOHOBUY / yohobuy-global · Commits

Go to a project

Authored by LUOXC
Commit e11fdca3545f1362cec0ea9372da96d46388cd5c 1 parent 81a33f3d

fix

Inline Side-by-side
Showing 2 changed files with 40 additions and 31 deletions
... ... @@ -7,19 +7,19 @@ package com.yoho.global.product.constant;
*/
public enum ColorEnum {
WHITE(1, "#FFFFFF", "white", "白色"),
BLACK(2, "#333333", "black", "黑色"),
GREY(3, "#b9b7af", "grey", "灰色"),
BROWN(4, "#8b5402", "brown", "棕色"),
GREEN(6, "#47ba17", "green", "绿色"),
BLUE(7, "#0000fe", "blue", "蓝色"),
PURPLE(8, "#710098", "purple", "紫色"),
YELLOW(9, "#ffeb00", "yellow", "黄色"),
RED(11, "#ee0000", "red", "红色"),
ORANGE(12, "#ff5c01", "orange", "橙色"),
SILVER(13, "##ccccc", "silver", "银色"),
GLOD(14, "#FFD83D", "glod", "金色"),
COLOUR(15, "##fffff", "colour", "彩色");
WHITE(1, "#FFFFFF", "white", "白色", ""),
BLACK(2, "#333333", "black", "黑色", ""),
GREY(3, "#b9b7af", "grey", "灰色", ""),
BROWN(4, "#8b5402", "brown", "棕色", ""),
GREEN(6, "#47ba17", "green", "绿色", ""),
BLUE(7, "#0000fe", "blue", "蓝色", ""),
PURPLE(8, "#710098", "purple", "紫色", ""),
YELLOW(9, "#ffeb00", "yellow", "黄色", ""),
RED(11, "#ee0000", "red", "红色", ""),
ORANGE(12, "#ff5c01", "orange", "橙色", ""),
SILVER(13, "##ccccc", "silver", "银色", "//static.yohobuy.com/images/color_p2.png"),
GLOD(14, "#FFD83D", "glod", "金色", ""),
COLOUR(15, "##fffff", "colour", "彩色", "//img02.static.yohobuy.com/adpic/2014/01/27/13/0272608508f09e2bf7eb5543bf5cc70d31.png");
public static ColorEnum getColorById(int id) {
for(ColorEnum color : ColorEnum.values()) {
... ... @@ -30,7 +30,7 @@ public enum ColorEnum {
return COLOUR;
}
private ColorEnum(int id, String code, String nameEN, String nameCN) {
private ColorEnum(int id, String code, String nameEN, String nameCN, String value) {
this.id = id;
this.code = code;
this.nameEN = nameEN;
... ... @@ -42,9 +42,11 @@ public enum ColorEnum {
private String code;
private String nameEN;
private String nameCN;
private String value;
public int getId() {
return id;
}
... ... @@ -76,4 +78,12 @@ public enum ColorEnum {
public void setNameCN(String nameCN) {
this.nameCN = nameCN;
}
public String getValue() {
return value;
}
public void setValue( String value ) {
this.value = value;
}
}
... ...
package com.yoho.global.product.service.impl;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
... ... @@ -32,6 +17,20 @@ import com.yoho.global.product.constant.YhChannelGenderEnum;
import com.yoho.global.product.model.Category;
import com.yoho.global.product.search.SearchFormatUtils;
import com.yoho.global.product.service.SearchService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Created by yoho on 2016/12/5.
... ... @@ -158,7 +157,7 @@ public class SearchServiceImpl implements SearchService {
colorJson.put("color_code", color.getCode());
colorJson.put("color_id", color.getId());
colorJson.put("color_name", color.getNameCN());
colorJson.put("color_value", "");
colorJson.put("color_value", color.getValue());
resultArr.add(colorJson);
}
... ...