yoho-search / yoho-search-consumer · Commits

Go to a project

Authored by wangnan9279
Commit ce1dbf6a2e741753ecc664742a17039a76549f47 2 parents 3a7c7c15 19cbe8be

Merge branch 'gray1215_test' into gray1215

Inline Side-by-side
Showing 86 changed files with 785 additions and 783 deletions
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoBrand; 3 +import com.yoho.search.dal.model.ufo_product.Brand;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
5 5
6 import java.util.List; 6 import java.util.List;
@@ -8,15 +8,15 @@ import java.util.List; @@ -8,15 +8,15 @@ import java.util.List;
8 public interface UfoBrandMapper { 8 public interface UfoBrandMapper {
9 int deleteByPrimaryKey(Short id); 9 int deleteByPrimaryKey(Short id);
10 10
11 - int insertSelective(UfoBrand record); 11 + int insertSelective(Brand record);
12 12
13 - UfoBrand selectByPrimaryKey(Short id); 13 + Brand selectByPrimaryKey(Short id);
14 14
15 - int updateByPrimaryKeySelective(UfoBrand record); 15 + int updateByPrimaryKeySelective(Brand record);
16 16
17 - List<UfoBrand> selectByIdList(List<Short> idList); 17 + List<Brand> selectByIdList(List<Short> idList);
18 18
19 int selectCount(); 19 int selectCount();
20 20
21 - List<UfoBrand> selectPageList(@Param(value = "offset") int offset, @Param(value = "pageSize") int pageSize); 21 + List<Brand> selectPageList(@Param(value = "offset") int offset, @Param(value = "pageSize") int pageSize);
22 } 22 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoBrandSeries; 3 +import com.yoho.search.dal.model.ufo_product.BrandSeries;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
5 5
6 import java.util.List; 6 import java.util.List;
@@ -8,15 +8,15 @@ import java.util.List; @@ -8,15 +8,15 @@ import java.util.List;
8 public interface UfoBrandSeriesMapper { 8 public interface UfoBrandSeriesMapper {
9 int deleteByPrimaryKey(Short id); 9 int deleteByPrimaryKey(Short id);
10 10
11 - int insertSelective(UfoBrandSeries record); 11 + int insertSelective(BrandSeries record);
12 12
13 - UfoBrandSeries selectByPrimaryKey(Short id); 13 + BrandSeries selectByPrimaryKey(Short id);
14 14
15 - int updateByPrimaryKeySelective(UfoBrandSeries record); 15 + int updateByPrimaryKeySelective(BrandSeries record);
16 16
17 - List<UfoBrandSeries> selectByIdList(List<Short> brandIdList); 17 + List<BrandSeries> selectByIdList(List<Short> brandIdList);
18 18
19 - List<UfoBrandSeries> selectByBrandIdList(List<Integer> brandIdList); 19 + List<BrandSeries> selectByBrandIdList(List<Integer> brandIdList);
20 20
21 - List<UfoBrandSeries> selectPageList(@Param(value = "offset") int offset, @Param(value = "pageSize") int pageSize); 21 + List<BrandSeries> selectPageList(@Param(value = "offset") int offset, @Param(value = "pageSize") int pageSize);
22 } 22 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoBuyerOrderGoods; 3 +import com.yoho.search.dal.model.ufo_order.BuyerOrderGoods;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
7 public interface UfoBuyerOrderGoodsMapper { 7 public interface UfoBuyerOrderGoodsMapper {
8 int deleteByPrimaryKey(Integer id); 8 int deleteByPrimaryKey(Integer id);
9 9
10 - int insert(UfoBuyerOrderGoods record); 10 + int insert(BuyerOrderGoods record);
11 11
12 - int insertSelective(UfoBuyerOrderGoods record); 12 + int insertSelective(BuyerOrderGoods record);
13 13
14 - UfoBuyerOrderGoods selectByPrimaryKey(Integer id); 14 + BuyerOrderGoods selectByPrimaryKey(Integer id);
15 15
16 - int updateByPrimaryKeySelective(UfoBuyerOrderGoods record); 16 + int updateByPrimaryKeySelective(BuyerOrderGoods record);
17 17
18 - int updateByPrimaryKey(UfoBuyerOrderGoods record); 18 + int updateByPrimaryKey(BuyerOrderGoods record);
19 19
20 - List<UfoBuyerOrderGoods> selectBySkupList(List<Integer> skupList); 20 + List<BuyerOrderGoods> selectBySkupList(List<Integer> skupList);
21 } 21 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoBuyerOrder; 3 +import com.yoho.search.dal.model.ufo_order.BuyerOrder;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
7 public interface UfoBuyerOrderMapper { 7 public interface UfoBuyerOrderMapper {
8 int deleteByPrimaryKey(Integer id); 8 int deleteByPrimaryKey(Integer id);
9 9
10 - int insert(UfoBuyerOrder record); 10 + int insert(BuyerOrder record);
11 11
12 - int insertSelective(UfoBuyerOrder record); 12 + int insertSelective(BuyerOrder record);
13 13
14 - UfoBuyerOrder selectByPrimaryKey(Integer id); 14 + BuyerOrder selectByPrimaryKey(Integer id);
15 15
16 - int updateByPrimaryKeySelective(UfoBuyerOrder record); 16 + int updateByPrimaryKeySelective(BuyerOrder record);
17 17
18 - int updateByPrimaryKey(UfoBuyerOrder record); 18 + int updateByPrimaryKey(BuyerOrder record);
19 19
20 - List<UfoBuyerOrder> selectByOrderCodeList(List<Long> orderCodeList); 20 + List<BuyerOrder> selectByOrderCodeList(List<Long> orderCodeList);
21 } 21 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoGoodsImages; 3 +import com.yoho.search.dal.model.ufo_product.GoodsImages;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
7 public interface UfoGoodsImagesMapper { 7 public interface UfoGoodsImagesMapper {
8 int deleteByPrimaryKey(Integer id); 8 int deleteByPrimaryKey(Integer id);
9 9
10 - int insertSelective(UfoGoodsImages record); 10 + int insertSelective(GoodsImages record);
11 11
12 - UfoGoodsImages selectByPrimaryKey(Integer id); 12 + GoodsImages selectByPrimaryKey(Integer id);
13 13
14 - int updateByPrimaryKeySelective(UfoGoodsImages record); 14 + int updateByPrimaryKeySelective(GoodsImages record);
15 15
16 - List<UfoGoodsImages> selectByProductIdList(List<Integer> idList); 16 + List<GoodsImages> selectByProductIdList(List<Integer> idList);
17 } 17 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoGoods; 3 +import com.yoho.search.dal.model.ufo_product.Goods;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
7 public interface UfoGoodsMapper { 7 public interface UfoGoodsMapper {
8 int deleteByPrimaryKey(Integer id); 8 int deleteByPrimaryKey(Integer id);
9 9
10 - int insertSelective(UfoGoods record); 10 + int insertSelective(Goods record);
11 11
12 - UfoGoods selectByPrimaryKey(Integer id); 12 + Goods selectByPrimaryKey(Integer id);
13 13
14 - int updateByPrimaryKeySelective(UfoGoods record); 14 + int updateByPrimaryKeySelective(Goods record);
15 15
16 - List<UfoGoods> selectByProductIdList(List<Integer> idList); 16 + List<Goods> selectByProductIdList(List<Integer> idList);
17 } 17 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoProductColor; 3 +import com.yoho.search.dal.model.ufo_product.ProductColor;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
5 5
6 import java.util.List; 6 import java.util.List;
@@ -8,13 +8,13 @@ import java.util.List; @@ -8,13 +8,13 @@ import java.util.List;
8 public interface UfoProductColorMapper { 8 public interface UfoProductColorMapper {
9 int deleteByPrimaryKey(Short id); 9 int deleteByPrimaryKey(Short id);
10 10
11 - int insertSelective(UfoProductColor record); 11 + int insertSelective(ProductColor record);
12 12
13 - UfoProductColor selectByPrimaryKey(Short id); 13 + ProductColor selectByPrimaryKey(Short id);
14 14
15 - int updateByPrimaryKeySelective(UfoProductColor record); 15 + int updateByPrimaryKeySelective(ProductColor record);
16 16
17 int selectCount(); 17 int selectCount();
18 18
19 - List<UfoProductColor> selectPageList(@Param(value = "offset") int offset, @Param(value = "pageSize") int pageSize); 19 + List<ProductColor> selectPageList(@Param(value = "offset") int offset, @Param(value = "pageSize") int pageSize);
20 } 20 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoProduct; 3 +import com.yoho.search.dal.model.ufo_product.Product;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
5 5
6 import java.util.List; 6 import java.util.List;
@@ -8,17 +8,17 @@ import java.util.List; @@ -8,17 +8,17 @@ import java.util.List;
8 public interface UfoProductMapper { 8 public interface UfoProductMapper {
9 int deleteByPrimaryKey(Integer id); 9 int deleteByPrimaryKey(Integer id);
10 10
11 - int insertSelective(UfoProduct record); 11 + int insertSelective(Product record);
12 12
13 - UfoProduct selectByPrimaryKey(Integer id); 13 + Product selectByPrimaryKey(Integer id);
14 14
15 - int updateByPrimaryKeySelective(UfoProduct record); 15 + int updateByPrimaryKeySelective(Product record);
16 16
17 int selectCount(); 17 int selectCount();
18 18
19 - List<UfoProduct> selectPageLists(@Param(value = "offset") Integer offset, @Param(value = "pageSize") Integer pageSize); 19 + List<Product> selectPageLists(@Param(value = "offset") Integer offset, @Param(value = "pageSize") Integer pageSize);
20 20
21 - List<UfoProduct> selectByIdList(List<Integer> idList); 21 + List<Product> selectByIdList(List<Integer> idList);
22 22
23 - List<UfoProduct> selectByBrandId(Short brandId); 23 + List<Product> selectByBrandId(Short brandId);
24 } 24 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoProductPoolDetail; 3 +import com.yoho.search.dal.model.ufo_product.ProductPoolDetail;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
7 public interface UfoProductPoolDetailMapper { 7 public interface UfoProductPoolDetailMapper {
8 int deleteByPrimaryKey(Integer id); 8 int deleteByPrimaryKey(Integer id);
9 9
10 - int insertSelective(UfoProductPoolDetail record); 10 + int insertSelective(ProductPoolDetail record);
11 11
12 - UfoProductPoolDetail selectByPrimaryKey(Integer id); 12 + ProductPoolDetail selectByPrimaryKey(Integer id);
13 13
14 - int updateByPrimaryKeySelective(UfoProductPoolDetail record); 14 + int updateByPrimaryKeySelective(ProductPoolDetail record);
15 15
16 - List<UfoProductPoolDetail> selectByProductId(Integer id); 16 + List<ProductPoolDetail> selectByProductId(Integer id);
17 } 17 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoProductPool; 3 +import com.yoho.search.dal.model.ufo_product.ProductPool;
4 4
5 public interface UfoProductPoolMapper { 5 public interface UfoProductPoolMapper {
6 int deleteByPrimaryKey(Integer id); 6 int deleteByPrimaryKey(Integer id);
7 7
8 - int insertSelective(UfoProductPool record); 8 + int insertSelective(ProductPool record);
9 9
10 - UfoProductPool selectByPrimaryKey(Integer id); 10 + ProductPool selectByPrimaryKey(Integer id);
11 11
12 - int updateByPrimaryKeySelective(UfoProductPool record); 12 + int updateByPrimaryKeySelective(ProductPool record);
13 } 13 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoProductSort; 3 +import com.yoho.search.dal.model.ufo_product.ProductSort;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
5 5
6 import java.util.List; 6 import java.util.List;
@@ -8,15 +8,15 @@ import java.util.List; @@ -8,15 +8,15 @@ import java.util.List;
8 public interface UfoProductSortMapper { 8 public interface UfoProductSortMapper {
9 int deleteByPrimaryKey(Short id); 9 int deleteByPrimaryKey(Short id);
10 10
11 - int insertSelective(UfoProductSort record); 11 + int insertSelective(ProductSort record);
12 12
13 - UfoProductSort selectByPrimaryKey(Short id); 13 + ProductSort selectByPrimaryKey(Short id);
14 14
15 - int updateByPrimaryKeySelective(UfoProductSort record); 15 + int updateByPrimaryKeySelective(ProductSort record);
16 16
17 - List<UfoProductSort> selectByIdList(List<Short> idList); 17 + List<ProductSort> selectByIdList(List<Short> idList);
18 18
19 int selectCount(); 19 int selectCount();
20 20
21 - List<UfoProductSort> selectPageList(@Param(value = "offset") int offset, @Param(value = "pageSize") int pageSize); 21 + List<ProductSort> selectPageList(@Param(value = "offset") int offset, @Param(value = "pageSize") int pageSize);
22 } 22 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoScoreProductRule; 3 +import com.yoho.search.dal.model.ufo_product.ScoreProductRule;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
5 5
6 import java.util.List; 6 import java.util.List;
@@ -8,15 +8,15 @@ import java.util.List; @@ -8,15 +8,15 @@ import java.util.List;
8 public interface UfoScoreProductRuleMapper { 8 public interface UfoScoreProductRuleMapper {
9 int deleteByPrimaryKey(Integer id); 9 int deleteByPrimaryKey(Integer id);
10 10
11 - int insert(UfoScoreProductRule record); 11 + int insert(ScoreProductRule record);
12 12
13 - int insertSelective(UfoScoreProductRule record); 13 + int insertSelective(ScoreProductRule record);
14 14
15 - UfoScoreProductRule selectByPrimaryKey(Integer id); 15 + ScoreProductRule selectByPrimaryKey(Integer id);
16 16
17 - int updateByPrimaryKeySelective(UfoScoreProductRule record); 17 + int updateByPrimaryKeySelective(ScoreProductRule record);
18 18
19 - int updateByPrimaryKey(UfoScoreProductRule record); 19 + int updateByPrimaryKey(ScoreProductRule record);
20 20
21 List<Integer> selectByIdList(@Param(value = "idList") List<Integer> idList); 21 List<Integer> selectByIdList(@Param(value = "idList") List<Integer> idList);
22 } 22 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoSearchSortRelation; 3 +import com.yoho.search.dal.model.ufo_product.SearchSortRelation;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
7 public interface UfoSearchSortRelationMapper { 7 public interface UfoSearchSortRelationMapper {
8 int deleteByPrimaryKey(Integer ufoSortId); 8 int deleteByPrimaryKey(Integer ufoSortId);
9 9
10 - int insert(UfoSearchSortRelation record); 10 + int insert(SearchSortRelation record);
11 11
12 - int insertSelective(UfoSearchSortRelation record); 12 + int insertSelective(SearchSortRelation record);
13 13
14 - UfoSearchSortRelation selectByPrimaryKey(Integer ufoSortId); 14 + SearchSortRelation selectByPrimaryKey(Integer ufoSortId);
15 15
16 - int updateByPrimaryKeySelective(UfoSearchSortRelation record); 16 + int updateByPrimaryKeySelective(SearchSortRelation record);
17 17
18 - void insertBatch(List<UfoSearchSortRelation> list); 18 + void insertBatch(List<SearchSortRelation> list);
19 19
20 void deleteAll(); 20 void deleteAll();
21 21
22 - List<UfoSearchSortRelation> selectAll(); 22 + List<SearchSortRelation> selectAll();
23 } 23 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoSize; 3 +import com.yoho.search.dal.model.ufo_product.Size;
4 import org.apache.ibatis.annotations.Param; 4 import org.apache.ibatis.annotations.Param;
5 5
6 import java.util.List; 6 import java.util.List;
@@ -8,13 +8,13 @@ import java.util.List; @@ -8,13 +8,13 @@ import java.util.List;
8 public interface UfoSizeMapper { 8 public interface UfoSizeMapper {
9 int deleteByPrimaryKey(Short id); 9 int deleteByPrimaryKey(Short id);
10 10
11 - int insertSelective(UfoSize record); 11 + int insertSelective(Size record);
12 12
13 - UfoSize selectByPrimaryKey(Short id); 13 + Size selectByPrimaryKey(Short id);
14 14
15 - int updateByPrimaryKeySelective(UfoSize record); 15 + int updateByPrimaryKeySelective(Size record);
16 16
17 int selectCount(); 17 int selectCount();
18 18
19 - List<UfoSize> selectPageList(@Param(value = "offset") int offset, @Param(value = "pageSize") int pageSize); 19 + List<Size> selectPageList(@Param(value = "offset") int offset, @Param(value = "pageSize") int pageSize);
20 } 20 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoStorage; 3 +import com.yoho.search.dal.model.ufo_product.Storage;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
7 public interface UfoStorageMapper { 7 public interface UfoStorageMapper {
8 int deleteByPrimaryKey(Integer id); 8 int deleteByPrimaryKey(Integer id);
9 9
10 - int insertSelective(UfoStorage record); 10 + int insertSelective(Storage record);
11 11
12 - UfoStorage selectByPrimaryKey(Integer id); 12 + Storage selectByPrimaryKey(Integer id);
13 13
14 - int updateByPrimaryKeySelective(UfoStorage record); 14 + int updateByPrimaryKeySelective(Storage record);
15 15
16 - List<UfoStorage> selectByProductIdList(List<Integer> idList); 16 + List<Storage> selectByProductIdList(List<Integer> idList);
17 } 17 }
1 package com.yoho.search.dal; 1 package com.yoho.search.dal;
2 2
3 -import com.yoho.search.dal.model.UfoStoragePrice; 3 +import com.yoho.search.dal.model.ufo_product.StoragePrice;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
7 public interface UfoStoragePriceMapper { 7 public interface UfoStoragePriceMapper {
8 int deleteByPrimaryKey(Integer id); 8 int deleteByPrimaryKey(Integer id);
9 9
10 - int insertSelective(UfoStoragePrice record); 10 + int insertSelective(StoragePrice record);
11 11
12 - UfoStoragePrice selectByPrimaryKey(Integer id); 12 + StoragePrice selectByPrimaryKey(Integer id);
13 13
14 - int updateByPrimaryKeySelective(UfoStoragePrice record); 14 + int updateByPrimaryKeySelective(StoragePrice record);
15 15
16 - List<UfoStoragePrice> selectByProductIdList(List<Integer> idList); 16 + List<StoragePrice> selectByProductIdList(List<Integer> idList);
17 } 17 }
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoBrandMapper"> 3 <mapper namespace="com.yoho.search.dal.UfoBrandMapper">
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoBrand"> 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.Brand">
6 <id column="id" property="id" jdbcType="SMALLINT"/> 6 <id column="id" property="id" jdbcType="SMALLINT"/>
7 <result column="brand_name" property="brandName" jdbcType="VARCHAR"/> 7 <result column="brand_name" property="brandName" jdbcType="VARCHAR"/>
8 <result column="brand_name_en" property="brandNameEn" jdbcType="VARCHAR"/> 8 <result column="brand_name_en" property="brandNameEn" jdbcType="VARCHAR"/>
@@ -18,17 +18,17 @@ @@ -18,17 +18,17 @@
18 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Short"> 18 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Short">
19 select 19 select
20 <include refid="Base_Column_List"/> 20 <include refid="Base_Column_List"/>
21 - from ufo_brand 21 + from brand
22 where id = #{id,jdbcType=SMALLINT} 22 where id = #{id,jdbcType=SMALLINT}
23 </select> 23 </select>
24 24
25 <delete id="deleteByPrimaryKey" parameterType="java.lang.Short"> 25 <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
26 - delete from ufo_brand 26 + delete from brand
27 where id = #{id,jdbcType=SMALLINT} 27 where id = #{id,jdbcType=SMALLINT}
28 </delete> 28 </delete>
29 29
30 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoBrand" >  
31 - insert into ufo_brand 30 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.Brand" >
  31 + insert into brand
32 <trim prefix="(" suffix=")" suffixOverrides="," > 32 <trim prefix="(" suffix=")" suffixOverrides="," >
33 <if test="id != null" > 33 <if test="id != null" >
34 id, 34 id,
@@ -71,8 +71,8 @@ @@ -71,8 +71,8 @@
71 </trim> 71 </trim>
72 </insert> 72 </insert>
73 73
74 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoBrand">  
75 - update ufo_brand 74 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.Brand">
  75 + update brand
76 <set> 76 <set>
77 <if test="brandName != null"> 77 <if test="brandName != null">
78 brand_name = #{brandName,jdbcType=VARCHAR}, 78 brand_name = #{brandName,jdbcType=VARCHAR},
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 <select id="selectByIdList" resultMap="BaseResultMap" timeout="20000"> 97 <select id="selectByIdList" resultMap="BaseResultMap" timeout="20000">
98 select 98 select
99 <include refid="Base_Column_List"/> 99 <include refid="Base_Column_List"/>
100 - from ufo_brand 100 + from brand
101 WHERE 101 WHERE
102 id in 102 id in
103 <foreach item="item" index="index" collection="list" 103 <foreach item="item" index="index" collection="list"
@@ -108,13 +108,13 @@ @@ -108,13 +108,13 @@
108 108
109 109
110 <select id="selectCount" resultType="java.lang.Integer" timeout="20000"> 110 <select id="selectCount" resultType="java.lang.Integer" timeout="20000">
111 - select count(*) from ufo_brand 111 + select count(*) from brand
112 </select> 112 </select>
113 113
114 <select id="selectPageList" resultMap="BaseResultMap" timeout="20000"> 114 <select id="selectPageList" resultMap="BaseResultMap" timeout="20000">
115 select 115 select
116 <include refid="Base_Column_List"/> 116 <include refid="Base_Column_List"/>
117 - from ufo_brand limit #{offset},#{pageSize} 117 + from brand limit #{offset},#{pageSize}
118 </select> 118 </select>
119 119
120 </mapper> 120 </mapper>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoBrandSeriesMapper"> 3 <mapper namespace="com.yoho.search.dal.UfoBrandSeriesMapper">
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoBrandSeries"> 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.BrandSeries">
6 <id column="id" property="id" jdbcType="INTEGER"/> 6 <id column="id" property="id" jdbcType="INTEGER"/>
7 <result column="series_name" property="seriesName" jdbcType="VARCHAR"/> 7 <result column="series_name" property="seriesName" jdbcType="VARCHAR"/>
8 <result column="series_search" property="seriesSearch" jdbcType="VARCHAR"/> 8 <result column="series_search" property="seriesSearch" jdbcType="VARCHAR"/>
@@ -19,17 +19,17 @@ @@ -19,17 +19,17 @@
19 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Short"> 19 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Short">
20 select 20 select
21 <include refid="Base_Column_List"/> 21 <include refid="Base_Column_List"/>
22 - from ufo_brand_series 22 + from brand_series
23 where id = #{id,jdbcType=INTEGER} 23 where id = #{id,jdbcType=INTEGER}
24 </select> 24 </select>
25 25
26 <delete id="deleteByPrimaryKey" parameterType="java.lang.Short"> 26 <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
27 - delete from ufo_brand_series 27 + delete from brand_series
28 where id = #{id,jdbcType=INTEGER} 28 where id = #{id,jdbcType=INTEGER}
29 </delete> 29 </delete>
30 30
31 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoBrandSeries">  
32 - insert into ufo_brand_series 31 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.BrandSeries">
  32 + insert into brand_series
33 <trim prefix="(" suffix=")" suffixOverrides=","> 33 <trim prefix="(" suffix=")" suffixOverrides=",">
34 <if test="id != null"> 34 <if test="id != null">
35 id, 35 id,
@@ -78,8 +78,8 @@ @@ -78,8 +78,8 @@
78 </trim> 78 </trim>
79 </insert> 79 </insert>
80 80
81 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoBrandSeries">  
82 - update ufo_brand_series 81 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.BrandSeries">
  82 + update brand_series
83 <set> 83 <set>
84 <if test="seriesName != null"> 84 <if test="seriesName != null">
85 series_name = #{seriesName,jdbcType=VARCHAR}, 85 series_name = #{seriesName,jdbcType=VARCHAR},
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 <select id="selectByIdList" resultMap="BaseResultMap" timeout="20000"> 106 <select id="selectByIdList" resultMap="BaseResultMap" timeout="20000">
107 select 107 select
108 <include refid="Base_Column_List"/> 108 <include refid="Base_Column_List"/>
109 - from ufo_brand_series 109 + from brand_series
110 WHERE 110 WHERE
111 status =1 111 status =1
112 AND 112 AND
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 <select id="selectByBrandIdList" resultMap="BaseResultMap" timeout="20000"> 120 <select id="selectByBrandIdList" resultMap="BaseResultMap" timeout="20000">
121 select 121 select
122 <include refid="Base_Column_List"/> 122 <include refid="Base_Column_List"/>
123 - from ufo_brand_series 123 + from brand_series
124 WHERE brand_id in 124 WHERE brand_id in
125 <foreach item="item" index="index" collection="list" 125 <foreach item="item" index="index" collection="list"
126 open="(" separator="," close=")"> 126 open="(" separator="," close=")">
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 <select id="selectPageList" resultMap="BaseResultMap" timeout="20000"> 131 <select id="selectPageList" resultMap="BaseResultMap" timeout="20000">
132 select 132 select
133 <include refid="Base_Column_List"/> 133 <include refid="Base_Column_List"/>
134 - from ufo_brand_series limit #{offset},#{pageSize} 134 + from brand_series limit #{offset},#{pageSize}
135 </select> 135 </select>
136 136
137 </mapper> 137 </mapper>
1 <?xml version="1.0" encoding="UTF-8" ?> 1 <?xml version="1.0" encoding="UTF-8" ?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoBuyerOrderGoodsMapper" > 3 <mapper namespace="com.yoho.search.dal.UfoBuyerOrderGoodsMapper" >
4 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoBuyerOrderGoods" > 4 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_order.BuyerOrderGoods" >
5 <id column="id" property="id" jdbcType="INTEGER" /> 5 <id column="id" property="id" jdbcType="INTEGER" />
6 <result column="order_code" property="orderCode" jdbcType="BIGINT" /> 6 <result column="order_code" property="orderCode" jdbcType="BIGINT" />
7 <result column="skup" property="skup" jdbcType="INTEGER" /> 7 <result column="skup" property="skup" jdbcType="INTEGER" />
@@ -16,23 +16,23 @@ @@ -16,23 +16,23 @@
16 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > 16 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
17 select 17 select
18 <include refid="Base_Column_List" /> 18 <include refid="Base_Column_List" />
19 - from ufo_buyer_order_goods 19 + from buyer_order_goods
20 where id = #{id,jdbcType=INTEGER} 20 where id = #{id,jdbcType=INTEGER}
21 </select> 21 </select>
22 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" > 22 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
23 - delete from ufo_buyer_order_goods 23 + delete from buyer_order_goods
24 where id = #{id,jdbcType=INTEGER} 24 where id = #{id,jdbcType=INTEGER}
25 </delete> 25 </delete>
26 - <insert id="insert" parameterType="com.yoho.search.dal.model.UfoBuyerOrderGoods" >  
27 - insert into ufo_buyer_order_goods (id, order_code, skup, 26 + <insert id="insert" parameterType="com.yoho.search.dal.model.ufo_order.BuyerOrderGoods" >
  27 + insert into buyer_order_goods (id, order_code, skup,
28 goods_price, goods_amount, uid, 28 goods_price, goods_amount, uid,
29 coupon_cut_amount) 29 coupon_cut_amount)
30 values (#{id,jdbcType=INTEGER}, #{orderCode,jdbcType=BIGINT}, #{skup,jdbcType=INTEGER}, 30 values (#{id,jdbcType=INTEGER}, #{orderCode,jdbcType=BIGINT}, #{skup,jdbcType=INTEGER},
31 #{goodsPrice,jdbcType=DECIMAL}, #{goodsAmount,jdbcType=DECIMAL}, #{uid,jdbcType=INTEGER}, 31 #{goodsPrice,jdbcType=DECIMAL}, #{goodsAmount,jdbcType=DECIMAL}, #{uid,jdbcType=INTEGER},
32 #{couponCutAmount,jdbcType=DECIMAL}) 32 #{couponCutAmount,jdbcType=DECIMAL})
33 </insert> 33 </insert>
34 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoBuyerOrderGoods" >  
35 - insert into ufo_buyer_order_goods 34 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_order.BuyerOrderGoods" >
  35 + insert into buyer_order_goods
36 <trim prefix="(" suffix=")" suffixOverrides="," > 36 <trim prefix="(" suffix=")" suffixOverrides="," >
37 <if test="id != null" > 37 <if test="id != null" >
38 id, 38 id,
@@ -80,8 +80,8 @@ @@ -80,8 +80,8 @@
80 </if> 80 </if>
81 </trim> 81 </trim>
82 </insert> 82 </insert>
83 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoBuyerOrderGoods" >  
84 - update ufo_buyer_order_goods 83 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_order.BuyerOrderGoods" >
  84 + update buyer_order_goods
85 <set > 85 <set >
86 <if test="orderCode != null" > 86 <if test="orderCode != null" >
87 order_code = #{orderCode,jdbcType=BIGINT}, 87 order_code = #{orderCode,jdbcType=BIGINT},
@@ -104,8 +104,8 @@ @@ -104,8 +104,8 @@
104 </set> 104 </set>
105 where id = #{id,jdbcType=INTEGER} 105 where id = #{id,jdbcType=INTEGER}
106 </update> 106 </update>
107 - <update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.UfoBuyerOrderGoods" >  
108 - update ufo_buyer_order_goods 107 + <update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.ufo_order.BuyerOrderGoods" >
  108 + update buyer_order_goods
109 set order_code = #{orderCode,jdbcType=BIGINT}, 109 set order_code = #{orderCode,jdbcType=BIGINT},
110 skup = #{skup,jdbcType=INTEGER}, 110 skup = #{skup,jdbcType=INTEGER},
111 goods_price = #{goodsPrice,jdbcType=DECIMAL}, 111 goods_price = #{goodsPrice,jdbcType=DECIMAL},
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
118 <select id="selectBySkupList" resultMap="BaseResultMap" timeout="20000"> 118 <select id="selectBySkupList" resultMap="BaseResultMap" timeout="20000">
119 select 119 select
120 <include refid="Base_Column_List"/> 120 <include refid="Base_Column_List"/>
121 - from ufo_buyer_order_goods 121 + from buyer_order_goods
122 WHERE 122 WHERE
123 skup in 123 skup in
124 <foreach item="item" index="index" collection="list" 124 <foreach item="item" index="index" collection="list"
1 <?xml version="1.0" encoding="UTF-8" ?> 1 <?xml version="1.0" encoding="UTF-8" ?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoBuyerOrderMapper" > 3 <mapper namespace="com.yoho.search.dal.UfoBuyerOrderMapper" >
4 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoBuyerOrder" > 4 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_order.BuyerOrder" >
5 <id column="id" property="id" jdbcType="INTEGER" /> 5 <id column="id" property="id" jdbcType="INTEGER" />
6 <result column="uid" property="uid" jdbcType="INTEGER" /> 6 <result column="uid" property="uid" jdbcType="INTEGER" />
7 <result column="order_code" property="orderCode" jdbcType="BIGINT" /> 7 <result column="order_code" property="orderCode" jdbcType="BIGINT" />
@@ -27,15 +27,15 @@ @@ -27,15 +27,15 @@
27 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > 27 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
28 select 28 select
29 <include refid="Base_Column_List" /> 29 <include refid="Base_Column_List" />
30 - from ufo_buyer_order 30 + from buyer_order
31 where id = #{id,jdbcType=INTEGER} 31 where id = #{id,jdbcType=INTEGER}
32 </select> 32 </select>
33 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" > 33 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
34 - delete from ufo_buyer_order 34 + delete from buyer_order
35 where id = #{id,jdbcType=INTEGER} 35 where id = #{id,jdbcType=INTEGER}
36 </delete> 36 </delete>
37 - <insert id="insert" parameterType="com.yoho.search.dal.model.UfoBuyerOrder" >  
38 - insert into ufo_buyer_order (id, uid, order_code, 37 + <insert id="insert" parameterType="com.yoho.search.dal.model.ufo_order.BuyerOrder" >
  38 + insert into buyer_order (id, uid, order_code,
39 seller_uid, client_type, payment, 39 seller_uid, client_type, payment,
40 payment_type, is_cancel, amount, 40 payment_type, is_cancel, amount,
41 ship_fee, status, create_time, 41 ship_fee, status, create_time,
@@ -48,8 +48,8 @@ @@ -48,8 +48,8 @@
48 #{updateTime,jdbcType=INTEGER}, #{sellerOrderStatus,jdbcType=TINYINT}, #{buyerOrderStatus,jdbcType=TINYINT}, 48 #{updateTime,jdbcType=INTEGER}, #{sellerOrderStatus,jdbcType=TINYINT}, #{buyerOrderStatus,jdbcType=TINYINT},
49 #{channelNo,jdbcType=VARCHAR}) 49 #{channelNo,jdbcType=VARCHAR})
50 </insert> 50 </insert>
51 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoBuyerOrder" >  
52 - insert into ufo_buyer_order 51 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_order.BuyerOrder" >
  52 + insert into buyer_order
53 <trim prefix="(" suffix=")" suffixOverrides="," > 53 <trim prefix="(" suffix=")" suffixOverrides="," >
54 <if test="id != null" > 54 <if test="id != null" >
55 id, 55 id,
@@ -151,8 +151,8 @@ @@ -151,8 +151,8 @@
151 </if> 151 </if>
152 </trim> 152 </trim>
153 </insert> 153 </insert>
154 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoBuyerOrder" >  
155 - update ufo_buyer_order 154 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_order.BuyerOrder" >
  155 + update buyer_order
156 <set > 156 <set >
157 <if test="uid != null" > 157 <if test="uid != null" >
158 uid = #{uid,jdbcType=INTEGER}, 158 uid = #{uid,jdbcType=INTEGER},
@@ -202,8 +202,8 @@ @@ -202,8 +202,8 @@
202 </set> 202 </set>
203 where id = #{id,jdbcType=INTEGER} 203 where id = #{id,jdbcType=INTEGER}
204 </update> 204 </update>
205 - <update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.UfoBuyerOrder" >  
206 - update ufo_buyer_order 205 + <update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.ufo_order.BuyerOrder" >
  206 + update buyer_order
207 set uid = #{uid,jdbcType=INTEGER}, 207 set uid = #{uid,jdbcType=INTEGER},
208 order_code = #{orderCode,jdbcType=BIGINT}, 208 order_code = #{orderCode,jdbcType=BIGINT},
209 seller_uid = #{sellerUid,jdbcType=INTEGER}, 209 seller_uid = #{sellerUid,jdbcType=INTEGER},
@@ -224,7 +224,7 @@ @@ -224,7 +224,7 @@
224 <select id="selectByOrderCodeList" resultMap="BaseResultMap" timeout="20000"> 224 <select id="selectByOrderCodeList" resultMap="BaseResultMap" timeout="20000">
225 select 225 select
226 <include refid="Base_Column_List"/> 226 <include refid="Base_Column_List"/>
227 - from ufo_buyer_order 227 + from buyer_order
228 WHERE 228 WHERE
229 order_code in 229 order_code in
230 <foreach item="item" index="index" collection="list" 230 <foreach item="item" index="index" collection="list"
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoGoodsImagesMapper"> 3 <mapper namespace="com.yoho.search.dal.UfoGoodsImagesMapper">
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoGoodsImages"> 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.GoodsImages">
6 <id column="id" property="id" jdbcType="INTEGER"/> 6 <id column="id" property="id" jdbcType="INTEGER"/>
7 <result column="goods_id" property="goodsId" jdbcType="INTEGER"/> 7 <result column="goods_id" property="goodsId" jdbcType="INTEGER"/>
8 <result column="product_id" property="productId" jdbcType="INTEGER"/> 8 <result column="product_id" property="productId" jdbcType="INTEGER"/>
@@ -18,17 +18,17 @@ @@ -18,17 +18,17 @@
18 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer"> 18 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
19 select 19 select
20 <include refid="Base_Column_List"/> 20 <include refid="Base_Column_List"/>
21 - from ufo_goods_images 21 + from goods_images
22 where id = #{id,jdbcType=INTEGER} 22 where id = #{id,jdbcType=INTEGER}
23 </select> 23 </select>
24 24
25 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> 25 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
26 - delete from ufo_goods_images 26 + delete from goods_images
27 where id = #{id,jdbcType=INTEGER} 27 where id = #{id,jdbcType=INTEGER}
28 </delete> 28 </delete>
29 29
30 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoGoodsImages" >  
31 - insert into ufo_goods_images 30 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.GoodsImages" >
  31 + insert into goods_images
32 <trim prefix="(" suffix=")" suffixOverrides="," > 32 <trim prefix="(" suffix=")" suffixOverrides="," >
33 <if test="id != null" > 33 <if test="id != null" >
34 id, 34 id,
@@ -71,8 +71,8 @@ @@ -71,8 +71,8 @@
71 </trim> 71 </trim>
72 </insert> 72 </insert>
73 73
74 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoGoodsImages">  
75 - update ufo_goods_images 74 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.GoodsImages">
  75 + update goods_images
76 <set> 76 <set>
77 <if test="goodsId != null"> 77 <if test="goodsId != null">
78 goods_id = #{goodsId,jdbcType=INTEGER}, 78 goods_id = #{goodsId,jdbcType=INTEGER},
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 <select id="selectByProductIdList" resultMap="BaseResultMap" timeout="20000"> 96 <select id="selectByProductIdList" resultMap="BaseResultMap" timeout="20000">
97 select 97 select
98 <include refid="Base_Column_List"/> 98 <include refid="Base_Column_List"/>
99 - from ufo_goods_images 99 + from goods_images
100 WHERE product_id in 100 WHERE product_id in
101 <foreach item="item" index="index" collection="list" 101 <foreach item="item" index="index" collection="list"
102 open="(" separator="," close=")"> 102 open="(" separator="," close=")">
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoGoodsMapper" > 3 <mapper namespace="com.yoho.search.dal.UfoGoodsMapper" >
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoGoods" > 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.Goods" >
6 <id column="id" property="id" jdbcType="INTEGER" /> 6 <id column="id" property="id" jdbcType="INTEGER" />
7 <result column="product_id" property="productId" jdbcType="INTEGER" /> 7 <result column="product_id" property="productId" jdbcType="INTEGER" />
8 <result column="color_id" property="colorId" jdbcType="SMALLINT" /> 8 <result column="color_id" property="colorId" jdbcType="SMALLINT" />
@@ -19,17 +19,17 @@ @@ -19,17 +19,17 @@
19 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > 19 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
20 select 20 select
21 <include refid="Base_Column_List" /> 21 <include refid="Base_Column_List" />
22 - from ufo_goods 22 + from goods
23 where id = #{id,jdbcType=INTEGER} 23 where id = #{id,jdbcType=INTEGER}
24 </select> 24 </select>
25 25
26 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" > 26 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
27 - delete from ufo_goods 27 + delete from goods
28 where id = #{id,jdbcType=INTEGER} 28 where id = #{id,jdbcType=INTEGER}
29 </delete> 29 </delete>
30 30
31 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoGoods" >  
32 - insert into ufo_goods 31 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.Goods" >
  32 + insert into goods
33 <trim prefix="(" suffix=")" suffixOverrides="," > 33 <trim prefix="(" suffix=")" suffixOverrides="," >
34 <if test="id != null" > 34 <if test="id != null" >
35 id, 35 id,
@@ -78,8 +78,8 @@ @@ -78,8 +78,8 @@
78 </trim> 78 </trim>
79 </insert> 79 </insert>
80 80
81 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoGoods" >  
82 - update ufo_goods 81 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.Goods" >
  82 + update goods
83 <set > 83 <set >
84 <if test="productId != null" > 84 <if test="productId != null" >
85 product_id = #{productId,jdbcType=INTEGER}, 85 product_id = #{productId,jdbcType=INTEGER},
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 <select id="selectByProductIdList" resultMap="BaseResultMap" timeout="20000"> 106 <select id="selectByProductIdList" resultMap="BaseResultMap" timeout="20000">
107 select 107 select
108 <include refid="Base_Column_List"/> 108 <include refid="Base_Column_List"/>
109 - from ufo_goods 109 + from goods
110 WHERE product_id in 110 WHERE product_id in
111 <foreach item="item" index="index" collection="list" 111 <foreach item="item" index="index" collection="list"
112 open="(" separator="," close=")"> 112 open="(" separator="," close=")">
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoProductColorMapper" > 3 <mapper namespace="com.yoho.search.dal.UfoProductColorMapper" >
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoProductColor" > 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.ProductColor" >
6 <id column="id" property="id" jdbcType="SMALLINT" /> 6 <id column="id" property="id" jdbcType="SMALLINT" />
7 <result column="color_name" property="colorName" jdbcType="VARCHAR" /> 7 <result column="color_name" property="colorName" jdbcType="VARCHAR" />
8 <result column="color_code" property="colorCode" jdbcType="VARCHAR" /> 8 <result column="color_code" property="colorCode" jdbcType="VARCHAR" />
@@ -16,17 +16,17 @@ @@ -16,17 +16,17 @@
16 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Short" > 16 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Short" >
17 select 17 select
18 <include refid="Base_Column_List" /> 18 <include refid="Base_Column_List" />
19 - from ufo_product_color 19 + from product_color
20 where id = #{id,jdbcType=INTEGER} 20 where id = #{id,jdbcType=INTEGER}
21 </select> 21 </select>
22 22
23 <delete id="deleteByPrimaryKey" parameterType="java.lang.Short" > 23 <delete id="deleteByPrimaryKey" parameterType="java.lang.Short" >
24 - delete from ufo_product_color 24 + delete from product_color
25 where id = #{id,jdbcType=INTEGER} 25 where id = #{id,jdbcType=INTEGER}
26 </delete> 26 </delete>
27 27
28 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoProductColor" >  
29 - insert into ufo_product_color 28 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.ProductColor" >
  29 + insert into product_color
30 <trim prefix="(" suffix=")" suffixOverrides="," > 30 <trim prefix="(" suffix=")" suffixOverrides="," >
31 <if test="id != null" > 31 <if test="id != null" >
32 id, 32 id,
@@ -57,8 +57,8 @@ @@ -57,8 +57,8 @@
57 </trim> 57 </trim>
58 </insert> 58 </insert>
59 59
60 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoProductColor" >  
61 - update ufo_product_color 60 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.ProductColor" >
  61 + update product_color
62 <set > 62 <set >
63 <if test="colorName != null" > 63 <if test="colorName != null" >
64 color_name = #{colorName,jdbcType=VARCHAR}, 64 color_name = #{colorName,jdbcType=VARCHAR},
@@ -75,13 +75,13 @@ @@ -75,13 +75,13 @@
75 75
76 76
77 <select id="selectCount" resultType="java.lang.Integer" timeout="20000"> 77 <select id="selectCount" resultType="java.lang.Integer" timeout="20000">
78 - select count(*) from ufo_product_color 78 + select count(*) from product_color
79 </select> 79 </select>
80 80
81 <select id="selectPageList" resultMap="BaseResultMap" timeout="20000"> 81 <select id="selectPageList" resultMap="BaseResultMap" timeout="20000">
82 select 82 select
83 <include refid="Base_Column_List"/> 83 <include refid="Base_Column_List"/>
84 - from ufo_product_color limit #{offset},#{pageSize} 84 + from product_color limit #{offset},#{pageSize}
85 </select> 85 </select>
86 86
87 </mapper> 87 </mapper>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoProductMapper"> 3 <mapper namespace="com.yoho.search.dal.UfoProductMapper">
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoProduct"> 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.product.Product">
6 <id column="id" property="id" jdbcType="INTEGER"/> 6 <id column="id" property="id" jdbcType="INTEGER"/>
7 <result column="product_name" property="productName" jdbcType="VARCHAR"/> 7 <result column="product_name" property="productName" jdbcType="VARCHAR"/>
8 <result column="product_code" property="productCode" jdbcType="VARCHAR"/> 8 <result column="product_code" property="productCode" jdbcType="VARCHAR"/>
@@ -32,17 +32,17 @@ @@ -32,17 +32,17 @@
32 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer"> 32 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
33 select 33 select
34 <include refid="Base_Column_List"/> 34 <include refid="Base_Column_List"/>
35 - from ufo_product 35 + from product
36 where id = #{id,jdbcType=INTEGER} 36 where id = #{id,jdbcType=INTEGER}
37 </select> 37 </select>
38 38
39 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> 39 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
40 - delete from ufo_product 40 + delete from product
41 where id = #{id,jdbcType=INTEGER} 41 where id = #{id,jdbcType=INTEGER}
42 </delete> 42 </delete>
43 43
44 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoProduct" >  
45 - insert into ufo_product 44 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.product.Product" >
  45 + insert into product
46 <trim prefix="(" suffix=")" suffixOverrides="," > 46 <trim prefix="(" suffix=")" suffixOverrides="," >
47 <if test="id != null" > 47 <if test="id != null" >
48 id, 48 id,
@@ -157,8 +157,8 @@ @@ -157,8 +157,8 @@
157 </trim> 157 </trim>
158 </insert> 158 </insert>
159 159
160 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoProduct">  
161 - update ufo_product 160 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.product.Product">
  161 + update product
162 <set> 162 <set>
163 <if test="productName != null"> 163 <if test="productName != null">
164 product_name = #{productName,jdbcType=VARCHAR}, 164 product_name = #{productName,jdbcType=VARCHAR},
@@ -216,19 +216,19 @@ @@ -216,19 +216,19 @@
216 </update> 216 </update>
217 217
218 <select id="selectCount" resultType="java.lang.Integer" timeout="20000"> 218 <select id="selectCount" resultType="java.lang.Integer" timeout="20000">
219 - select count(*) from ufo_product 219 + select count(*) from product
220 </select> 220 </select>
221 221
222 <select id="selectPageLists" resultMap="BaseResultMap" timeout="20000"> 222 <select id="selectPageLists" resultMap="BaseResultMap" timeout="20000">
223 select 223 select
224 <include refid="Base_Column_List"/> 224 <include refid="Base_Column_List"/>
225 - from ufo_product limit #{offset},#{pageSize} 225 + from product limit #{offset},#{pageSize}
226 </select> 226 </select>
227 227
228 <select id="selectByIdList" resultMap="BaseResultMap" timeout="20000"> 228 <select id="selectByIdList" resultMap="BaseResultMap" timeout="20000">
229 select 229 select
230 <include refid="Base_Column_List"/> 230 <include refid="Base_Column_List"/>
231 - from ufo_product 231 + from product
232 WHERE 232 WHERE
233 id in 233 id in
234 <foreach item="item" index="index" collection="list" 234 <foreach item="item" index="index" collection="list"
@@ -240,7 +240,7 @@ @@ -240,7 +240,7 @@
240 <select id="selectByBrandId" resultMap="BaseResultMap" timeout="20000"> 240 <select id="selectByBrandId" resultMap="BaseResultMap" timeout="20000">
241 select 241 select
242 <include refid="Base_Column_List"/> 242 <include refid="Base_Column_List"/>
243 - from ufo_product 243 + from product
244 where brand_id = #{brandId,jdbcType=INTEGER} 244 where brand_id = #{brandId,jdbcType=INTEGER}
245 </select> 245 </select>
246 </mapper> 246 </mapper>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoProductPoolDetailMapper"> 3 <mapper namespace="com.yoho.search.dal.UfoProductPoolDetailMapper">
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoProductPoolDetail"> 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.ProductPoolDetail">
6 <id column="id" property="id" jdbcType="INTEGER"/> 6 <id column="id" property="id" jdbcType="INTEGER"/>
7 <result column="pool_id" property="poolId" jdbcType="INTEGER"/> 7 <result column="pool_id" property="poolId" jdbcType="INTEGER"/>
8 <result column="product_id" property="productId" jdbcType="INTEGER"/> 8 <result column="product_id" property="productId" jdbcType="INTEGER"/>
@@ -17,17 +17,17 @@ @@ -17,17 +17,17 @@
17 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer"> 17 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
18 select 18 select
19 <include refid="Base_Column_List"/> 19 <include refid="Base_Column_List"/>
20 - from ufo_product_pool_detail 20 + from product_pool_detail
21 where id = #{id,jdbcType=INTEGER} 21 where id = #{id,jdbcType=INTEGER}
22 </select> 22 </select>
23 23
24 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> 24 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
25 - delete from ufo_product_pool_detail 25 + delete from product_pool_detail
26 where id = #{id,jdbcType=INTEGER} 26 where id = #{id,jdbcType=INTEGER}
27 </delete> 27 </delete>
28 28
29 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoProductPoolDetail" >  
30 - insert into ufo_product_pool_detail 29 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.ProductPoolDetail" >
  30 + insert into product_pool_detail
31 <trim prefix="(" suffix=")" suffixOverrides="," > 31 <trim prefix="(" suffix=")" suffixOverrides="," >
32 <if test="id != null" > 32 <if test="id != null" >
33 id, 33 id,
@@ -64,8 +64,8 @@ @@ -64,8 +64,8 @@
64 </trim> 64 </trim>
65 </insert> 65 </insert>
66 66
67 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoProductPoolDetail">  
68 - update ufo_product_pool_detail 67 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.ProductPoolDetail">
  68 + update product_pool_detail
69 <set> 69 <set>
70 <if test="poolId != null"> 70 <if test="poolId != null">
71 pool_id = #{poolId,jdbcType=INTEGER}, 71 pool_id = #{poolId,jdbcType=INTEGER},
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 <select id="selectByProductId" resultMap="BaseResultMap" timeout="20000"> 86 <select id="selectByProductId" resultMap="BaseResultMap" timeout="20000">
87 select 87 select
88 <include refid="Base_Column_List"/> 88 <include refid="Base_Column_List"/>
89 - from ufo_product_pool_detail 89 + from product_pool_detail
90 WHERE product_id = #{productId,jdbcType=INTEGER} 90 WHERE product_id = #{productId,jdbcType=INTEGER}
91 </select> 91 </select>
92 92
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoProductPoolMapper" > 3 <mapper namespace="com.yoho.search.dal.UfoProductPoolMapper" >
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoProductPool" > 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.ProductPool" >
6 <id column="id" property="id" jdbcType="INTEGER" /> 6 <id column="id" property="id" jdbcType="INTEGER" />
7 <result column="pool_name" property="poolName" jdbcType="VARCHAR" /> 7 <result column="pool_name" property="poolName" jdbcType="VARCHAR" />
8 <result column="create_time" property="createTime" jdbcType="INTEGER" /> 8 <result column="create_time" property="createTime" jdbcType="INTEGER" />
@@ -15,17 +15,17 @@ @@ -15,17 +15,17 @@
15 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > 15 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
16 select 16 select
17 <include refid="Base_Column_List" /> 17 <include refid="Base_Column_List" />
18 - from ufo_product_pool 18 + from product_pool
19 where id = #{id,jdbcType=INTEGER} 19 where id = #{id,jdbcType=INTEGER}
20 </select> 20 </select>
21 21
22 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" > 22 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
23 - delete from ufo_product_pool 23 + delete from product_pool
24 where id = #{id,jdbcType=INTEGER} 24 where id = #{id,jdbcType=INTEGER}
25 </delete> 25 </delete>
26 26
27 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoProductPool" >  
28 - insert into ufo_product_pool 27 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.ProductPool" >
  28 + insert into product_pool
29 <trim prefix="(" suffix=")" suffixOverrides="," > 29 <trim prefix="(" suffix=")" suffixOverrides="," >
30 <if test="id != null" > 30 <if test="id != null" >
31 id, 31 id,
@@ -50,8 +50,8 @@ @@ -50,8 +50,8 @@
50 </trim> 50 </trim>
51 </insert> 51 </insert>
52 52
53 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoProductPool" >  
54 - update ufo_product_pool 53 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.ProductPool" >
  54 + update product_pool
55 <set > 55 <set >
56 <if test="poolName != null" > 56 <if test="poolName != null" >
57 pool_name = #{poolName,jdbcType=VARCHAR}, 57 pool_name = #{poolName,jdbcType=VARCHAR},
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoProductSortMapper"> 3 <mapper namespace="com.yoho.search.dal.UfoProductSortMapper">
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoProductSort" > 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.ProductSort" >
6 <id column="id" property="id" jdbcType="SMALLINT" /> 6 <id column="id" property="id" jdbcType="SMALLINT" />
7 <result column="sort_name" property="sortName" jdbcType="VARCHAR" /> 7 <result column="sort_name" property="sortName" jdbcType="VARCHAR" />
8 <result column="level" property="level" jdbcType="SMALLINT" /> 8 <result column="level" property="level" jdbcType="SMALLINT" />
@@ -18,17 +18,17 @@ @@ -18,17 +18,17 @@
18 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Short"> 18 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Short">
19 select 19 select
20 <include refid="Base_Column_List"/> 20 <include refid="Base_Column_List"/>
21 - from ufo_product_sort 21 + from product_sort
22 where id = #{id,jdbcType=INTEGER} 22 where id = #{id,jdbcType=INTEGER}
23 </select> 23 </select>
24 24
25 <delete id="deleteByPrimaryKey" parameterType="java.lang.Short"> 25 <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
26 - delete from ufo_product_sort 26 + delete from product_sort
27 where id = #{id,jdbcType=SMALLINT} 27 where id = #{id,jdbcType=SMALLINT}
28 </delete> 28 </delete>
29 29
30 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoProductSort" >  
31 - insert into ufo_product_sort 30 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.ProductSort" >
  31 + insert into product_sort
32 <trim prefix="(" suffix=")" suffixOverrides="," > 32 <trim prefix="(" suffix=")" suffixOverrides="," >
33 <if test="id != null" > 33 <if test="id != null" >
34 id, 34 id,
@@ -71,8 +71,8 @@ @@ -71,8 +71,8 @@
71 </trim> 71 </trim>
72 </insert> 72 </insert>
73 73
74 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoProductSort" >  
75 - update ufo_product_sort 74 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.ProductSort" >
  75 + update product_sort
76 <set > 76 <set >
77 <if test="sortName != null" > 77 <if test="sortName != null" >
78 sort_name = #{sortName,jdbcType=VARCHAR}, 78 sort_name = #{sortName,jdbcType=VARCHAR},
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 <select id="selectByIdList" resultMap="BaseResultMap" timeout="20000"> 96 <select id="selectByIdList" resultMap="BaseResultMap" timeout="20000">
97 select 97 select
98 <include refid="Base_Column_List"/> 98 <include refid="Base_Column_List"/>
99 - from ufo_product_sort 99 + from product_sort
100 WHERE id in 100 WHERE id in
101 <foreach item="item" index="index" collection="list" 101 <foreach item="item" index="index" collection="list"
102 open="(" separator="," close=")"> 102 open="(" separator="," close=")">
@@ -105,13 +105,13 @@ @@ -105,13 +105,13 @@
105 </select> 105 </select>
106 106
107 <select id="selectCount" resultType="java.lang.Integer" timeout="20000"> 107 <select id="selectCount" resultType="java.lang.Integer" timeout="20000">
108 - select count(*) from ufo_product_sort 108 + select count(*) from product_sort
109 </select> 109 </select>
110 110
111 <select id="selectPageList" resultMap="BaseResultMap" timeout="20000"> 111 <select id="selectPageList" resultMap="BaseResultMap" timeout="20000">
112 select 112 select
113 <include refid="Base_Column_List"/> 113 <include refid="Base_Column_List"/>
114 - from ufo_product_sort limit #{offset},#{pageSize} 114 + from product_sort limit #{offset},#{pageSize}
115 </select> 115 </select>
116 116
117 </mapper> 117 </mapper>
1 <?xml version="1.0" encoding="UTF-8" ?> 1 <?xml version="1.0" encoding="UTF-8" ?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoScoreProductRuleMapper"> 3 <mapper namespace="com.yoho.search.dal.UfoScoreProductRuleMapper">
4 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoScoreProductRule"> 4 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.ScoreProductRule">
5 <id column="id" property="id" jdbcType="INTEGER"/> 5 <id column="id" property="id" jdbcType="INTEGER"/>
6 <result column="product_id" property="productId" jdbcType="INTEGER"/> 6 <result column="product_id" property="productId" jdbcType="INTEGER"/>
7 <result column="update_time" property="updateTime" jdbcType="INTEGER"/> 7 <result column="update_time" property="updateTime" jdbcType="INTEGER"/>
@@ -13,21 +13,21 @@ @@ -13,21 +13,21 @@
13 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer"> 13 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
14 select 14 select
15 <include refid="Base_Column_List"/> 15 <include refid="Base_Column_List"/>
16 - from ufo_score_product_rule 16 + from score_product_rule
17 where id = #{id,jdbcType=INTEGER} 17 where id = #{id,jdbcType=INTEGER}
18 </select> 18 </select>
19 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> 19 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
20 - delete from ufo_score_product_rule 20 + delete from score_product_rule
21 where id = #{id,jdbcType=INTEGER} 21 where id = #{id,jdbcType=INTEGER}
22 </delete> 22 </delete>
23 - <insert id="insert" parameterType="com.yoho.search.dal.model.UfoScoreProductRule">  
24 - insert into ufo_score_product_rule (id, product_id, update_time, 23 + <insert id="insert" parameterType="com.yoho.search.dal.model.ufo_product.ScoreProductRule">
  24 + insert into score_product_rule (id, product_id, update_time,
25 create_time) 25 create_time)
26 values (#{id,jdbcType=INTEGER}, #{productId,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER}, 26 values (#{id,jdbcType=INTEGER}, #{productId,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER},
27 #{createTime,jdbcType=INTEGER}) 27 #{createTime,jdbcType=INTEGER})
28 </insert> 28 </insert>
29 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoScoreProductRule">  
30 - insert into ufo_score_product_rule 29 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.ScoreProductRule">
  30 + insert into score_product_rule
31 <trim prefix="(" suffix=")" suffixOverrides=","> 31 <trim prefix="(" suffix=")" suffixOverrides=",">
32 <if test="id != null"> 32 <if test="id != null">
33 id, 33 id,
@@ -57,8 +57,8 @@ @@ -57,8 +57,8 @@
57 </if> 57 </if>
58 </trim> 58 </trim>
59 </insert> 59 </insert>
60 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoScoreProductRule">  
61 - update ufo_score_product_rule 60 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.ScoreProductRule">
  61 + update score_product_rule
62 <set> 62 <set>
63 <if test="productId != null"> 63 <if test="productId != null">
64 product_id = #{productId,jdbcType=INTEGER}, 64 product_id = #{productId,jdbcType=INTEGER},
@@ -72,8 +72,8 @@ @@ -72,8 +72,8 @@
72 </set> 72 </set>
73 where id = #{id,jdbcType=INTEGER} 73 where id = #{id,jdbcType=INTEGER}
74 </update> 74 </update>
75 - <update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.UfoScoreProductRule">  
76 - update ufo_score_product_rule 75 + <update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.ufo_product.ScoreProductRule">
  76 + update score_product_rule
77 set product_id = #{productId,jdbcType=INTEGER}, 77 set product_id = #{productId,jdbcType=INTEGER},
78 update_time = #{updateTime,jdbcType=INTEGER}, 78 update_time = #{updateTime,jdbcType=INTEGER},
79 create_time = #{createTime,jdbcType=INTEGER} 79 create_time = #{createTime,jdbcType=INTEGER}
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 </update> 81 </update>
82 <select id="selectByIdList" resultType="java.lang.Integer"> 82 <select id="selectByIdList" resultType="java.lang.Integer">
83 select product_id 83 select product_id
84 - from ufo_score_product_rule 84 + from score_product_rule
85 where product_id in 85 where product_id in
86 <foreach item="item" collection="idList" open="(" separator="," close=")"> 86 <foreach item="item" collection="idList" open="(" separator="," close=")">
87 #{item} 87 #{item}
1 <?xml version="1.0" encoding="UTF-8" ?> 1 <?xml version="1.0" encoding="UTF-8" ?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoSearchSortRelationMapper"> 3 <mapper namespace="com.yoho.search.dal.UfoSearchSortRelationMapper">
4 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoSearchSortRelation"> 4 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.SearchSortRelation">
5 <id column="ufo_sort_id" property="ufoSortId" jdbcType="INTEGER"/> 5 <id column="ufo_sort_id" property="ufoSortId" jdbcType="INTEGER"/>
6 <result column="yoho_sort_id" property="yohoSortId" jdbcType="INTEGER"/> 6 <result column="yoho_sort_id" property="yohoSortId" jdbcType="INTEGER"/>
7 <result column="yoho_small_sort_id" property="yohoSmallSortId" jdbcType="INTEGER"/> 7 <result column="yoho_small_sort_id" property="yohoSmallSortId" jdbcType="INTEGER"/>
@@ -14,24 +14,24 @@ @@ -14,24 +14,24 @@
14 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer"> 14 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
15 select 15 select
16 <include refid="Base_Column_List"/> 16 <include refid="Base_Column_List"/>
17 - from ufo_search_sort_relation 17 + from search_sort_relation
18 where ufo_sort_id = #{ufoSortId,jdbcType=INTEGER} 18 where ufo_sort_id = #{ufoSortId,jdbcType=INTEGER}
19 </select> 19 </select>
20 20
21 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> 21 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
22 - delete from ufo_search_sort_relation 22 + delete from search_sort_relation
23 where ufo_sort_id = #{ufoSortId,jdbcType=INTEGER} 23 where ufo_sort_id = #{ufoSortId,jdbcType=INTEGER}
24 </delete> 24 </delete>
25 25
26 - <insert id="insert" parameterType="com.yoho.search.dal.model.UfoSearchSortRelation">  
27 - insert into ufo_search_sort_relation (ufo_sort_id, yoho_sort_id, yoho_small_sort_id 26 + <insert id="insert" parameterType="com.yoho.search.dal.model.ufo_product.SearchSortRelation">
  27 + insert into search_sort_relation (ufo_sort_id, yoho_sort_id, yoho_small_sort_id
28 ) 28 )
29 values (#{ufoSortId,jdbcType=INTEGER}, #{yohoSortId,jdbcType=INTEGER}, #{yohoSmallSortId,jdbcType=INTEGER} 29 values (#{ufoSortId,jdbcType=INTEGER}, #{yohoSortId,jdbcType=INTEGER}, #{yohoSmallSortId,jdbcType=INTEGER}
30 ) 30 )
31 </insert> 31 </insert>
32 32
33 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoSearchSortRelation" >  
34 - insert into ufo_search_sort_relation 33 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.SearchSortRelation" >
  34 + insert into search_sort_relation
35 <trim prefix="(" suffix=")" suffixOverrides="," > 35 <trim prefix="(" suffix=")" suffixOverrides="," >
36 <if test="ufoSortId != null" > 36 <if test="ufoSortId != null" >
37 ufo_sort_id, 37 ufo_sort_id,
@@ -56,8 +56,8 @@ @@ -56,8 +56,8 @@
56 </trim> 56 </trim>
57 </insert> 57 </insert>
58 58
59 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoSearchSortRelation">  
60 - update ufo_search_sort_relation 59 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.SearchSortRelation">
  60 + update search_sort_relation
61 <set> 61 <set>
62 <if test="yohoSortId != null"> 62 <if test="yohoSortId != null">
63 yoho_sort_id = #{yohoSortId,jdbcType=INTEGER}, 63 yoho_sort_id = #{yohoSortId,jdbcType=INTEGER},
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 </update> 70 </update>
71 71
72 <insert id="insertBatch" parameterType="java.util.List" timeout="20000"> 72 <insert id="insertBatch" parameterType="java.util.List" timeout="20000">
73 - insert ignore into ufo_search_sort_relation (ufo_sort_id,yoho_sort_id,yoho_small_sort_id) 73 + insert ignore into search_sort_relation (ufo_sort_id,yoho_sort_id,yoho_small_sort_id)
74 values 74 values
75 <foreach collection="list" item="item" index="index" 75 <foreach collection="list" item="item" index="index"
76 separator=","> 76 separator=",">
@@ -81,14 +81,14 @@ @@ -81,14 +81,14 @@
81 </insert> 81 </insert>
82 82
83 <delete id="deleteAll"> 83 <delete id="deleteAll">
84 - delete from ufo_search_sort_relation 84 + delete from search_sort_relation
85 where 1=1 85 where 1=1
86 </delete> 86 </delete>
87 87
88 <select id="selectAll" resultMap="BaseResultMap" timeout="20000"> 88 <select id="selectAll" resultMap="BaseResultMap" timeout="20000">
89 select 89 select
90 <include refid="Base_Column_List"/> 90 <include refid="Base_Column_List"/>
91 - from ufo_search_sort_relation 91 + from search_sort_relation
92 </select> 92 </select>
93 93
94 </mapper> 94 </mapper>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoSizeMapper"> 3 <mapper namespace="com.yoho.search.dal.UfoSizeMapper">
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoSize"> 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.Size">
6 <id column="id" property="id" jdbcType="SMALLINT"/> 6 <id column="id" property="id" jdbcType="SMALLINT"/>
7 <result column="size_name" property="sizeName" jdbcType="VARCHAR"/> 7 <result column="size_name" property="sizeName" jdbcType="VARCHAR"/>
8 <result column="sort_id" property="sortId" jdbcType="SMALLINT"/> 8 <result column="sort_id" property="sortId" jdbcType="SMALLINT"/>
@@ -16,17 +16,17 @@ @@ -16,17 +16,17 @@
16 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Short"> 16 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Short">
17 select 17 select
18 <include refid="Base_Column_List"/> 18 <include refid="Base_Column_List"/>
19 - from ufo_size 19 + from size
20 where id = #{id,jdbcType=SMALLINT} 20 where id = #{id,jdbcType=SMALLINT}
21 </select> 21 </select>
22 22
23 <delete id="deleteByPrimaryKey" parameterType="java.lang.Short"> 23 <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
24 - delete from ufo_size 24 + delete from size
25 where id = #{id,jdbcType=SMALLINT} 25 where id = #{id,jdbcType=SMALLINT}
26 </delete> 26 </delete>
27 27
28 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoSize" >  
29 - insert into ufo_size 28 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.Size" >
  29 + insert into size
30 <trim prefix="(" suffix=")" suffixOverrides="," > 30 <trim prefix="(" suffix=")" suffixOverrides="," >
31 <if test="id != null" > 31 <if test="id != null" >
32 id, 32 id,
@@ -57,8 +57,8 @@ @@ -57,8 +57,8 @@
57 </trim> 57 </trim>
58 </insert> 58 </insert>
59 59
60 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoSize">  
61 - update ufo_size 60 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.Size">
  61 + update size
62 <set> 62 <set>
63 <if test="sizeName != null"> 63 <if test="sizeName != null">
64 size_name = #{sizeName,jdbcType=VARCHAR}, 64 size_name = #{sizeName,jdbcType=VARCHAR},
@@ -74,12 +74,12 @@ @@ -74,12 +74,12 @@
74 </update> 74 </update>
75 75
76 <select id="selectCount" resultType="java.lang.Integer" timeout="20000"> 76 <select id="selectCount" resultType="java.lang.Integer" timeout="20000">
77 - select count(*) from ufo_size 77 + select count(*) from size
78 </select> 78 </select>
79 79
80 <select id="selectPageList" resultMap="BaseResultMap" timeout="20000"> 80 <select id="selectPageList" resultMap="BaseResultMap" timeout="20000">
81 select 81 select
82 <include refid="Base_Column_List"/> 82 <include refid="Base_Column_List"/>
83 - from ufo_size limit #{offset},#{pageSize} 83 + from size limit #{offset},#{pageSize}
84 </select> 84 </select>
85 </mapper> 85 </mapper>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoStorageMapper" > 3 <mapper namespace="com.yoho.search.dal.UfoStorageMapper" >
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoStorage" > 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.Storage" >
6 <id column="id" property="id" jdbcType="INTEGER" /> 6 <id column="id" property="id" jdbcType="INTEGER" />
7 <result column="product_id" property="productId" jdbcType="INTEGER" /> 7 <result column="product_id" property="productId" jdbcType="INTEGER" />
8 <result column="goods_id" property="goodsId" jdbcType="INTEGER" /> 8 <result column="goods_id" property="goodsId" jdbcType="INTEGER" />
@@ -20,17 +20,17 @@ @@ -20,17 +20,17 @@
20 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > 20 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
21 select 21 select
22 <include refid="Base_Column_List" /> 22 <include refid="Base_Column_List" />
23 - from ufo_storage 23 + from storage
24 where id = #{id,jdbcType=INTEGER} 24 where id = #{id,jdbcType=INTEGER}
25 </select> 25 </select>
26 26
27 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" > 27 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
28 - delete from ufo_storage 28 + delete from storage
29 where id = #{id,jdbcType=INTEGER} 29 where id = #{id,jdbcType=INTEGER}
30 </delete> 30 </delete>
31 31
32 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoStorage" >  
33 - insert into ufo_storage 32 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.Storage" >
  33 + insert into storage
34 <trim prefix="(" suffix=")" suffixOverrides="," > 34 <trim prefix="(" suffix=")" suffixOverrides="," >
35 <if test="id != null" > 35 <if test="id != null" >
36 id, 36 id,
@@ -79,8 +79,8 @@ @@ -79,8 +79,8 @@
79 </trim> 79 </trim>
80 </insert> 80 </insert>
81 81
82 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoStorage" >  
83 - update ufo_storage 82 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.Storage" >
  83 + update storage
84 <set > 84 <set >
85 <if test="productId != null" > 85 <if test="productId != null" >
86 product_id = #{productId,jdbcType=INTEGER}, 86 product_id = #{productId,jdbcType=INTEGER},
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 <select id="selectByProductIdList" resultMap="BaseResultMap" timeout="20000"> 107 <select id="selectByProductIdList" resultMap="BaseResultMap" timeout="20000">
108 select 108 select
109 <include refid="Base_Column_List"/> 109 <include refid="Base_Column_List"/>
110 - from ufo_storage 110 + from storage
111 WHERE product_id in 111 WHERE product_id in
112 <foreach item="item" index="index" collection="list" 112 <foreach item="item" index="index" collection="list"
113 open="(" separator="," close=")"> 113 open="(" separator="," close=")">
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 <mapper namespace="com.yoho.search.dal.UfoStoragePriceMapper"> 3 <mapper namespace="com.yoho.search.dal.UfoStoragePriceMapper">
4 4
5 - <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.UfoStoragePrice"> 5 + <resultMap id="BaseResultMap" type="com.yoho.search.dal.model.ufo_product.StoragePrice">
6 <id column="id" property="id" jdbcType="INTEGER"/> 6 <id column="id" property="id" jdbcType="INTEGER"/>
7 <result column="product_id" property="productId" jdbcType="INTEGER"/> 7 <result column="product_id" property="productId" jdbcType="INTEGER"/>
8 <result column="skup" property="skup" jdbcType="INTEGER"/> 8 <result column="skup" property="skup" jdbcType="INTEGER"/>
@@ -24,17 +24,17 @@ @@ -24,17 +24,17 @@
24 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer"> 24 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
25 select 25 select
26 <include refid="Base_Column_List"/> 26 <include refid="Base_Column_List"/>
27 - from ufo_storage_price 27 + from storage_price
28 where id = #{id,jdbcType=INTEGER} 28 where id = #{id,jdbcType=INTEGER}
29 </select> 29 </select>
30 30
31 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> 31 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
32 - delete from ufo_storage_price 32 + delete from storage_price
33 where id = #{id,jdbcType=INTEGER} 33 where id = #{id,jdbcType=INTEGER}
34 </delete> 34 </delete>
35 35
36 - <insert id="insertSelective" parameterType="com.yoho.search.dal.model.UfoStoragePrice" >  
37 - insert into ufo_storage_price 36 + <insert id="insertSelective" parameterType="com.yoho.search.dal.model.ufo_product.StoragePrice" >
  37 + insert into storage_price
38 <trim prefix="(" suffix=")" suffixOverrides="," > 38 <trim prefix="(" suffix=")" suffixOverrides="," >
39 <if test="id != null" > 39 <if test="id != null" >
40 id, 40 id,
@@ -107,8 +107,8 @@ @@ -107,8 +107,8 @@
107 </trim> 107 </trim>
108 </insert> 108 </insert>
109 109
110 - <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.UfoStoragePrice">  
111 - update ufo_storage_price 110 + <update id="updateByPrimaryKeySelective" parameterType="com.yoho.search.dal.model.ufo_product.StoragePrice">
  111 + update storage_price
112 <set> 112 <set>
113 <if test="skup != null"> 113 <if test="skup != null">
114 skup = #{skup,jdbcType=INTEGER}, 114 skup = #{skup,jdbcType=INTEGER},
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
147 <select id="selectByProductIdList" resultMap="BaseResultMap" timeout="20000"> 147 <select id="selectByProductIdList" resultMap="BaseResultMap" timeout="20000">
148 select 148 select
149 <include refid="Base_Column_List"/> 149 <include refid="Base_Column_List"/>
150 - from ufo_storage_price 150 + from storage_price
151 where 151 where
152 product_id in 152 product_id in
153 <foreach item="item" index="index" collection="list" 153 <foreach item="item" index="index" collection="list"
@@ -2,7 +2,7 @@ package com.yoho.search.consumer.index.fullbuild.ufo; @@ -2,7 +2,7 @@ package com.yoho.search.consumer.index.fullbuild.ufo;
2 2
3 import com.yoho.search.consumer.index.fullbuild.IIndexBuilder; 3 import com.yoho.search.consumer.index.fullbuild.IIndexBuilder;
4 import com.yoho.search.dal.UfoBrandMapper; 4 import com.yoho.search.dal.UfoBrandMapper;
5 -import com.yoho.search.dal.model.UfoBrand; 5 +import com.yoho.search.dal.model.ufo_product.Brand;
6 import org.apache.commons.collections.CollectionUtils; 6 import org.apache.commons.collections.CollectionUtils;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
@@ -27,15 +27,15 @@ public class UfoBrandIndexBuilder extends IIndexBuilder { @@ -27,15 +27,15 @@ public class UfoBrandIndexBuilder extends IIndexBuilder {
27 27
28 @Override 28 @Override
29 public List<?> getPageLists(int offset, int limit) throws Exception { 29 public List<?> getPageLists(int offset, int limit) throws Exception {
30 - List<UfoBrand> ufoBrandList = ufoBrandMapper.selectPageList(offset, limit);  
31 - if (CollectionUtils.isEmpty(ufoBrandList)) { 30 + List<Brand> brandList = ufoBrandMapper.selectPageList(offset, limit);
  31 + if (CollectionUtils.isEmpty(brandList)) {
32 return new ArrayList<>(0); 32 return new ArrayList<>(0);
33 } 33 }
34 - return ufoBrandList; 34 + return brandList;
35 } 35 }
36 36
37 @Override 37 @Override
38 public String getId(Object object) { 38 public String getId(Object object) {
39 - return ((UfoBrand) object).getId().toString(); 39 + return ((Brand) object).getId().toString();
40 } 40 }
41 } 41 }
@@ -2,7 +2,7 @@ package com.yoho.search.consumer.index.fullbuild.ufo; @@ -2,7 +2,7 @@ package com.yoho.search.consumer.index.fullbuild.ufo;
2 2
3 import com.yoho.search.consumer.index.fullbuild.IIndexBuilder; 3 import com.yoho.search.consumer.index.fullbuild.IIndexBuilder;
4 import com.yoho.search.dal.UfoProductColorMapper; 4 import com.yoho.search.dal.UfoProductColorMapper;
5 -import com.yoho.search.dal.model.UfoProductColor; 5 +import com.yoho.search.dal.model.ufo_product.ProductColor;
6 import org.apache.commons.collections.CollectionUtils; 6 import org.apache.commons.collections.CollectionUtils;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
@@ -27,15 +27,15 @@ public class UfoColorIndexBuilder extends IIndexBuilder { @@ -27,15 +27,15 @@ public class UfoColorIndexBuilder extends IIndexBuilder {
27 27
28 @Override 28 @Override
29 public List<?> getPageLists(int offset, int limit) throws Exception { 29 public List<?> getPageLists(int offset, int limit) throws Exception {
30 - List<UfoProductColor> ufoProductColorList = ufoProductColorMapper.selectPageList(offset, limit);  
31 - if (CollectionUtils.isEmpty(ufoProductColorList)) { 30 + List<ProductColor> productColorList = ufoProductColorMapper.selectPageList(offset, limit);
  31 + if (CollectionUtils.isEmpty(productColorList)) {
32 return new ArrayList<>(0); 32 return new ArrayList<>(0);
33 } 33 }
34 - return ufoProductColorList; 34 + return productColorList;
35 } 35 }
36 36
37 @Override 37 @Override
38 public String getId(Object object) { 38 public String getId(Object object) {
39 - return ((UfoProductColor) object).getId().toString(); 39 + return ((ProductColor) object).getId().toString();
40 } 40 }
41 } 41 }
@@ -4,7 +4,7 @@ import com.yoho.search.consumer.index.fullbuild.IIndexBuilder; @@ -4,7 +4,7 @@ import com.yoho.search.consumer.index.fullbuild.IIndexBuilder;
4 import com.yoho.search.consumer.service.bo.UfoProductIndexBO; 4 import com.yoho.search.consumer.service.bo.UfoProductIndexBO;
5 import com.yoho.search.consumer.service.logicService.ufo.UfoIndexFieldBuilder; 5 import com.yoho.search.consumer.service.logicService.ufo.UfoIndexFieldBuilder;
6 import com.yoho.search.dal.UfoProductMapper; 6 import com.yoho.search.dal.UfoProductMapper;
7 -import com.yoho.search.dal.model.UfoProduct; 7 +import com.yoho.search.dal.model.ufo_product.Product;
8 import org.apache.commons.collections.CollectionUtils; 8 import org.apache.commons.collections.CollectionUtils;
9 import org.springframework.beans.BeanUtils; 9 import org.springframework.beans.BeanUtils;
10 import org.springframework.beans.BeansException; 10 import org.springframework.beans.BeansException;
@@ -51,20 +51,20 @@ public class UfoProductIndexBuilder extends IIndexBuilder implements Application @@ -51,20 +51,20 @@ public class UfoProductIndexBuilder extends IIndexBuilder implements Application
51 */ 51 */
52 @Override 52 @Override
53 public List<?> getPageLists(int offset, int limit) throws Exception { 53 public List<?> getPageLists(int offset, int limit) throws Exception {
54 - List<UfoProduct> ufoProductList = ufoProductMapper.selectPageLists(offset, limit);  
55 - return buildUfoProductIndexBOList(ufoProductList); 54 + List<Product> productList = ufoProductMapper.selectPageLists(offset, limit);
  55 + return buildUfoProductIndexBOList(productList);
56 } 56 }
57 57
58 /** 58 /**
59 * 增量 59 * 增量
60 */ 60 */
61 public UfoProductIndexBO buildUfoProductIndexBOIncrease(Integer id) { 61 public UfoProductIndexBO buildUfoProductIndexBOIncrease(Integer id) {
62 - UfoProduct ufoProduct = ufoProductMapper.selectByPrimaryKey(id);  
63 - if (ufoProduct == null) { 62 + Product product = ufoProductMapper.selectByPrimaryKey(id);
  63 + if (product == null) {
64 return null; 64 return null;
65 } 65 }
66 - List<UfoProduct> ufoProductList = Arrays.asList(ufoProduct);  
67 - List<UfoProductIndexBO> ufoProductIndexBOList = buildUfoProductIndexBOList(ufoProductList); 66 + List<Product> productList = Arrays.asList(product);
  67 + List<UfoProductIndexBO> ufoProductIndexBOList = buildUfoProductIndexBOList(productList);
68 if (CollectionUtils.isEmpty(ufoProductIndexBOList)) { 68 if (CollectionUtils.isEmpty(ufoProductIndexBOList)) {
69 return null; 69 return null;
70 } 70 }
@@ -78,30 +78,30 @@ public class UfoProductIndexBuilder extends IIndexBuilder implements Application @@ -78,30 +78,30 @@ public class UfoProductIndexBuilder extends IIndexBuilder implements Application
78 /** 78 /**
79 * 构建UfoProductIndexBO列表 79 * 构建UfoProductIndexBO列表
80 */ 80 */
81 - private List<UfoProductIndexBO> buildUfoProductIndexBOList(List<UfoProduct> ufoProductList) { 81 + private List<UfoProductIndexBO> buildUfoProductIndexBOList(List<Product> productList) {
82 List<UfoProductIndexBO> ufoProductIndexBOList = new ArrayList<>(); 82 List<UfoProductIndexBO> ufoProductIndexBOList = new ArrayList<>();
83 - for (UfoProduct ufoProduct : ufoProductList) { 83 + for (Product product : productList) {
84 UfoProductIndexBO ufoProductIndexBO = new UfoProductIndexBO(); 84 UfoProductIndexBO ufoProductIndexBO = new UfoProductIndexBO();
85 - BeanUtils.copyProperties(ufoProduct, ufoProductIndexBO);  
86 - this.buildSimpleField(ufoProduct, ufoProductIndexBO); 85 + BeanUtils.copyProperties(product, ufoProductIndexBO);
  86 + this.buildSimpleField(product, ufoProductIndexBO);
87 ufoProductIndexBOList.add(ufoProductIndexBO); 87 ufoProductIndexBOList.add(ufoProductIndexBO);
88 } 88 }
89 - List<Integer> idList = ufoProductList.stream().map(UfoProduct::getId).collect(Collectors.toList()); 89 + List<Integer> idList = productList.stream().map(Product::getId).collect(Collectors.toList());
90 //调用每个builder构建UfoProductIndexBO的各种属性数据 90 //调用每个builder构建UfoProductIndexBO的各种属性数据
91 indexFieldBuilderList.stream().forEach(builder -> builder.build(ufoProductIndexBOList, idList)); 91 indexFieldBuilderList.stream().forEach(builder -> builder.build(ufoProductIndexBOList, idList));
92 return ufoProductIndexBOList; 92 return ufoProductIndexBOList;
93 } 93 }
94 94
95 - private void buildSimpleField(UfoProduct ufoProduct, UfoProductIndexBO ufoProductIndexBO) {  
96 - ufoProductIndexBO.setIdString(ufoProduct.getId().toString()); 95 + private void buildSimpleField(Product product, UfoProductIndexBO ufoProductIndexBO) {
  96 + ufoProductIndexBO.setIdString(product.getId().toString());
97 ufoProductIndexBO.setGenderS("男,女"); 97 ufoProductIndexBO.setGenderS("男,女");
98 - if (ufoProduct.getGender() == null) { 98 + if (product.getGender() == null) {
99 return; 99 return;
100 } 100 }
101 - if ("1".equals(ufoProduct.getGender())) { 101 + if ("1".equals(product.getGender())) {
102 ufoProductIndexBO.setGenderS("男"); 102 ufoProductIndexBO.setGenderS("男");
103 } 103 }
104 - if ("2".equals(ufoProduct.getGender())) { 104 + if ("2".equals(product.getGender())) {
105 ufoProductIndexBO.setGenderS("女"); 105 ufoProductIndexBO.setGenderS("女");
106 } 106 }
107 } 107 }
@@ -2,7 +2,7 @@ package com.yoho.search.consumer.index.fullbuild.ufo; @@ -2,7 +2,7 @@ package com.yoho.search.consumer.index.fullbuild.ufo;
2 2
3 import com.yoho.search.consumer.index.fullbuild.IIndexBuilder; 3 import com.yoho.search.consumer.index.fullbuild.IIndexBuilder;
4 import com.yoho.search.dal.UfoSizeMapper; 4 import com.yoho.search.dal.UfoSizeMapper;
5 -import com.yoho.search.dal.model.UfoSize; 5 +import com.yoho.search.dal.model.ufo_product.Size;
6 import org.apache.commons.collections.CollectionUtils; 6 import org.apache.commons.collections.CollectionUtils;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
@@ -27,15 +27,15 @@ public class UfoSizeIndexBuilder extends IIndexBuilder { @@ -27,15 +27,15 @@ public class UfoSizeIndexBuilder extends IIndexBuilder {
27 27
28 @Override 28 @Override
29 public List<?> getPageLists(int offset, int limit) throws Exception { 29 public List<?> getPageLists(int offset, int limit) throws Exception {
30 - List<UfoSize> ufoSizeList = ufoSizeMapper.selectPageList(offset, limit);  
31 - if (CollectionUtils.isEmpty(ufoSizeList)) { 30 + List<Size> sizeList = ufoSizeMapper.selectPageList(offset, limit);
  31 + if (CollectionUtils.isEmpty(sizeList)) {
32 return new ArrayList<>(0); 32 return new ArrayList<>(0);
33 } 33 }
34 - return ufoSizeList; 34 + return sizeList;
35 } 35 }
36 36
37 @Override 37 @Override
38 public String getId(Object object) { 38 public String getId(Object object) {
39 - return ((UfoSize) object).getId().toString(); 39 + return ((Size) object).getId().toString();
40 } 40 }
41 } 41 }
@@ -2,7 +2,7 @@ package com.yoho.search.consumer.index.fullbuild.ufo; @@ -2,7 +2,7 @@ package com.yoho.search.consumer.index.fullbuild.ufo;
2 2
3 import com.yoho.search.consumer.index.fullbuild.IIndexBuilder; 3 import com.yoho.search.consumer.index.fullbuild.IIndexBuilder;
4 import com.yoho.search.dal.UfoProductSortMapper; 4 import com.yoho.search.dal.UfoProductSortMapper;
5 -import com.yoho.search.dal.model.UfoProductSort; 5 +import com.yoho.search.dal.model.ufo_product.ProductSort;
6 import org.apache.commons.collections.CollectionUtils; 6 import org.apache.commons.collections.CollectionUtils;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
@@ -27,15 +27,15 @@ public class UfoSortIndexBuilder extends IIndexBuilder { @@ -27,15 +27,15 @@ public class UfoSortIndexBuilder extends IIndexBuilder {
27 27
28 @Override 28 @Override
29 public List<?> getPageLists(int offset, int limit) throws Exception { 29 public List<?> getPageLists(int offset, int limit) throws Exception {
30 - List<UfoProductSort> ufoProductSortList = ufoProductSortMapper.selectPageList(offset, limit);  
31 - if (CollectionUtils.isEmpty(ufoProductSortList)) { 30 + List<ProductSort> productSortList = ufoProductSortMapper.selectPageList(offset, limit);
  31 + if (CollectionUtils.isEmpty(productSortList)) {
32 return new ArrayList<>(0); 32 return new ArrayList<>(0);
33 } 33 }
34 - return ufoProductSortList; 34 + return productSortList;
35 } 35 }
36 36
37 @Override 37 @Override
38 public String getId(Object object) { 38 public String getId(Object object) {
39 - return ((UfoProductSort) object).getId().toString(); 39 + return ((ProductSort) object).getId().toString();
40 } 40 }
41 } 41 }
@@ -7,7 +7,11 @@ import com.yoho.search.consumer.service.logicService.cache.BasicDataCacheService @@ -7,7 +7,11 @@ import com.yoho.search.consumer.service.logicService.cache.BasicDataCacheService
7 import com.yoho.search.consumer.service.logicService.ufo.yoho.*; 7 import com.yoho.search.consumer.service.logicService.ufo.yoho.*;
8 import com.yoho.search.consumer.service.utils.IdCheckUtils; 8 import com.yoho.search.consumer.service.utils.IdCheckUtils;
9 import com.yoho.search.dal.*; 9 import com.yoho.search.dal.*;
10 -import com.yoho.search.dal.model.*; 10 +import com.yoho.search.dal.model.Brand;
  11 +import com.yoho.search.dal.model.ufo_product.*;
  12 +import com.yoho.search.dal.model.ufo_product.Goods;
  13 +import com.yoho.search.dal.model.ufo_product.Product;
  14 +import com.yoho.search.dal.model.ufo_product.Size;
11 import org.apache.commons.collections.CollectionUtils; 15 import org.apache.commons.collections.CollectionUtils;
12 import org.slf4j.Logger; 16 import org.slf4j.Logger;
13 import org.slf4j.LoggerFactory; 17 import org.slf4j.LoggerFactory;
@@ -81,30 +85,30 @@ public class UfoToYohoIndexBuilder extends IIndexBuilder { @@ -81,30 +85,30 @@ public class UfoToYohoIndexBuilder extends IIndexBuilder {
81 * 全量构建 85 * 全量构建
82 */ 86 */
83 public List<ProductIndexBO> buildProductIndexBOList(int start, int limit) { 87 public List<ProductIndexBO> buildProductIndexBOList(int start, int limit) {
84 - List<UfoProduct> ufoProductList = ufoProductMapper.selectPageLists(start, limit);  
85 - if (CollectionUtils.isEmpty(ufoProductList)) { 88 + List<Product> productList = ufoProductMapper.selectPageLists(start, limit);
  89 + if (CollectionUtils.isEmpty(productList)) {
86 return new ArrayList<>(); 90 return new ArrayList<>();
87 } 91 }
88 - return buildProductIndexBOList(ufoProductList); 92 + return buildProductIndexBOList(productList);
89 } 93 }
90 94
91 /** 95 /**
92 * 增量构建 96 * 增量构建
93 */ 97 */
94 public ProductIndexBO buildProductIndexBOIncrease(Integer id) { 98 public ProductIndexBO buildProductIndexBOIncrease(Integer id) {
95 - UfoProduct ufoProduct = ufoProductMapper.selectByPrimaryKey(id);  
96 - if (ufoProduct == null) { 99 + Product product = ufoProductMapper.selectByPrimaryKey(id);
  100 + if (product == null) {
97 return null; 101 return null;
98 } 102 }
99 - List<UfoProduct> ufoProductList = new ArrayList<>(Arrays.asList(ufoProduct));  
100 - List<ProductIndexBO> productIndexBOList = buildProductIndexBOList(ufoProductList); 103 + List<Product> productList = new ArrayList<>(Arrays.asList(product));
  104 + List<ProductIndexBO> productIndexBOList = buildProductIndexBOList(productList);
101 if (CollectionUtils.isEmpty(productIndexBOList)) { 105 if (CollectionUtils.isEmpty(productIndexBOList)) {
102 return null; 106 return null;
103 } 107 }
104 return productIndexBOList.get(0); 108 return productIndexBOList.get(0);
105 } 109 }
106 110
107 - private List<ProductIndexBO> buildProductIndexBOList(List<UfoProduct> ufoProductList) { 111 + private List<ProductIndexBO> buildProductIndexBOList(List<Product> productList) {
108 List<ProductIndexBO> productIndexBOList = new ArrayList<>(); 112 List<ProductIndexBO> productIndexBOList = new ArrayList<>();
109 try { 113 try {
110 //缓存中获取所有基础数据 114 //缓存中获取所有基础数据
@@ -112,30 +116,30 @@ public class UfoToYohoIndexBuilder extends IIndexBuilder { @@ -112,30 +116,30 @@ public class UfoToYohoIndexBuilder extends IIndexBuilder {
112 Map<Integer, ProductSort> yohoSortMap = basicDataCacheService.getProductSort(); 116 Map<Integer, ProductSort> yohoSortMap = basicDataCacheService.getProductSort();
113 Map<String, ProductColor> yohoColorNameMap = basicDataCacheService.getColorNameMap(); 117 Map<String, ProductColor> yohoColorNameMap = basicDataCacheService.getColorNameMap();
114 Map<String, List<Size>> yohoSizeNameMap = basicDataCacheService.getSizeNameMap(); 118 Map<String, List<Size>> yohoSizeNameMap = basicDataCacheService.getSizeNameMap();
115 - Map<Short, UfoBrand> ufoBrandMap = basicDataCacheService.getUfoBrand();  
116 - Map<Short, UfoBrandSeries> ufoBrandSeriesMap = basicDataCacheService.getUfoBrandSeries();  
117 - Map<Short, UfoSize> ufoSizeMap = basicDataCacheService.getUfoSize(); 119 + Map<Short, com.yoho.search.dal.model.ufo_product.Brand> ufoBrandMap = basicDataCacheService.getUfoBrand();
  120 + Map<Short, BrandSeries> ufoBrandSeriesMap = basicDataCacheService.getUfoBrandSeries();
  121 + Map<Short, Size> ufoSizeMap = basicDataCacheService.getUfoSize();
118 Map<Integer, Integer> ufoBrandRelation = basicDataCacheService.getUfoBrandRelationMap(); 122 Map<Integer, Integer> ufoBrandRelation = basicDataCacheService.getUfoBrandRelationMap();
119 - Map<Integer, UfoSearchSortRelation> ufoSortRelationMap = basicDataCacheService.getUfoSortRelationMap(); 123 + Map<Integer, SearchSortRelation> ufoSortRelationMap = basicDataCacheService.getUfoSortRelationMap();
120 124
121 - List<Integer> ufoProductIdList = ufoProductList.stream().map(UfoProduct::getId).collect(Collectors.toList()); 125 + List<Integer> ufoProductIdList = productList.stream().map(Product::getId).collect(Collectors.toList());
122 //去查这一批ufo商品的goods，转换为map 126 //去查这一批ufo商品的goods，转换为map
123 - List<UfoGoods> ufoGoodsList = ufoGoodsMapper.selectByProductIdList(ufoProductIdList);  
124 - Map<Integer, List<UfoGoods>> ufoGoodsMap = new HashMap<>();  
125 - if (CollectionUtils.isNotEmpty(ufoGoodsList)) {  
126 - ufoGoodsMap = ufoGoodsList.stream().collect(Collectors.groupingBy(UfoGoods::getProductId)); 127 + List<com.yoho.search.dal.model.ufo_product.Goods> goodsList = ufoGoodsMapper.selectByProductIdList(ufoProductIdList);
  128 + Map<Integer, List<Goods>> ufoGoodsMap = new HashMap<>();
  129 + if (CollectionUtils.isNotEmpty(goodsList)) {
  130 + ufoGoodsMap = goodsList.stream().collect(Collectors.groupingBy(Goods::getProductId));
127 } 131 }
128 //去查这一批ufo商品的storage，转换为map 132 //去查这一批ufo商品的storage，转换为map
129 - List<UfoStorage> ufoStorageList = ufoStorageMapper.selectByProductIdList(ufoProductIdList);  
130 - Map<Integer, List<UfoStorage>> ufoStorageMap = new HashMap<>();  
131 - if (CollectionUtils.isNotEmpty(ufoStorageList)) {  
132 - ufoStorageMap = ufoStorageList.stream().collect(Collectors.groupingBy(UfoStorage::getProductId)); 133 + List<Storage> storageList = ufoStorageMapper.selectByProductIdList(ufoProductIdList);
  134 + Map<Integer, List<Storage>> ufoStorageMap = new HashMap<>();
  135 + if (CollectionUtils.isNotEmpty(storageList)) {
  136 + ufoStorageMap = storageList.stream().collect(Collectors.groupingBy(Storage::getProductId));
133 } 137 }
134 //去查这一批ufo商品的storage_price，转换为map 138 //去查这一批ufo商品的storage_price，转换为map
135 - List<UfoStoragePrice> ufoStoragePriceList = ufoStoragePriceMapper.selectByProductIdList(ufoProductIdList);  
136 - Map<Integer, List<UfoStoragePrice>> ufoStoragePriceMap = new HashMap<>();  
137 - if (CollectionUtils.isNotEmpty(ufoStoragePriceList)) {  
138 - ufoStoragePriceMap = ufoStoragePriceList.stream().collect(Collectors.groupingBy(UfoStoragePrice::getProductId)); 139 + List<StoragePrice> storagePriceList = ufoStoragePriceMapper.selectByProductIdList(ufoProductIdList);
  140 + Map<Integer, List<StoragePrice>> ufoStoragePriceMap = new HashMap<>();
  141 + if (CollectionUtils.isNotEmpty(storagePriceList)) {
  142 + ufoStoragePriceMap = storagePriceList.stream().collect(Collectors.groupingBy(StoragePrice::getProductId));
139 } 143 }
140 //去查这一批ufo商品的ufo_score_product_rule Set 144 //去查这一批ufo商品的ufo_score_product_rule Set
141 List<Integer> ufoScoreProductRuleList = ufoScoreProductRuleMapper.selectByIdList(ufoProductIdList); 145 List<Integer> ufoScoreProductRuleList = ufoScoreProductRuleMapper.selectByIdList(ufoProductIdList);
@@ -144,26 +148,26 @@ public class UfoToYohoIndexBuilder extends IIndexBuilder { @@ -144,26 +148,26 @@ public class UfoToYohoIndexBuilder extends IIndexBuilder {
144 ufoScoreProductRuleSet = ufoScoreProductRuleList.stream().collect(Collectors.toSet()); 148 ufoScoreProductRuleSet = ufoScoreProductRuleList.stream().collect(Collectors.toSet());
145 } 149 }
146 150
147 - for (UfoProduct ufoProduct : ufoProductList) { 151 + for (Product product : productList) {
148 //不合法id直接丢掉 152 //不合法id直接丢掉
149 - if (!IdCheckUtils.isUfoIdLegal(ufoProduct.getId())) { 153 + if (!IdCheckUtils.isUfoIdLegal(product.getId())) {
150 continue; 154 continue;
151 } 155 }
152 ProductIndexBO productIndexBO = new ProductIndexBO(); 156 ProductIndexBO productIndexBO = new ProductIndexBO();
153 //一般字段 157 //一般字段
154 - ufoToYohoGeneralService.build(productIndexBO, ufoProduct, ufoBrandSeriesMap); 158 + ufoToYohoGeneralService.build(productIndexBO, product, ufoBrandSeriesMap);
155 //品牌 159 //品牌
156 - ufoToYohoBrandService.build(productIndexBO, ufoProduct, yohoBrandMap, ufoBrandMap, ufoBrandRelation); 160 + ufoToYohoBrandService.build(productIndexBO, product, yohoBrandMap, ufoBrandMap, ufoBrandRelation);
157 //品类 161 //品类
158 - ufoToYohoSortService.build(productIndexBO, ufoProduct, yohoSortMap, ufoSortRelationMap); 162 + ufoToYohoSortService.build(productIndexBO, product, yohoSortMap, ufoSortRelationMap);
159 //颜色 163 //颜色
160 - ufoToYohoColorService.build(productIndexBO, ufoProduct, yohoColorNameMap, ufoGoodsMap); 164 + ufoToYohoColorService.build(productIndexBO, product, yohoColorNameMap, ufoGoodsMap);
161 //尺码 165 //尺码
162 - ufoToYohoSizeService.build(productIndexBO, ufoProduct, ufoSizeMap, yohoSizeNameMap, ufoStorageMap); 166 + ufoToYohoSizeService.build(productIndexBO, product, ufoSizeMap, yohoSizeNameMap, ufoStorageMap);
163 //价格 167 //价格
164 - ufoToYohoPriceService.build(productIndexBO, ufoProduct, ufoStoragePriceMap,ufoStorageMap); 168 + ufoToYohoPriceService.build(productIndexBO, product, ufoStoragePriceMap,ufoStorageMap);
165 //直通车 169 //直通车
166 - productIndexBO.setToAddScore(ufoScoreProductRuleSet.contains(ufoProduct.getId()) ? "Y" : "N"); 170 + productIndexBO.setToAddScore(ufoScoreProductRuleSet.contains(product.getId()) ? "Y" : "N");
167 productIndexBOList.add(productIndexBO); 171 productIndexBOList.add(productIndexBO);
168 } 172 }
169 return productIndexBOList; 173 return productIndexBOList;
@@ -9,7 +9,7 @@ import com.yoho.search.consumer.index.increment.AbstractMqListener; @@ -9,7 +9,7 @@ import com.yoho.search.consumer.index.increment.AbstractMqListener;
9 import com.yoho.search.consumer.service.daoService.ufo.UfoBrandService; 9 import com.yoho.search.consumer.service.daoService.ufo.UfoBrandService;
10 import com.yoho.search.consumer.service.logicService.cache.BasicDataCacheService; 10 import com.yoho.search.consumer.service.logicService.cache.BasicDataCacheService;
11 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 11 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
12 -import com.yoho.search.dal.model.UfoBrand; 12 +import com.yoho.search.dal.model.ufo_product.Brand;
13 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Component; 14 import org.springframework.stereotype.Component;
15 15
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Component; @@ -18,7 +18,7 @@ import org.springframework.stereotype.Component;
18 * @version 2018/9/11 18 * @version 2018/9/11
19 */ 19 */
20 @Component 20 @Component
21 -@SearchMqConsumerListerner(tableName = "ufo_brand") 21 +@SearchMqConsumerListerner(tableName = "ufo_product.brand")
22 public class UfoBrandMqListener extends AbstractMqListener { 22 public class UfoBrandMqListener extends AbstractMqListener {
23 23
24 @Autowired 24 @Autowired
@@ -46,12 +46,12 @@ public class UfoBrandMqListener extends AbstractMqListener { @@ -46,12 +46,12 @@ public class UfoBrandMqListener extends AbstractMqListener {
46 46
47 @Override 47 @Override
48 protected void updateData(JSONObject data) throws Exception { 48 protected void updateData(JSONObject data) throws Exception {
49 - UfoBrand ufoBrand = ConvertUtils.toJavaObject(UfoBrand.class, data);  
50 - if (ufoBrand == null || ufoBrand.getId() == null) { 49 + Brand brand = ConvertUtils.toJavaObject(Brand.class, data);
  50 + if (brand == null || brand.getId() == null) {
51 return; 51 return;
52 } 52 }
53 - ufoBrandService.saveOrUpdate(ufoBrand);  
54 - indexService.updateIndexData(this.getIndexName(), ufoBrand.getId().toString(), ufoBrand); 53 + ufoBrandService.saveOrUpdate(brand);
  54 + indexService.updateIndexData(this.getIndexName(), brand.getId().toString(), brand);
55 } 55 }
56 56
57 @Override 57 @Override
@@ -7,7 +7,7 @@ import com.yoho.search.consumer.index.increment.AbstractMqListener; @@ -7,7 +7,7 @@ import com.yoho.search.consumer.index.increment.AbstractMqListener;
7 import com.yoho.search.consumer.service.daoService.ufo.UfoBrandSeriesService; 7 import com.yoho.search.consumer.service.daoService.ufo.UfoBrandSeriesService;
8 import com.yoho.search.consumer.service.logicService.cache.BasicDataCacheService; 8 import com.yoho.search.consumer.service.logicService.cache.BasicDataCacheService;
9 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 9 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
10 -import com.yoho.search.dal.model.UfoBrandSeries; 10 +import com.yoho.search.dal.model.ufo_product.BrandSeries;
11 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
12 import org.springframework.stereotype.Component; 12 import org.springframework.stereotype.Component;
13 13
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
16 * @version 2018/9/11 16 * @version 2018/9/11
17 */ 17 */
18 @Component 18 @Component
19 -@SearchMqConsumerListerner(tableName = "ufo_brand_series") 19 +@SearchMqConsumerListerner(tableName = "ufo_product.brand_series")
20 public class UfoBrandSeriesMqListener extends AbstractMqListener { 20 public class UfoBrandSeriesMqListener extends AbstractMqListener {
21 21
22 @Autowired 22 @Autowired
@@ -36,11 +36,11 @@ public class UfoBrandSeriesMqListener extends AbstractMqListener { @@ -36,11 +36,11 @@ public class UfoBrandSeriesMqListener extends AbstractMqListener {
36 36
37 @Override 37 @Override
38 protected void updateData(JSONObject data) throws Exception { 38 protected void updateData(JSONObject data) throws Exception {
39 - UfoBrandSeries ufoBrandSeries = ConvertUtils.toJavaObject(UfoBrandSeries.class, data);  
40 - if (ufoBrandSeries == null || ufoBrandSeries.getId() == null) { 39 + BrandSeries brandSeries = ConvertUtils.toJavaObject(BrandSeries.class, data);
  40 + if (brandSeries == null || brandSeries.getId() == null) {
41 return; 41 return;
42 } 42 }
43 - ufoBrandSeriesService.saveOrUpdate(ufoBrandSeries); 43 + ufoBrandSeriesService.saveOrUpdate(brandSeries);
44 } 44 }
45 45
46 @Override 46 @Override
@@ -5,10 +5,8 @@ import com.yoho.search.base.utils.ConvertUtils; @@ -5,10 +5,8 @@ import com.yoho.search.base.utils.ConvertUtils;
5 import com.yoho.search.base.utils.EventReportEnum; 5 import com.yoho.search.base.utils.EventReportEnum;
6 import com.yoho.search.consumer.index.increment.AbstractMqListener; 6 import com.yoho.search.consumer.index.increment.AbstractMqListener;
7 import com.yoho.search.consumer.service.daoService.ufo.UfoBuyerOrderGoodsService; 7 import com.yoho.search.consumer.service.daoService.ufo.UfoBuyerOrderGoodsService;
8 -import com.yoho.search.consumer.service.daoService.ufo.UfoGoodsImagesService;  
9 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
10 -import com.yoho.search.dal.model.UfoBuyerOrderGoods;  
11 -import com.yoho.search.dal.model.UfoGoodsImages; 9 +import com.yoho.search.dal.model.ufo_order.BuyerOrderGoods;
12 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
14 12
@@ -16,7 +14,7 @@ import org.springframework.stereotype.Component; @@ -16,7 +14,7 @@ import org.springframework.stereotype.Component;
16 * Created by aaron.wang on 2018/12/5. 14 * Created by aaron.wang on 2018/12/5.
17 */ 15 */
18 @Component 16 @Component
19 -@SearchMqConsumerListerner(tableName = "ufo_buyer_order_goods") 17 +@SearchMqConsumerListerner(tableName = "ufo_order.buyer_order_goods")
20 public class UfoBuyerOrderGoodsMqListener extends AbstractMqListener { 18 public class UfoBuyerOrderGoodsMqListener extends AbstractMqListener {
21 19
22 @Autowired 20 @Autowired
@@ -34,10 +32,10 @@ public class UfoBuyerOrderGoodsMqListener extends AbstractMqListener { @@ -34,10 +32,10 @@ public class UfoBuyerOrderGoodsMqListener extends AbstractMqListener {
34 32
35 @Override 33 @Override
36 protected void updateData(JSONObject data) throws Exception { 34 protected void updateData(JSONObject data) throws Exception {
37 - UfoBuyerOrderGoods ufoBuyerOrderGoods = ConvertUtils.toJavaObject(UfoBuyerOrderGoods.class, data);  
38 - if (ufoBuyerOrderGoods == null || ufoBuyerOrderGoods.getId() == null) { 35 + BuyerOrderGoods buyerOrderGoods = ConvertUtils.toJavaObject(BuyerOrderGoods.class, data);
  36 + if (buyerOrderGoods == null || buyerOrderGoods.getId() == null) {
39 return; 37 return;
40 } 38 }
41 - ufoBuyerOrderGoodsService.saveOrUpdate(ufoBuyerOrderGoods); 39 + ufoBuyerOrderGoodsService.saveOrUpdate(buyerOrderGoods);
42 } 40 }
43 } 41 }
@@ -5,10 +5,8 @@ import com.yoho.search.base.utils.ConvertUtils; @@ -5,10 +5,8 @@ import com.yoho.search.base.utils.ConvertUtils;
5 import com.yoho.search.base.utils.EventReportEnum; 5 import com.yoho.search.base.utils.EventReportEnum;
6 import com.yoho.search.consumer.index.increment.AbstractMqListener; 6 import com.yoho.search.consumer.index.increment.AbstractMqListener;
7 import com.yoho.search.consumer.service.daoService.ufo.UfoBuyerOrderService; 7 import com.yoho.search.consumer.service.daoService.ufo.UfoBuyerOrderService;
8 -import com.yoho.search.consumer.service.daoService.ufo.UfoGoodsImagesService;  
9 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
10 -import com.yoho.search.dal.model.UfoBuyerOrder;  
11 -import com.yoho.search.dal.model.UfoGoodsImages; 9 +import com.yoho.search.dal.model.ufo_order.BuyerOrder;
12 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
14 12
@@ -16,7 +14,7 @@ import org.springframework.stereotype.Component; @@ -16,7 +14,7 @@ import org.springframework.stereotype.Component;
16 * Created by aaron.wang on 2018/12/5. 14 * Created by aaron.wang on 2018/12/5.
17 */ 15 */
18 @Component 16 @Component
19 -@SearchMqConsumerListerner(tableName = "ufo_buyer_order") 17 +@SearchMqConsumerListerner(tableName = "ufo_order.buyer_order")
20 public class UfoBuyerOrderMqListener extends AbstractMqListener { 18 public class UfoBuyerOrderMqListener extends AbstractMqListener {
21 @Autowired 19 @Autowired
22 private UfoBuyerOrderService ufoBuyerOrderService; 20 private UfoBuyerOrderService ufoBuyerOrderService;
@@ -33,10 +31,10 @@ public class UfoBuyerOrderMqListener extends AbstractMqListener { @@ -33,10 +31,10 @@ public class UfoBuyerOrderMqListener extends AbstractMqListener {
33 31
34 @Override 32 @Override
35 protected void updateData(JSONObject data) throws Exception { 33 protected void updateData(JSONObject data) throws Exception {
36 - UfoBuyerOrder ufoBuyerOrder = ConvertUtils.toJavaObject(UfoBuyerOrder.class, data);  
37 - if (ufoBuyerOrder == null || ufoBuyerOrder.getId() == null) { 34 + BuyerOrder buyerOrder = ConvertUtils.toJavaObject(BuyerOrder.class, data);
  35 + if (buyerOrder == null || buyerOrder.getId() == null) {
38 return; 36 return;
39 } 37 }
40 - ufoBuyerOrderService.saveOrUpdate(ufoBuyerOrder); 38 + ufoBuyerOrderService.saveOrUpdate(buyerOrder);
41 } 39 }
42 } 40 }
@@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum; @@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum;
6 import com.yoho.search.consumer.index.increment.AbstractMqListener; 6 import com.yoho.search.consumer.index.increment.AbstractMqListener;
7 import com.yoho.search.consumer.service.daoService.ufo.UfoGoodsImagesService; 7 import com.yoho.search.consumer.service.daoService.ufo.UfoGoodsImagesService;
8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
9 -import com.yoho.search.dal.model.UfoGoodsImages; 9 +import com.yoho.search.dal.model.ufo_product.GoodsImages;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
12 12
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
15 * @version 2018/9/11 15 * @version 2018/9/11
16 */ 16 */
17 @Component 17 @Component
18 -@SearchMqConsumerListerner(tableName = "ufo_goods_images") 18 +@SearchMqConsumerListerner(tableName = "ufo_product.goods_images")
19 public class UfoGoodsImagesMqListener extends AbstractMqListener { 19 public class UfoGoodsImagesMqListener extends AbstractMqListener {
20 20
21 @Autowired 21 @Autowired
@@ -33,10 +33,10 @@ public class UfoGoodsImagesMqListener extends AbstractMqListener { @@ -33,10 +33,10 @@ public class UfoGoodsImagesMqListener extends AbstractMqListener {
33 33
34 @Override 34 @Override
35 protected void updateData(JSONObject data) throws Exception { 35 protected void updateData(JSONObject data) throws Exception {
36 - UfoGoodsImages ufoGoodsImages = ConvertUtils.toJavaObject(UfoGoodsImages.class, data);  
37 - if (ufoGoodsImages == null || ufoGoodsImages.getId() == null) { 36 + GoodsImages goodsImages = ConvertUtils.toJavaObject(GoodsImages.class, data);
  37 + if (goodsImages == null || goodsImages.getId() == null) {
38 return; 38 return;
39 } 39 }
40 - ufoGoodsImagesService.saveOrUpdate(ufoGoodsImages); 40 + ufoGoodsImagesService.saveOrUpdate(goodsImages);
41 } 41 }
42 } 42 }
@@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum; @@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum;
6 import com.yoho.search.consumer.index.increment.AbstractMqListener; 6 import com.yoho.search.consumer.index.increment.AbstractMqListener;
7 import com.yoho.search.consumer.service.daoService.ufo.UfoGoodsService; 7 import com.yoho.search.consumer.service.daoService.ufo.UfoGoodsService;
8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
9 -import com.yoho.search.dal.model.UfoGoods; 9 +import com.yoho.search.dal.model.ufo_product.Goods;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
12 12
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
15 * @version 2018/9/11 15 * @version 2018/9/11
16 */ 16 */
17 @Component 17 @Component
18 -@SearchMqConsumerListerner(tableName = "ufo_goods") 18 +@SearchMqConsumerListerner(tableName = "ufo_product.goods")
19 public class UfoGoodsMqListener extends AbstractMqListener { 19 public class UfoGoodsMqListener extends AbstractMqListener {
20 20
21 @Autowired 21 @Autowired
@@ -31,22 +31,22 @@ public class UfoGoodsMqListener extends AbstractMqListener { @@ -31,22 +31,22 @@ public class UfoGoodsMqListener extends AbstractMqListener {
31 31
32 @Override 32 @Override
33 protected void deleteData(String id) throws Exception { 33 protected void deleteData(String id) throws Exception {
34 - UfoGoods ufoGoods = ufoGoodsService.getById(Integer.valueOf(id)); 34 + Goods goods = ufoGoodsService.getById(Integer.valueOf(id));
35 ufoGoodsService.delete(Integer.valueOf(id)); 35 ufoGoodsService.delete(Integer.valueOf(id));
36 - if (ufoGoods != null) {  
37 - ufoIndexUpdateHelper.updateUfoIndex(ufoGoods.getProductId());  
38 - ufoIndexUpdateHelper.updateYohoIndex(ufoGoods.getProductId()); 36 + if (goods != null) {
  37 + ufoIndexUpdateHelper.updateUfoIndex(goods.getProductId());
  38 + ufoIndexUpdateHelper.updateYohoIndex(goods.getProductId());
39 } 39 }
40 } 40 }
41 41
42 @Override 42 @Override
43 protected void updateData(JSONObject data) throws Exception { 43 protected void updateData(JSONObject data) throws Exception {
44 - UfoGoods ufoGoods = ConvertUtils.toJavaObject(UfoGoods.class, data);  
45 - if (ufoGoods == null || ufoGoods.getId() == null) { 44 + Goods goods = ConvertUtils.toJavaObject(Goods.class, data);
  45 + if (goods == null || goods.getId() == null) {
46 return; 46 return;
47 } 47 }
48 - ufoGoodsService.saveOrUpdate(ufoGoods);  
49 - ufoIndexUpdateHelper.updateUfoIndex(ufoGoods.getProductId());  
50 - ufoIndexUpdateHelper.updateYohoIndex(ufoGoods.getProductId()); 48 + ufoGoodsService.saveOrUpdate(goods);
  49 + ufoIndexUpdateHelper.updateUfoIndex(goods.getProductId());
  50 + ufoIndexUpdateHelper.updateYohoIndex(goods.getProductId());
51 } 51 }
52 } 52 }
@@ -8,7 +8,7 @@ import com.yoho.search.consumer.common.IYohoIndexService; @@ -8,7 +8,7 @@ import com.yoho.search.consumer.common.IYohoIndexService;
8 import com.yoho.search.consumer.index.increment.AbstractMqListener; 8 import com.yoho.search.consumer.index.increment.AbstractMqListener;
9 import com.yoho.search.consumer.service.daoService.ufo.UfoProductColorService; 9 import com.yoho.search.consumer.service.daoService.ufo.UfoProductColorService;
10 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 10 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
11 -import com.yoho.search.dal.model.UfoProductColor; 11 +import com.yoho.search.dal.model.ufo_product.ProductColor;
12 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Component; 13 import org.springframework.stereotype.Component;
14 14
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
17 * @version 2018/9/11 17 * @version 2018/9/11
18 */ 18 */
19 @Component 19 @Component
20 -@SearchMqConsumerListerner(tableName = "ufo_product_color") 20 +@SearchMqConsumerListerner(tableName = "ufo_product.product_color")
21 public class UfoProductColorMqListener extends AbstractMqListener { 21 public class UfoProductColorMqListener extends AbstractMqListener {
22 22
23 @Autowired 23 @Autowired
@@ -44,7 +44,7 @@ public class UfoProductColorMqListener extends AbstractMqListener { @@ -44,7 +44,7 @@ public class UfoProductColorMqListener extends AbstractMqListener {
44 44
45 @Override 45 @Override
46 protected void updateData(JSONObject data) throws Exception { 46 protected void updateData(JSONObject data) throws Exception {
47 - UfoProductColor ProductColor = ConvertUtils.toJavaObject(UfoProductColor.class, data); 47 + ProductColor ProductColor = ConvertUtils.toJavaObject(com.yoho.search.dal.model.ufo_product.ProductColor.class, data);
48 if (ProductColor == null || ProductColor.getId() == null) { 48 if (ProductColor == null || ProductColor.getId() == null) {
49 return; 49 return;
50 } 50 }
@@ -8,7 +8,7 @@ import com.yoho.search.consumer.common.IYohoIndexService; @@ -8,7 +8,7 @@ import com.yoho.search.consumer.common.IYohoIndexService;
8 import com.yoho.search.consumer.index.increment.AbstractMqListener; 8 import com.yoho.search.consumer.index.increment.AbstractMqListener;
9 import com.yoho.search.consumer.service.daoService.ufo.UfoProductService; 9 import com.yoho.search.consumer.service.daoService.ufo.UfoProductService;
10 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 10 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
11 -import com.yoho.search.dal.model.UfoProduct; 11 +import com.yoho.search.dal.model.ufo_product.Product;
12 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Component; 13 import org.springframework.stereotype.Component;
14 14
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
17 * @version 2018/9/11 17 * @version 2018/9/11
18 */ 18 */
19 @Component 19 @Component
20 -@SearchMqConsumerListerner(tableName = "ufo_product") 20 +@SearchMqConsumerListerner(tableName = "ufo_product.product")
21 public class UfoProductMqListener extends AbstractMqListener { 21 public class UfoProductMqListener extends AbstractMqListener {
22 22
23 @Autowired 23 @Autowired
@@ -47,13 +47,13 @@ public class UfoProductMqListener extends AbstractMqListener { @@ -47,13 +47,13 @@ public class UfoProductMqListener extends AbstractMqListener {
47 47
48 @Override 48 @Override
49 protected void updateData(JSONObject data) throws Exception { 49 protected void updateData(JSONObject data) throws Exception {
50 - UfoProduct ufoProduct = ConvertUtils.toJavaObject(UfoProduct.class, data);  
51 - if (ufoProduct == null || ufoProduct.getId() == null) { 50 + Product product = ConvertUtils.toJavaObject(Product.class, data);
  51 + if (product == null || product.getId() == null) {
52 return; 52 return;
53 } 53 }
54 - ufoProductService.saveOrUpdate(ufoProduct);  
55 - ufoIndexUpdateHelper.updateUfoIndex(ufoProduct.getId());  
56 - ufoIndexUpdateHelper.updateYohoIndex(ufoProduct.getId()); 54 + ufoProductService.saveOrUpdate(product);
  55 + ufoIndexUpdateHelper.updateUfoIndex(product.getId());
  56 + ufoIndexUpdateHelper.updateYohoIndex(product.getId());
57 } 57 }
58 58
59 } 59 }
@@ -7,7 +7,7 @@ import com.yoho.search.base.utils.ISearchConstants; @@ -7,7 +7,7 @@ import com.yoho.search.base.utils.ISearchConstants;
7 import com.yoho.search.consumer.index.increment.AbstractMqListener; 7 import com.yoho.search.consumer.index.increment.AbstractMqListener;
8 import com.yoho.search.consumer.service.daoService.ufo.UfoProductPoolDetailService; 8 import com.yoho.search.consumer.service.daoService.ufo.UfoProductPoolDetailService;
9 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 9 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
10 -import com.yoho.search.dal.model.UfoProductPoolDetail; 10 +import com.yoho.search.dal.model.ufo_product.ProductPoolDetail;
11 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
12 import org.springframework.stereotype.Component; 12 import org.springframework.stereotype.Component;
13 13
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
16 * @version 2018/9/11 16 * @version 2018/9/11
17 */ 17 */
18 @Component 18 @Component
19 -@SearchMqConsumerListerner(tableName = "ufo_product_pool_detail") 19 +@SearchMqConsumerListerner(tableName = "ufo_product.product_pool_detail")
20 public class UfoProductPoolDetailMqListener extends AbstractMqListener { 20 public class UfoProductPoolDetailMqListener extends AbstractMqListener {
21 21
22 @Autowired 22 @Autowired
@@ -37,20 +37,20 @@ public class UfoProductPoolDetailMqListener extends AbstractMqListener { @@ -37,20 +37,20 @@ public class UfoProductPoolDetailMqListener extends AbstractMqListener {
37 37
38 @Override 38 @Override
39 protected void deleteData(String id) throws Exception { 39 protected void deleteData(String id) throws Exception {
40 - UfoProductPoolDetail ufoProductPoolDetail = ufoProductPoolDetailService.getById(Integer.valueOf(id)); 40 + ProductPoolDetail productPoolDetail = ufoProductPoolDetailService.getById(Integer.valueOf(id));
41 ufoProductPoolDetailService.delete(Integer.valueOf(id)); 41 ufoProductPoolDetailService.delete(Integer.valueOf(id));
42 - if (ufoProductPoolDetail != null) {  
43 - ufoIndexUpdateHelper.updateUfoIndex(ufoProductPoolDetail.getProductId()); 42 + if (productPoolDetail != null) {
  43 + ufoIndexUpdateHelper.updateUfoIndex(productPoolDetail.getProductId());
44 } 44 }
45 } 45 }
46 46
47 @Override 47 @Override
48 protected void updateData(JSONObject data) throws Exception { 48 protected void updateData(JSONObject data) throws Exception {
49 - UfoProductPoolDetail ufoProductPoolDetail = ConvertUtils.toJavaObject(UfoProductPoolDetail.class, data);  
50 - if (ufoProductPoolDetail == null || ufoProductPoolDetail.getId() == null) { 49 + ProductPoolDetail productPoolDetail = ConvertUtils.toJavaObject(ProductPoolDetail.class, data);
  50 + if (productPoolDetail == null || productPoolDetail.getId() == null) {
51 return; 51 return;
52 } 52 }
53 - ufoProductPoolDetailService.saveOrUpdate(ufoProductPoolDetail);  
54 - ufoIndexUpdateHelper.updateUfoIndex(ufoProductPoolDetail.getProductId()); 53 + ufoProductPoolDetailService.saveOrUpdate(productPoolDetail);
  54 + ufoIndexUpdateHelper.updateUfoIndex(productPoolDetail.getProductId());
55 } 55 }
56 } 56 }
@@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum; @@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum;
6 import com.yoho.search.consumer.index.increment.AbstractMqListener; 6 import com.yoho.search.consumer.index.increment.AbstractMqListener;
7 import com.yoho.search.consumer.service.daoService.ufo.UfoProductPoolService; 7 import com.yoho.search.consumer.service.daoService.ufo.UfoProductPoolService;
8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
9 -import com.yoho.search.dal.model.UfoProductPool; 9 +import com.yoho.search.dal.model.ufo_product.ProductPool;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
12 12
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
15 * @version 2018/9/11 15 * @version 2018/9/11
16 */ 16 */
17 @Component 17 @Component
18 -@SearchMqConsumerListerner(tableName = "ufo_product_pool") 18 +@SearchMqConsumerListerner(tableName = "ufo_product.product_pool")
19 public class UfoProductPoolMqListener extends AbstractMqListener { 19 public class UfoProductPoolMqListener extends AbstractMqListener {
20 20
21 @Autowired 21 @Autowired
@@ -33,10 +33,10 @@ public class UfoProductPoolMqListener extends AbstractMqListener { @@ -33,10 +33,10 @@ public class UfoProductPoolMqListener extends AbstractMqListener {
33 33
34 @Override 34 @Override
35 protected void updateData(JSONObject data) throws Exception { 35 protected void updateData(JSONObject data) throws Exception {
36 - UfoProductPool ufoProductPool = ConvertUtils.toJavaObject(UfoProductPool.class, data);  
37 - if (ufoProductPool == null || ufoProductPool.getId() == null) { 36 + ProductPool productPool = ConvertUtils.toJavaObject(ProductPool.class, data);
  37 + if (productPool == null || productPool.getId() == null) {
38 return; 38 return;
39 } 39 }
40 - ufoProductPoolService.saveOrUpdate(ufoProductPool); 40 + ufoProductPoolService.saveOrUpdate(productPool);
41 } 41 }
42 } 42 }
@@ -8,7 +8,7 @@ import com.yoho.search.consumer.common.IYohoIndexService; @@ -8,7 +8,7 @@ import com.yoho.search.consumer.common.IYohoIndexService;
8 import com.yoho.search.consumer.index.increment.AbstractMqListener; 8 import com.yoho.search.consumer.index.increment.AbstractMqListener;
9 import com.yoho.search.consumer.service.daoService.ufo.UfoProductSortService; 9 import com.yoho.search.consumer.service.daoService.ufo.UfoProductSortService;
10 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 10 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
11 -import com.yoho.search.dal.model.UfoProductSort; 11 +import com.yoho.search.dal.model.ufo_product.ProductSort;
12 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Component; 13 import org.springframework.stereotype.Component;
14 14
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
17 * @version 2018/9/11 17 * @version 2018/9/11
18 */ 18 */
19 @Component 19 @Component
20 -@SearchMqConsumerListerner(tableName = "ufo_product_sort") 20 +@SearchMqConsumerListerner(tableName = "ufo_product.product_sort")
21 public class UfoProductSortMqListener extends AbstractMqListener { 21 public class UfoProductSortMqListener extends AbstractMqListener {
22 22
23 @Autowired 23 @Autowired
@@ -43,11 +43,11 @@ public class UfoProductSortMqListener extends AbstractMqListener { @@ -43,11 +43,11 @@ public class UfoProductSortMqListener extends AbstractMqListener {
43 43
44 @Override 44 @Override
45 protected void updateData(JSONObject data) throws Exception { 45 protected void updateData(JSONObject data) throws Exception {
46 - UfoProductSort ufoProductSort = ConvertUtils.toJavaObject(UfoProductSort.class, data);  
47 - if (ufoProductSort == null || ufoProductSort.getId() == null) { 46 + ProductSort productSort = ConvertUtils.toJavaObject(ProductSort.class, data);
  47 + if (productSort == null || productSort.getId() == null) {
48 return; 48 return;
49 } 49 }
50 - ufoProductSortService.saveOrUpdate(ufoProductSort);  
51 - indexService.updateIndexData(this.getIndexName(), ufoProductSort.getId().toString(), ufoProductSort); 50 + ufoProductSortService.saveOrUpdate(productSort);
  51 + indexService.updateIndexData(this.getIndexName(), productSort.getId().toString(), productSort);
52 } 52 }
53 } 53 }
@@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum; @@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum;
6 import com.yoho.search.consumer.index.increment.AbstractMqListener; 6 import com.yoho.search.consumer.index.increment.AbstractMqListener;
7 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 7 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
8 import com.yoho.search.dal.UfoScoreProductRuleMapper; 8 import com.yoho.search.dal.UfoScoreProductRuleMapper;
9 -import com.yoho.search.dal.model.UfoScoreProductRule; 9 +import com.yoho.search.dal.model.ufo_product.ScoreProductRule;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
12 12
@@ -29,28 +29,28 @@ public class UfoScoreProductRuleMqListener extends AbstractMqListener { @@ -29,28 +29,28 @@ public class UfoScoreProductRuleMqListener extends AbstractMqListener {
29 29
30 @Override 30 @Override
31 protected void deleteData(String id) throws Exception { 31 protected void deleteData(String id) throws Exception {
32 - UfoScoreProductRule ufoScoreProductRule = ufoScoreProductRuleMapper.selectByPrimaryKey(Integer.valueOf(id)); 32 + ScoreProductRule scoreProductRule = ufoScoreProductRuleMapper.selectByPrimaryKey(Integer.valueOf(id));
33 ufoScoreProductRuleMapper.deleteByPrimaryKey(Integer.valueOf(id)); 33 ufoScoreProductRuleMapper.deleteByPrimaryKey(Integer.valueOf(id));
34 - if (ufoScoreProductRule != null) {  
35 - ufoIndexUpdateHelper.updateYohoIndex(ufoScoreProductRule.getProductId()); 34 + if (scoreProductRule != null) {
  35 + ufoIndexUpdateHelper.updateYohoIndex(scoreProductRule.getProductId());
36 } 36 }
37 } 37 }
38 38
39 @Override 39 @Override
40 protected void updateData(JSONObject data) throws Exception { 40 protected void updateData(JSONObject data) throws Exception {
41 - UfoScoreProductRule ufoScoreProductRule = ConvertUtils.toJavaObject(UfoScoreProductRule.class, data);  
42 - if (ufoScoreProductRule == null || ufoScoreProductRule.getId() == null) { 41 + ScoreProductRule scoreProductRule = ConvertUtils.toJavaObject(ScoreProductRule.class, data);
  42 + if (scoreProductRule == null || scoreProductRule.getId() == null) {
43 return; 43 return;
44 } 44 }
45 - this.saveOrUpdate(ufoScoreProductRule);  
46 - ufoIndexUpdateHelper.updateYohoIndex(ufoScoreProductRule.getProductId()); 45 + this.saveOrUpdate(scoreProductRule);
  46 + ufoIndexUpdateHelper.updateYohoIndex(scoreProductRule.getProductId());
47 } 47 }
48 48
49 - private int saveOrUpdate(UfoScoreProductRule ufoScoreProductRule) {  
50 - if (ufoScoreProductRule.getId() == null || ufoScoreProductRuleMapper.selectByPrimaryKey(ufoScoreProductRule.getId()) == null) {  
51 - return ufoScoreProductRuleMapper.insertSelective(ufoScoreProductRule); 49 + private int saveOrUpdate(ScoreProductRule scoreProductRule) {
  50 + if (scoreProductRule.getId() == null || ufoScoreProductRuleMapper.selectByPrimaryKey(scoreProductRule.getId()) == null) {
  51 + return ufoScoreProductRuleMapper.insertSelective(scoreProductRule);
52 } else { 52 } else {
53 - return ufoScoreProductRuleMapper.updateByPrimaryKeySelective(ufoScoreProductRule); 53 + return ufoScoreProductRuleMapper.updateByPrimaryKeySelective(scoreProductRule);
54 } 54 }
55 } 55 }
56 } 56 }
@@ -7,7 +7,7 @@ import com.yoho.search.consumer.index.increment.AbstractMqListener; @@ -7,7 +7,7 @@ import com.yoho.search.consumer.index.increment.AbstractMqListener;
7 import com.yoho.search.consumer.service.daoService.ufo.UfoSearchSortRelationService; 7 import com.yoho.search.consumer.service.daoService.ufo.UfoSearchSortRelationService;
8 import com.yoho.search.consumer.service.logicService.cache.BasicDataCacheService; 8 import com.yoho.search.consumer.service.logicService.cache.BasicDataCacheService;
9 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 9 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
10 -import com.yoho.search.dal.model.UfoSearchSortRelation; 10 +import com.yoho.search.dal.model.ufo_product.SearchSortRelation;
11 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
12 import org.springframework.stereotype.Component; 12 import org.springframework.stereotype.Component;
13 13
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
16 * @version 2018/11/8 16 * @version 2018/11/8
17 */ 17 */
18 @Component 18 @Component
19 -@SearchMqConsumerListerner(tableName = "ufo_search_sort_relation") 19 +@SearchMqConsumerListerner(tableName = "ufo_product.search_sort_relation")
20 public class UfoSearchSortRelationMqListener extends AbstractMqListener { 20 public class UfoSearchSortRelationMqListener extends AbstractMqListener {
21 21
22 @Autowired 22 @Autowired
@@ -36,11 +36,11 @@ public class UfoSearchSortRelationMqListener extends AbstractMqListener { @@ -36,11 +36,11 @@ public class UfoSearchSortRelationMqListener extends AbstractMqListener {
36 36
37 @Override 37 @Override
38 protected void updateData(JSONObject data) throws Exception { 38 protected void updateData(JSONObject data) throws Exception {
39 - UfoSearchSortRelation ufoSearchSortRelation = ConvertUtils.toJavaObject(UfoSearchSortRelation.class, data);  
40 - if (ufoSearchSortRelation == null || ufoSearchSortRelation.getUfoSortId() == null) { 39 + SearchSortRelation searchSortRelation = ConvertUtils.toJavaObject(SearchSortRelation.class, data);
  40 + if (searchSortRelation == null || searchSortRelation.getUfoSortId() == null) {
41 return; 41 return;
42 } 42 }
43 - ufoSearchSortRelationService.saveOrUpdate(ufoSearchSortRelation); 43 + ufoSearchSortRelationService.saveOrUpdate(searchSortRelation);
44 } 44 }
45 45
46 @Override 46 @Override
@@ -9,7 +9,7 @@ import com.yoho.search.consumer.index.increment.AbstractMqListener; @@ -9,7 +9,7 @@ import com.yoho.search.consumer.index.increment.AbstractMqListener;
9 import com.yoho.search.consumer.service.daoService.ufo.UfoSizeService; 9 import com.yoho.search.consumer.service.daoService.ufo.UfoSizeService;
10 import com.yoho.search.consumer.service.logicService.cache.BasicDataCacheService; 10 import com.yoho.search.consumer.service.logicService.cache.BasicDataCacheService;
11 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 11 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
12 -import com.yoho.search.dal.model.UfoSize; 12 +import com.yoho.search.dal.model.ufo_product.Size;
13 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Component; 14 import org.springframework.stereotype.Component;
15 15
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Component; @@ -18,7 +18,7 @@ import org.springframework.stereotype.Component;
18 * @version 2018/9/11 18 * @version 2018/9/11
19 */ 19 */
20 @Component 20 @Component
21 -@SearchMqConsumerListerner(tableName = "ufo_size") 21 +@SearchMqConsumerListerner(tableName = "ufo_product.size")
22 public class UfoSizeMqListener extends AbstractMqListener { 22 public class UfoSizeMqListener extends AbstractMqListener {
23 23
24 @Autowired 24 @Autowired
@@ -46,12 +46,12 @@ public class UfoSizeMqListener extends AbstractMqListener { @@ -46,12 +46,12 @@ public class UfoSizeMqListener extends AbstractMqListener {
46 46
47 @Override 47 @Override
48 protected void updateData(JSONObject data) throws Exception { 48 protected void updateData(JSONObject data) throws Exception {
49 - UfoSize ufoSize = ConvertUtils.toJavaObject(UfoSize.class, data);  
50 - if (ufoSize == null || ufoSize.getId() == null) { 49 + Size size = ConvertUtils.toJavaObject(Size.class, data);
  50 + if (size == null || size.getId() == null) {
51 return; 51 return;
52 } 52 }
53 - ufoSizeService.saveOrUpdate(ufoSize);  
54 - indexService.updateIndexData(this.getIndexName(), ufoSize.getId().toString(), ufoSize); 53 + ufoSizeService.saveOrUpdate(size);
  54 + indexService.updateIndexData(this.getIndexName(), size.getId().toString(), size);
55 } 55 }
56 56
57 @Override 57 @Override
@@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum; @@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum;
6 import com.yoho.search.consumer.index.increment.AbstractMqListener; 6 import com.yoho.search.consumer.index.increment.AbstractMqListener;
7 import com.yoho.search.consumer.service.daoService.ufo.UfoStorageService; 7 import com.yoho.search.consumer.service.daoService.ufo.UfoStorageService;
8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
9 -import com.yoho.search.dal.model.UfoStorage; 9 +import com.yoho.search.dal.model.ufo_product.Storage;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
12 12
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
15 * @version 2018/9/11 15 * @version 2018/9/11
16 */ 16 */
17 @Component 17 @Component
18 -@SearchMqConsumerListerner(tableName = "ufo_storage") 18 +@SearchMqConsumerListerner(tableName = "ufo_product.storage")
19 public class UfoStorageMqListener extends AbstractMqListener { 19 public class UfoStorageMqListener extends AbstractMqListener {
20 20
21 @Autowired 21 @Autowired
@@ -30,23 +30,23 @@ public class UfoStorageMqListener extends AbstractMqListener { @@ -30,23 +30,23 @@ public class UfoStorageMqListener extends AbstractMqListener {
30 30
31 @Override 31 @Override
32 protected void deleteData(String id) throws Exception { 32 protected void deleteData(String id) throws Exception {
33 - UfoStorage ufoStorage = ufoStorageService.getById(Integer.valueOf(id)); 33 + Storage storage = ufoStorageService.getById(Integer.valueOf(id));
34 ufoStorageService.delete(Integer.valueOf(id)); 34 ufoStorageService.delete(Integer.valueOf(id));
35 - if (ufoStorage != null) {  
36 - ufoIndexUpdateHelper.updateUfoIndex(ufoStorage.getProductId());  
37 - ufoIndexUpdateHelper.updateYohoIndex(ufoStorage.getProductId()); 35 + if (storage != null) {
  36 + ufoIndexUpdateHelper.updateUfoIndex(storage.getProductId());
  37 + ufoIndexUpdateHelper.updateYohoIndex(storage.getProductId());
38 } 38 }
39 39
40 } 40 }
41 41
42 @Override 42 @Override
43 protected void updateData(JSONObject data) throws Exception { 43 protected void updateData(JSONObject data) throws Exception {
44 - UfoStorage ufoStorage = ConvertUtils.toJavaObject(UfoStorage.class, data);  
45 - if (ufoStorage == null || ufoStorage.getId() == null) { 44 + Storage storage = ConvertUtils.toJavaObject(Storage.class, data);
  45 + if (storage == null || storage.getId() == null) {
46 return; 46 return;
47 } 47 }
48 - ufoStorageService.saveOrUpdate(ufoStorage);  
49 - ufoIndexUpdateHelper.updateUfoIndex(ufoStorage.getProductId());  
50 - ufoIndexUpdateHelper.updateYohoIndex(ufoStorage.getProductId()); 48 + ufoStorageService.saveOrUpdate(storage);
  49 + ufoIndexUpdateHelper.updateUfoIndex(storage.getProductId());
  50 + ufoIndexUpdateHelper.updateYohoIndex(storage.getProductId());
51 } 51 }
52 } 52 }
@@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum; @@ -6,7 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum;
6 import com.yoho.search.consumer.index.increment.AbstractMqListener; 6 import com.yoho.search.consumer.index.increment.AbstractMqListener;
7 import com.yoho.search.consumer.service.daoService.ufo.UfoStoragePriceService; 7 import com.yoho.search.consumer.service.daoService.ufo.UfoStoragePriceService;
8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner; 8 import com.yoho.search.core.message.beans.SearchMqConsumerListerner;
9 -import com.yoho.search.dal.model.UfoStoragePrice; 9 +import com.yoho.search.dal.model.ufo_product.StoragePrice;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
12 12
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
15 * @version 2018/9/11 15 * @version 2018/9/11
16 */ 16 */
17 @Component 17 @Component
18 -@SearchMqConsumerListerner(tableName = "ufo_storage_price") 18 +@SearchMqConsumerListerner(tableName = "ufo_product.storage_price")
19 public class UfoStoragePriceMqListener extends AbstractMqListener { 19 public class UfoStoragePriceMqListener extends AbstractMqListener {
20 20
21 @Autowired 21 @Autowired
@@ -30,23 +30,23 @@ public class UfoStoragePriceMqListener extends AbstractMqListener { @@ -30,23 +30,23 @@ public class UfoStoragePriceMqListener extends AbstractMqListener {
30 30
31 @Override 31 @Override
32 protected void deleteData(String id) throws Exception { 32 protected void deleteData(String id) throws Exception {
33 - UfoStoragePrice ufoStoragePrice = ufoStoragePriceService.getById(Integer.valueOf(id)); 33 + StoragePrice storagePrice = ufoStoragePriceService.getById(Integer.valueOf(id));
34 ufoStoragePriceService.delete(Integer.valueOf(id)); 34 ufoStoragePriceService.delete(Integer.valueOf(id));
35 - if (ufoStoragePrice != null) {  
36 - ufoIndexUpdateHelper.updateUfoIndex(ufoStoragePrice.getProductId());  
37 - ufoIndexUpdateHelper.updateYohoIndex(ufoStoragePrice.getProductId()); 35 + if (storagePrice != null) {
  36 + ufoIndexUpdateHelper.updateUfoIndex(storagePrice.getProductId());
  37 + ufoIndexUpdateHelper.updateYohoIndex(storagePrice.getProductId());
38 } 38 }
39 39
40 } 40 }
41 41
42 @Override 42 @Override
43 protected void updateData(JSONObject data) throws Exception { 43 protected void updateData(JSONObject data) throws Exception {
44 - UfoStoragePrice ufoStoragePrice = ConvertUtils.toJavaObject(UfoStoragePrice.class, data);  
45 - if (ufoStoragePrice == null || ufoStoragePrice.getId() == null) { 44 + StoragePrice storagePrice = ConvertUtils.toJavaObject(StoragePrice.class, data);
  45 + if (storagePrice == null || storagePrice.getId() == null) {
46 return; 46 return;
47 } 47 }
48 - ufoStoragePriceService.saveOrUpdate(ufoStoragePrice);  
49 - ufoIndexUpdateHelper.updateUfoIndex(ufoStoragePrice.getProductId());  
50 - ufoIndexUpdateHelper.updateYohoIndex(ufoStoragePrice.getProductId()); 48 + ufoStoragePriceService.saveOrUpdate(storagePrice);
  49 + ufoIndexUpdateHelper.updateUfoIndex(storagePrice.getProductId());
  50 + ufoIndexUpdateHelper.updateYohoIndex(storagePrice.getProductId());
51 } 51 }
52 } 52 }
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoBrandSeriesMapper; 3 import com.yoho.search.dal.UfoBrandSeriesMapper;
4 -import com.yoho.search.dal.model.UfoBrandSeries; 4 +import com.yoho.search.dal.model.ufo_product.BrandSeries;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoBrandSeriesService { @@ -14,23 +14,23 @@ public class UfoBrandSeriesService {
14 @Autowired 14 @Autowired
15 private UfoBrandSeriesMapper ufoBrandSeriesMapper; 15 private UfoBrandSeriesMapper ufoBrandSeriesMapper;
16 16
17 - public UfoBrandSeries getById(Short id) { 17 + public BrandSeries getById(Short id) {
18 return ufoBrandSeriesMapper.selectByPrimaryKey(id); 18 return ufoBrandSeriesMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoBrandSeries ufoBrandSeries) {  
22 - return ufoBrandSeriesMapper.insertSelective(ufoBrandSeries); 21 + public int insert(BrandSeries brandSeries) {
  22 + return ufoBrandSeriesMapper.insertSelective(brandSeries);
23 } 23 }
24 24
25 - public int update(UfoBrandSeries ufoBrandSeries) {  
26 - return ufoBrandSeriesMapper.updateByPrimaryKeySelective(ufoBrandSeries); 25 + public int update(BrandSeries brandSeries) {
  26 + return ufoBrandSeriesMapper.updateByPrimaryKeySelective(brandSeries);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoBrandSeries ufoBrandSeries) {  
30 - if (ufoBrandSeries.getId() == null || ufoBrandSeriesMapper.selectByPrimaryKey(ufoBrandSeries.getId()) == null) {  
31 - return ufoBrandSeriesMapper.insertSelective(ufoBrandSeries); 29 + public int saveOrUpdate(BrandSeries brandSeries) {
  30 + if (brandSeries.getId() == null || ufoBrandSeriesMapper.selectByPrimaryKey(brandSeries.getId()) == null) {
  31 + return ufoBrandSeriesMapper.insertSelective(brandSeries);
32 } else { 32 } else {
33 - return ufoBrandSeriesMapper.updateByPrimaryKeySelective(ufoBrandSeries); 33 + return ufoBrandSeriesMapper.updateByPrimaryKeySelective(brandSeries);
34 } 34 }
35 } 35 }
36 36
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoBrandMapper; 3 import com.yoho.search.dal.UfoBrandMapper;
4 -import com.yoho.search.dal.model.UfoBrand; 4 +import com.yoho.search.dal.model.ufo_product.Brand;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoBrandService { @@ -14,23 +14,23 @@ public class UfoBrandService {
14 @Autowired 14 @Autowired
15 private UfoBrandMapper ufoBrandMapper; 15 private UfoBrandMapper ufoBrandMapper;
16 16
17 - public UfoBrand getById(Short id) { 17 + public Brand getById(Short id) {
18 return ufoBrandMapper.selectByPrimaryKey(id); 18 return ufoBrandMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoBrand ufoBrand) {  
22 - return ufoBrandMapper.insertSelective(ufoBrand); 21 + public int insert(Brand brand) {
  22 + return ufoBrandMapper.insertSelective(brand);
23 } 23 }
24 24
25 - public int update(UfoBrand ufoBrand) {  
26 - return ufoBrandMapper.updateByPrimaryKeySelective(ufoBrand); 25 + public int update(Brand brand) {
  26 + return ufoBrandMapper.updateByPrimaryKeySelective(brand);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoBrand ufoBrand) {  
30 - if (ufoBrand.getId() == null || ufoBrandMapper.selectByPrimaryKey(ufoBrand.getId()) == null) {  
31 - return ufoBrandMapper.insertSelective(ufoBrand); 29 + public int saveOrUpdate(Brand brand) {
  30 + if (brand.getId() == null || ufoBrandMapper.selectByPrimaryKey(brand.getId()) == null) {
  31 + return ufoBrandMapper.insertSelective(brand);
32 } else { 32 } else {
33 - return ufoBrandMapper.updateByPrimaryKeySelective(ufoBrand); 33 + return ufoBrandMapper.updateByPrimaryKeySelective(brand);
34 } 34 }
35 } 35 }
36 36
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoBuyerOrderGoodsMapper; 3 import com.yoho.search.dal.UfoBuyerOrderGoodsMapper;
4 -import com.yoho.search.dal.UfoBuyerOrderMapper;  
5 -import com.yoho.search.dal.model.UfoBuyerOrder;  
6 -import com.yoho.search.dal.model.UfoBuyerOrderGoods; 4 +import com.yoho.search.dal.model.ufo_order.BuyerOrderGoods;
7 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
9 7
@@ -15,23 +13,23 @@ public class UfoBuyerOrderGoodsService{ @@ -15,23 +13,23 @@ public class UfoBuyerOrderGoodsService{
15 @Autowired 13 @Autowired
16 private UfoBuyerOrderGoodsMapper ufoBuyerOrderGoodsMapper; 14 private UfoBuyerOrderGoodsMapper ufoBuyerOrderGoodsMapper;
17 15
18 - public UfoBuyerOrderGoods getById(Integer id) { 16 + public BuyerOrderGoods getById(Integer id) {
19 return ufoBuyerOrderGoodsMapper.selectByPrimaryKey(id); 17 return ufoBuyerOrderGoodsMapper.selectByPrimaryKey(id);
20 } 18 }
21 19
22 - public int insert(UfoBuyerOrderGoods ufoBuyerOrderGoods) {  
23 - return ufoBuyerOrderGoodsMapper.insertSelective(ufoBuyerOrderGoods); 20 + public int insert(BuyerOrderGoods buyerOrderGoods) {
  21 + return ufoBuyerOrderGoodsMapper.insertSelective(buyerOrderGoods);
24 } 22 }
25 23
26 - public int update(UfoBuyerOrderGoods ufoBuyerOrderGoods) {  
27 - return ufoBuyerOrderGoodsMapper.updateByPrimaryKeySelective(ufoBuyerOrderGoods); 24 + public int update(BuyerOrderGoods buyerOrderGoods) {
  25 + return ufoBuyerOrderGoodsMapper.updateByPrimaryKeySelective(buyerOrderGoods);
28 } 26 }
29 27
30 - public int saveOrUpdate(UfoBuyerOrderGoods ufoBuyerOrderGoods) {  
31 - if (ufoBuyerOrderGoods.getId() == null || ufoBuyerOrderGoodsMapper.selectByPrimaryKey(ufoBuyerOrderGoods.getId()) == null) {  
32 - return ufoBuyerOrderGoodsMapper.insertSelective(ufoBuyerOrderGoods); 28 + public int saveOrUpdate(BuyerOrderGoods buyerOrderGoods) {
  29 + if (buyerOrderGoods.getId() == null || ufoBuyerOrderGoodsMapper.selectByPrimaryKey(buyerOrderGoods.getId()) == null) {
  30 + return ufoBuyerOrderGoodsMapper.insertSelective(buyerOrderGoods);
33 } else { 31 } else {
34 - return ufoBuyerOrderGoodsMapper.updateByPrimaryKeySelective(ufoBuyerOrderGoods); 32 + return ufoBuyerOrderGoodsMapper.updateByPrimaryKeySelective(buyerOrderGoods);
35 } 33 }
36 } 34 }
37 35
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 -import com.yoho.search.dal.UfoBrandMapper;  
4 import com.yoho.search.dal.UfoBuyerOrderMapper; 3 import com.yoho.search.dal.UfoBuyerOrderMapper;
5 -import com.yoho.search.dal.model.UfoBrand;  
6 -import com.yoho.search.dal.model.UfoBuyerOrder; 4 +import com.yoho.search.dal.model.ufo_order.BuyerOrder;
7 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
9 7
@@ -15,23 +13,23 @@ public class UfoBuyerOrderService { @@ -15,23 +13,23 @@ public class UfoBuyerOrderService {
15 @Autowired 13 @Autowired
16 private UfoBuyerOrderMapper ufoBuyerOrderMapper; 14 private UfoBuyerOrderMapper ufoBuyerOrderMapper;
17 15
18 - public UfoBuyerOrder getById(Integer id) { 16 + public BuyerOrder getById(Integer id) {
19 return ufoBuyerOrderMapper.selectByPrimaryKey(id); 17 return ufoBuyerOrderMapper.selectByPrimaryKey(id);
20 } 18 }
21 19
22 - public int insert(UfoBuyerOrder ufoBuyerOrder) {  
23 - return ufoBuyerOrderMapper.insertSelective(ufoBuyerOrder); 20 + public int insert(BuyerOrder buyerOrder) {
  21 + return ufoBuyerOrderMapper.insertSelective(buyerOrder);
24 } 22 }
25 23
26 - public int update(UfoBuyerOrder ufoBuyerOrder) {  
27 - return ufoBuyerOrderMapper.updateByPrimaryKeySelective(ufoBuyerOrder); 24 + public int update(BuyerOrder buyerOrder) {
  25 + return ufoBuyerOrderMapper.updateByPrimaryKeySelective(buyerOrder);
28 } 26 }
29 27
30 - public int saveOrUpdate(UfoBuyerOrder ufoBuyerOrder) {  
31 - if (ufoBuyerOrder.getId() == null || ufoBuyerOrderMapper.selectByPrimaryKey(ufoBuyerOrder.getId()) == null) {  
32 - return ufoBuyerOrderMapper.insertSelective(ufoBuyerOrder); 28 + public int saveOrUpdate(BuyerOrder buyerOrder) {
  29 + if (buyerOrder.getId() == null || ufoBuyerOrderMapper.selectByPrimaryKey(buyerOrder.getId()) == null) {
  30 + return ufoBuyerOrderMapper.insertSelective(buyerOrder);
33 } else { 31 } else {
34 - return ufoBuyerOrderMapper.updateByPrimaryKeySelective(ufoBuyerOrder); 32 + return ufoBuyerOrderMapper.updateByPrimaryKeySelective(buyerOrder);
35 } 33 }
36 } 34 }
37 35
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoGoodsImagesMapper; 3 import com.yoho.search.dal.UfoGoodsImagesMapper;
4 -import com.yoho.search.dal.model.UfoGoodsImages; 4 +import com.yoho.search.dal.model.ufo_product.GoodsImages;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoGoodsImagesService { @@ -14,23 +14,23 @@ public class UfoGoodsImagesService {
14 @Autowired 14 @Autowired
15 private UfoGoodsImagesMapper ufoGoodsImagesMapper; 15 private UfoGoodsImagesMapper ufoGoodsImagesMapper;
16 16
17 - public UfoGoodsImages getById(Integer id) { 17 + public GoodsImages getById(Integer id) {
18 return ufoGoodsImagesMapper.selectByPrimaryKey(id); 18 return ufoGoodsImagesMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoGoodsImages ufoGoodsImages) {  
22 - return ufoGoodsImagesMapper.insertSelective(ufoGoodsImages); 21 + public int insert(GoodsImages goodsImages) {
  22 + return ufoGoodsImagesMapper.insertSelective(goodsImages);
23 } 23 }
24 24
25 - public int update(UfoGoodsImages ufoGoodsImages) {  
26 - return ufoGoodsImagesMapper.updateByPrimaryKeySelective(ufoGoodsImages); 25 + public int update(GoodsImages goodsImages) {
  26 + return ufoGoodsImagesMapper.updateByPrimaryKeySelective(goodsImages);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoGoodsImages ufoGoodsImages) {  
30 - if (ufoGoodsImages.getId() == null || ufoGoodsImagesMapper.selectByPrimaryKey(ufoGoodsImages.getId()) == null) {  
31 - return ufoGoodsImagesMapper.insertSelective(ufoGoodsImages); 29 + public int saveOrUpdate(GoodsImages goodsImages) {
  30 + if (goodsImages.getId() == null || ufoGoodsImagesMapper.selectByPrimaryKey(goodsImages.getId()) == null) {
  31 + return ufoGoodsImagesMapper.insertSelective(goodsImages);
32 } else { 32 } else {
33 - return ufoGoodsImagesMapper.updateByPrimaryKeySelective(ufoGoodsImages); 33 + return ufoGoodsImagesMapper.updateByPrimaryKeySelective(goodsImages);
34 } 34 }
35 } 35 }
36 36
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoGoodsMapper; 3 import com.yoho.search.dal.UfoGoodsMapper;
4 -import com.yoho.search.dal.model.UfoGoods; 4 +import com.yoho.search.dal.model.ufo_product.Goods;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoGoodsService { @@ -14,23 +14,23 @@ public class UfoGoodsService {
14 @Autowired 14 @Autowired
15 private UfoGoodsMapper ufoGoodsMapper; 15 private UfoGoodsMapper ufoGoodsMapper;
16 16
17 - public UfoGoods getById(Integer id) { 17 + public Goods getById(Integer id) {
18 return ufoGoodsMapper.selectByPrimaryKey(id); 18 return ufoGoodsMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoGoods ufoGoods) {  
22 - return ufoGoodsMapper.insertSelective(ufoGoods); 21 + public int insert(Goods goods) {
  22 + return ufoGoodsMapper.insertSelective(goods);
23 } 23 }
24 24
25 - public int update(UfoGoods ufoGoods) {  
26 - return ufoGoodsMapper.updateByPrimaryKeySelective(ufoGoods); 25 + public int update(Goods goods) {
  26 + return ufoGoodsMapper.updateByPrimaryKeySelective(goods);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoGoods ufoGoods) {  
30 - if (ufoGoods.getId() == null || ufoGoodsMapper.selectByPrimaryKey(ufoGoods.getId()) == null) {  
31 - return ufoGoodsMapper.insertSelective(ufoGoods); 29 + public int saveOrUpdate(Goods goods) {
  30 + if (goods.getId() == null || ufoGoodsMapper.selectByPrimaryKey(goods.getId()) == null) {
  31 + return ufoGoodsMapper.insertSelective(goods);
32 } else { 32 } else {
33 - return ufoGoodsMapper.updateByPrimaryKeySelective(ufoGoods); 33 + return ufoGoodsMapper.updateByPrimaryKeySelective(goods);
34 } 34 }
35 } 35 }
36 36
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoProductColorMapper; 3 import com.yoho.search.dal.UfoProductColorMapper;
4 -import com.yoho.search.dal.model.UfoProductColor; 4 +import com.yoho.search.dal.model.ufo_product.ProductColor;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoProductColorService { @@ -14,23 +14,23 @@ public class UfoProductColorService {
14 @Autowired 14 @Autowired
15 private UfoProductColorMapper ufoProductColorMapper; 15 private UfoProductColorMapper ufoProductColorMapper;
16 16
17 - public UfoProductColor getById(Short id) { 17 + public ProductColor getById(Short id) {
18 return ufoProductColorMapper.selectByPrimaryKey(id); 18 return ufoProductColorMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoProductColor ufoProductColor) {  
22 - return ufoProductColorMapper.insertSelective(ufoProductColor); 21 + public int insert(ProductColor productColor) {
  22 + return ufoProductColorMapper.insertSelective(productColor);
23 } 23 }
24 24
25 - public int update(UfoProductColor ufoProductColor) {  
26 - return ufoProductColorMapper.updateByPrimaryKeySelective(ufoProductColor); 25 + public int update(ProductColor productColor) {
  26 + return ufoProductColorMapper.updateByPrimaryKeySelective(productColor);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoProductColor ufoProductColor) {  
30 - if (ufoProductColor.getId() == null || ufoProductColorMapper.selectByPrimaryKey(ufoProductColor.getId()) == null) {  
31 - return ufoProductColorMapper.insertSelective(ufoProductColor); 29 + public int saveOrUpdate(ProductColor productColor) {
  30 + if (productColor.getId() == null || ufoProductColorMapper.selectByPrimaryKey(productColor.getId()) == null) {
  31 + return ufoProductColorMapper.insertSelective(productColor);
32 } else { 32 } else {
33 - return ufoProductColorMapper.updateByPrimaryKeySelective(ufoProductColor); 33 + return ufoProductColorMapper.updateByPrimaryKeySelective(productColor);
34 } 34 }
35 } 35 }
36 36
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoProductPoolDetailMapper; 3 import com.yoho.search.dal.UfoProductPoolDetailMapper;
4 -import com.yoho.search.dal.model.UfoProductPoolDetail; 4 +import com.yoho.search.dal.model.ufo_product.ProductPoolDetail;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoProductPoolDetailService { @@ -14,23 +14,23 @@ public class UfoProductPoolDetailService {
14 @Autowired 14 @Autowired
15 private UfoProductPoolDetailMapper ufoProductPoolDetailMapper; 15 private UfoProductPoolDetailMapper ufoProductPoolDetailMapper;
16 16
17 - public UfoProductPoolDetail getById(Integer id) { 17 + public ProductPoolDetail getById(Integer id) {
18 return ufoProductPoolDetailMapper.selectByPrimaryKey(id); 18 return ufoProductPoolDetailMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoProductPoolDetail ufoProductPoolDetail) {  
22 - return ufoProductPoolDetailMapper.insertSelective(ufoProductPoolDetail); 21 + public int insert(ProductPoolDetail productPoolDetail) {
  22 + return ufoProductPoolDetailMapper.insertSelective(productPoolDetail);
23 } 23 }
24 24
25 - public int update(UfoProductPoolDetail ufoProductPoolDetail) {  
26 - return ufoProductPoolDetailMapper.updateByPrimaryKeySelective(ufoProductPoolDetail); 25 + public int update(ProductPoolDetail productPoolDetail) {
  26 + return ufoProductPoolDetailMapper.updateByPrimaryKeySelective(productPoolDetail);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoProductPoolDetail ufoProductPoolDetail) {  
30 - if (ufoProductPoolDetail.getId() == null || ufoProductPoolDetailMapper.selectByPrimaryKey(ufoProductPoolDetail.getId()) == null) {  
31 - return ufoProductPoolDetailMapper.insertSelective(ufoProductPoolDetail); 29 + public int saveOrUpdate(ProductPoolDetail productPoolDetail) {
  30 + if (productPoolDetail.getId() == null || ufoProductPoolDetailMapper.selectByPrimaryKey(productPoolDetail.getId()) == null) {
  31 + return ufoProductPoolDetailMapper.insertSelective(productPoolDetail);
32 } else { 32 } else {
33 - return ufoProductPoolDetailMapper.updateByPrimaryKeySelective(ufoProductPoolDetail); 33 + return ufoProductPoolDetailMapper.updateByPrimaryKeySelective(productPoolDetail);
34 } 34 }
35 } 35 }
36 36
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoProductPoolMapper; 3 import com.yoho.search.dal.UfoProductPoolMapper;
4 -import com.yoho.search.dal.model.UfoProductPool; 4 +import com.yoho.search.dal.model.ufo_product.ProductPool;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoProductPoolService { @@ -14,23 +14,23 @@ public class UfoProductPoolService {
14 @Autowired 14 @Autowired
15 private UfoProductPoolMapper ufoProductPoolMapper; 15 private UfoProductPoolMapper ufoProductPoolMapper;
16 16
17 - public UfoProductPool getById(Integer id) { 17 + public ProductPool getById(Integer id) {
18 return ufoProductPoolMapper.selectByPrimaryKey(id); 18 return ufoProductPoolMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoProductPool ufoProductPool) {  
22 - return ufoProductPoolMapper.insertSelective(ufoProductPool); 21 + public int insert(ProductPool productPool) {
  22 + return ufoProductPoolMapper.insertSelective(productPool);
23 } 23 }
24 24
25 - public int update(UfoProductPool ufoProductPool) {  
26 - return ufoProductPoolMapper.updateByPrimaryKeySelective(ufoProductPool); 25 + public int update(ProductPool productPool) {
  26 + return ufoProductPoolMapper.updateByPrimaryKeySelective(productPool);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoProductPool ufoProductPool) {  
30 - if (ufoProductPool.getId() == null || ufoProductPoolMapper.selectByPrimaryKey(ufoProductPool.getId()) == null) {  
31 - return ufoProductPoolMapper.insertSelective(ufoProductPool); 29 + public int saveOrUpdate(ProductPool productPool) {
  30 + if (productPool.getId() == null || ufoProductPoolMapper.selectByPrimaryKey(productPool.getId()) == null) {
  31 + return ufoProductPoolMapper.insertSelective(productPool);
32 } else { 32 } else {
33 - return ufoProductPoolMapper.updateByPrimaryKeySelective(ufoProductPool); 33 + return ufoProductPoolMapper.updateByPrimaryKeySelective(productPool);
34 } 34 }
35 } 35 }
36 36
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoProductMapper; 3 import com.yoho.search.dal.UfoProductMapper;
4 -import com.yoho.search.dal.model.UfoProduct; 4 +import com.yoho.search.dal.model.ufo_product.Product;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,19 +14,19 @@ public class UfoProductService { @@ -14,19 +14,19 @@ public class UfoProductService {
14 @Autowired 14 @Autowired
15 private UfoProductMapper sizeMapper; 15 private UfoProductMapper sizeMapper;
16 16
17 - public UfoProduct getById(Integer id) { 17 + public Product getById(Integer id) {
18 return sizeMapper.selectByPrimaryKey(id); 18 return sizeMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoProduct size) { 21 + public int insert(Product size) {
22 return sizeMapper.insertSelective(size); 22 return sizeMapper.insertSelective(size);
23 } 23 }
24 24
25 - public int update(UfoProduct size) { 25 + public int update(Product size) {
26 return sizeMapper.updateByPrimaryKeySelective(size); 26 return sizeMapper.updateByPrimaryKeySelective(size);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoProduct size) { 29 + public int saveOrUpdate(Product size) {
30 if (size.getId() == null || sizeMapper.selectByPrimaryKey(size.getId()) == null) { 30 if (size.getId() == null || sizeMapper.selectByPrimaryKey(size.getId()) == null) {
31 return sizeMapper.insertSelective(size); 31 return sizeMapper.insertSelective(size);
32 } else { 32 } else {
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoProductSortMapper; 3 import com.yoho.search.dal.UfoProductSortMapper;
4 -import com.yoho.search.dal.model.UfoProductSort; 4 +import com.yoho.search.dal.model.ufo_product.ProductSort;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoProductSortService { @@ -14,23 +14,23 @@ public class UfoProductSortService {
14 @Autowired 14 @Autowired
15 private UfoProductSortMapper ufoProductSortMapper; 15 private UfoProductSortMapper ufoProductSortMapper;
16 16
17 - public UfoProductSort getById(Short id) { 17 + public ProductSort getById(Short id) {
18 return ufoProductSortMapper.selectByPrimaryKey(id); 18 return ufoProductSortMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoProductSort ufoProductSort) {  
22 - return ufoProductSortMapper.insertSelective(ufoProductSort); 21 + public int insert(ProductSort productSort) {
  22 + return ufoProductSortMapper.insertSelective(productSort);
23 } 23 }
24 24
25 - public int update(UfoProductSort ufoProductSort) {  
26 - return ufoProductSortMapper.updateByPrimaryKeySelective(ufoProductSort); 25 + public int update(ProductSort productSort) {
  26 + return ufoProductSortMapper.updateByPrimaryKeySelective(productSort);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoProductSort ufoProductSort) {  
30 - if (ufoProductSort.getId() == null || ufoProductSortMapper.selectByPrimaryKey(ufoProductSort.getId()) == null) {  
31 - return ufoProductSortMapper.insertSelective(ufoProductSort); 29 + public int saveOrUpdate(ProductSort productSort) {
  30 + if (productSort.getId() == null || ufoProductSortMapper.selectByPrimaryKey(productSort.getId()) == null) {
  31 + return ufoProductSortMapper.insertSelective(productSort);
32 } else { 32 } else {
33 - return ufoProductSortMapper.updateByPrimaryKeySelective(ufoProductSort); 33 + return ufoProductSortMapper.updateByPrimaryKeySelective(productSort);
34 } 34 }
35 } 35 }
36 36
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoSearchSortRelationMapper; 3 import com.yoho.search.dal.UfoSearchSortRelationMapper;
4 -import com.yoho.search.dal.model.UfoSearchSortRelation; 4 +import com.yoho.search.dal.model.ufo_product.SearchSortRelation;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoSearchSortRelationService { @@ -14,23 +14,23 @@ public class UfoSearchSortRelationService {
14 @Autowired 14 @Autowired
15 private UfoSearchSortRelationMapper ufoSearchSortRelationMapper; 15 private UfoSearchSortRelationMapper ufoSearchSortRelationMapper;
16 16
17 - public UfoSearchSortRelation getById(Integer id) { 17 + public SearchSortRelation getById(Integer id) {
18 return ufoSearchSortRelationMapper.selectByPrimaryKey(id); 18 return ufoSearchSortRelationMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoSearchSortRelation ufoSearchSortRelation) {  
22 - return ufoSearchSortRelationMapper.insertSelective(ufoSearchSortRelation); 21 + public int insert(SearchSortRelation searchSortRelation) {
  22 + return ufoSearchSortRelationMapper.insertSelective(searchSortRelation);
23 } 23 }
24 24
25 - public int update(UfoSearchSortRelation ufoSearchSortRelation) {  
26 - return ufoSearchSortRelationMapper.updateByPrimaryKeySelective(ufoSearchSortRelation); 25 + public int update(SearchSortRelation searchSortRelation) {
  26 + return ufoSearchSortRelationMapper.updateByPrimaryKeySelective(searchSortRelation);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoSearchSortRelation ufoSearchSortRelation) {  
30 - if (ufoSearchSortRelation.getUfoSortId() == null || ufoSearchSortRelationMapper.selectByPrimaryKey(ufoSearchSortRelation.getUfoSortId()) == null) {  
31 - return ufoSearchSortRelationMapper.insertSelective(ufoSearchSortRelation); 29 + public int saveOrUpdate(SearchSortRelation searchSortRelation) {
  30 + if (searchSortRelation.getUfoSortId() == null || ufoSearchSortRelationMapper.selectByPrimaryKey(searchSortRelation.getUfoSortId()) == null) {
  31 + return ufoSearchSortRelationMapper.insertSelective(searchSortRelation);
32 } else { 32 } else {
33 - return ufoSearchSortRelationMapper.updateByPrimaryKeySelective(ufoSearchSortRelation); 33 + return ufoSearchSortRelationMapper.updateByPrimaryKeySelective(searchSortRelation);
34 } 34 }
35 } 35 }
36 36
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoSizeMapper; 3 import com.yoho.search.dal.UfoSizeMapper;
4 -import com.yoho.search.dal.model.UfoSize; 4 +import com.yoho.search.dal.model.ufo_product.Size;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoSizeService { @@ -14,23 +14,23 @@ public class UfoSizeService {
14 @Autowired 14 @Autowired
15 private UfoSizeMapper ufoSizeMapper; 15 private UfoSizeMapper ufoSizeMapper;
16 16
17 - public UfoSize getById(Short id) { 17 + public Size getById(Short id) {
18 return ufoSizeMapper.selectByPrimaryKey(id); 18 return ufoSizeMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoSize ufoSize) {  
22 - return ufoSizeMapper.insertSelective(ufoSize); 21 + public int insert(Size size) {
  22 + return ufoSizeMapper.insertSelective(size);
23 } 23 }
24 24
25 - public int update(UfoSize ufoSize) {  
26 - return ufoSizeMapper.updateByPrimaryKeySelective(ufoSize); 25 + public int update(Size size) {
  26 + return ufoSizeMapper.updateByPrimaryKeySelective(size);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoSize ufoSize) {  
30 - if (ufoSize.getId() == null || ufoSizeMapper.selectByPrimaryKey(ufoSize.getId()) == null) {  
31 - return ufoSizeMapper.insertSelective(ufoSize); 29 + public int saveOrUpdate(Size size) {
  30 + if (size.getId() == null || ufoSizeMapper.selectByPrimaryKey(size.getId()) == null) {
  31 + return ufoSizeMapper.insertSelective(size);
32 } else { 32 } else {
33 - return ufoSizeMapper.updateByPrimaryKeySelective(ufoSize); 33 + return ufoSizeMapper.updateByPrimaryKeySelective(size);
34 } 34 }
35 } 35 }
36 36
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoStoragePriceMapper; 3 import com.yoho.search.dal.UfoStoragePriceMapper;
4 -import com.yoho.search.dal.model.UfoStoragePrice; 4 +import com.yoho.search.dal.model.ufo_product.StoragePrice;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoStoragePriceService { @@ -14,23 +14,23 @@ public class UfoStoragePriceService {
14 @Autowired 14 @Autowired
15 private UfoStoragePriceMapper ufoStoragePriceMapper; 15 private UfoStoragePriceMapper ufoStoragePriceMapper;
16 16
17 - public UfoStoragePrice getById(Integer id) { 17 + public StoragePrice getById(Integer id) {
18 return ufoStoragePriceMapper.selectByPrimaryKey(id); 18 return ufoStoragePriceMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoStoragePrice ufoStoragePrice) {  
22 - return ufoStoragePriceMapper.insertSelective(ufoStoragePrice); 21 + public int insert(StoragePrice storagePrice) {
  22 + return ufoStoragePriceMapper.insertSelective(storagePrice);
23 } 23 }
24 24
25 - public int update(UfoStoragePrice ufoStoragePrice) {  
26 - return ufoStoragePriceMapper.updateByPrimaryKeySelective(ufoStoragePrice); 25 + public int update(StoragePrice storagePrice) {
  26 + return ufoStoragePriceMapper.updateByPrimaryKeySelective(storagePrice);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoStoragePrice ufoStoragePrice) {  
30 - if (ufoStoragePrice.getId() == null || ufoStoragePriceMapper.selectByPrimaryKey(ufoStoragePrice.getId()) == null) {  
31 - return ufoStoragePriceMapper.insertSelective(ufoStoragePrice); 29 + public int saveOrUpdate(StoragePrice storagePrice) {
  30 + if (storagePrice.getId() == null || ufoStoragePriceMapper.selectByPrimaryKey(storagePrice.getId()) == null) {
  31 + return ufoStoragePriceMapper.insertSelective(storagePrice);
32 } else { 32 } else {
33 - return ufoStoragePriceMapper.updateByPrimaryKeySelective(ufoStoragePrice); 33 + return ufoStoragePriceMapper.updateByPrimaryKeySelective(storagePrice);
34 } 34 }
35 } 35 }
36 36
1 package com.yoho.search.consumer.service.daoService.ufo; 1 package com.yoho.search.consumer.service.daoService.ufo;
2 2
3 import com.yoho.search.dal.UfoStorageMapper; 3 import com.yoho.search.dal.UfoStorageMapper;
4 -import com.yoho.search.dal.model.UfoStorage; 4 +import com.yoho.search.dal.model.ufo_product.Storage;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
@@ -14,23 +14,23 @@ public class UfoStorageService { @@ -14,23 +14,23 @@ public class UfoStorageService {
14 @Autowired 14 @Autowired
15 private UfoStorageMapper ufoStorageMapper; 15 private UfoStorageMapper ufoStorageMapper;
16 16
17 - public UfoStorage getById(Integer id) { 17 + public Storage getById(Integer id) {
18 return ufoStorageMapper.selectByPrimaryKey(id); 18 return ufoStorageMapper.selectByPrimaryKey(id);
19 } 19 }
20 20
21 - public int insert(UfoStorage ufoStorage) {  
22 - return ufoStorageMapper.insertSelective(ufoStorage); 21 + public int insert(Storage storage) {
  22 + return ufoStorageMapper.insertSelective(storage);
23 } 23 }
24 24
25 - public int update(UfoStorage ufoStorage) {  
26 - return ufoStorageMapper.updateByPrimaryKeySelective(ufoStorage); 25 + public int update(Storage storage) {
  26 + return ufoStorageMapper.updateByPrimaryKeySelective(storage);
27 } 27 }
28 28
29 - public int saveOrUpdate(UfoStorage ufoStorage) {  
30 - if (ufoStorage.getId() == null || ufoStorageMapper.selectByPrimaryKey(ufoStorage.getId()) == null) {  
31 - return ufoStorageMapper.insertSelective(ufoStorage); 29 + public int saveOrUpdate(Storage storage) {
  30 + if (storage.getId() == null || ufoStorageMapper.selectByPrimaryKey(storage.getId()) == null) {
  31 + return ufoStorageMapper.insertSelective(storage);
32 } else { 32 } else {
33 - return ufoStorageMapper.updateByPrimaryKeySelective(ufoStorage); 33 + return ufoStorageMapper.updateByPrimaryKeySelective(storage);
34 } 34 }
35 } 35 }
36 36
@@ -4,6 +4,11 @@ import com.google.common.cache.CacheBuilder; @@ -4,6 +4,11 @@ import com.google.common.cache.CacheBuilder;
4 import com.google.common.cache.CacheLoader; 4 import com.google.common.cache.CacheLoader;
5 import com.google.common.cache.LoadingCache; 5 import com.google.common.cache.LoadingCache;
6 import com.yoho.search.dal.model.*; 6 import com.yoho.search.dal.model.*;
  7 +import com.yoho.search.dal.model.Brand;
  8 +import com.yoho.search.dal.model.ProductColor;
  9 +import com.yoho.search.dal.model.ProductSort;
  10 +import com.yoho.search.dal.model.Size;
  11 +import com.yoho.search.dal.model.ufo_product.*;
7 import org.slf4j.Logger; 12 import org.slf4j.Logger;
8 import org.slf4j.LoggerFactory; 13 import org.slf4j.LoggerFactory;
9 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
@@ -398,15 +403,15 @@ public class BasicDataCacheService { @@ -398,15 +403,15 @@ public class BasicDataCacheService {
398 } 403 }
399 404
400 //UFO品牌 405 //UFO品牌
401 - LoadingCache<String, Map<Short, UfoBrand>> ufoBrandCache = CacheBuilder.newBuilder() 406 + LoadingCache<String, Map<Short, com.yoho.search.dal.model.ufo_product.Brand>> ufoBrandCache = CacheBuilder.newBuilder()
402 .expireAfterWrite(10, TimeUnit.MINUTES) 407 .expireAfterWrite(10, TimeUnit.MINUTES)
403 - .build(new CacheLoader<String, Map<Short, UfoBrand>>() {  
404 - public Map<Short, UfoBrand> load(String key) { 408 + .build(new CacheLoader<String, Map<Short, com.yoho.search.dal.model.ufo_product.Brand>>() {
  409 + public Map<Short, com.yoho.search.dal.model.ufo_product.Brand> load(String key) {
405 return basicDataLogicService.getUfoBrandMap(); 410 return basicDataLogicService.getUfoBrandMap();
406 } 411 }
407 }); 412 });
408 413
409 - public Map<Short, UfoBrand> getUfoBrand() { 414 + public Map<Short, com.yoho.search.dal.model.ufo_product.Brand> getUfoBrand() {
410 try { 415 try {
411 return ufoBrandCache.get(UFO_BRAND_CACHE_KEY); 416 return ufoBrandCache.get(UFO_BRAND_CACHE_KEY);
412 } catch (Exception e) { 417 } catch (Exception e) {
@@ -420,15 +425,15 @@ public class BasicDataCacheService { @@ -420,15 +425,15 @@ public class BasicDataCacheService {
420 } 425 }
421 426
422 //UFO系列 427 //UFO系列
423 - LoadingCache<String, Map<Short, UfoBrandSeries>> ufoBrandSeriesCache = CacheBuilder.newBuilder() 428 + LoadingCache<String, Map<Short, BrandSeries>> ufoBrandSeriesCache = CacheBuilder.newBuilder()
424 .expireAfterWrite(10, TimeUnit.MINUTES) 429 .expireAfterWrite(10, TimeUnit.MINUTES)
425 - .build(new CacheLoader<String, Map<Short, UfoBrandSeries>>() {  
426 - public Map<Short, UfoBrandSeries> load(String key) { 430 + .build(new CacheLoader<String, Map<Short, BrandSeries>>() {
  431 + public Map<Short, BrandSeries> load(String key) {
427 return basicDataLogicService.getUfoBrandSeriesMap(); 432 return basicDataLogicService.getUfoBrandSeriesMap();
428 } 433 }
429 }); 434 });
430 435
431 - public Map<Short, UfoBrandSeries> getUfoBrandSeries() { 436 + public Map<Short, BrandSeries> getUfoBrandSeries() {
432 try { 437 try {
433 return ufoBrandSeriesCache.get(UFO_BRAND_SERIES_CACHE_KEY); 438 return ufoBrandSeriesCache.get(UFO_BRAND_SERIES_CACHE_KEY);
434 } catch (Exception e) { 439 } catch (Exception e) {
@@ -443,15 +448,15 @@ public class BasicDataCacheService { @@ -443,15 +448,15 @@ public class BasicDataCacheService {
443 448
444 449
445 //UFO尺码 450 //UFO尺码
446 - LoadingCache<String, Map<Short, UfoSize>> ufoSizeCache = CacheBuilder.newBuilder() 451 + LoadingCache<String, Map<Short, com.yoho.search.dal.model.ufo_product.Size>> ufoSizeCache = CacheBuilder.newBuilder()
447 .expireAfterWrite(10, TimeUnit.MINUTES) 452 .expireAfterWrite(10, TimeUnit.MINUTES)
448 - .build(new CacheLoader<String, Map<Short, UfoSize>>() {  
449 - public Map<Short, UfoSize> load(String key) { 453 + .build(new CacheLoader<String, Map<Short, com.yoho.search.dal.model.ufo_product.Size>>() {
  454 + public Map<Short, com.yoho.search.dal.model.ufo_product.Size> load(String key) {
450 return basicDataLogicService.getUfoSizeMap(); 455 return basicDataLogicService.getUfoSizeMap();
451 } 456 }
452 }); 457 });
453 458
454 - public Map<Short, UfoSize> getUfoSize() { 459 + public Map<Short, com.yoho.search.dal.model.ufo_product.Size> getUfoSize() {
455 try { 460 try {
456 return ufoSizeCache.get(UFO_SIZE_CACHE_KEY); 461 return ufoSizeCache.get(UFO_SIZE_CACHE_KEY);
457 } catch (Exception e) { 462 } catch (Exception e) {
@@ -510,15 +515,15 @@ public class BasicDataCacheService { @@ -510,15 +515,15 @@ public class BasicDataCacheService {
510 } 515 }
511 516
512 //UFO品类映射 517 //UFO品类映射
513 - LoadingCache<String, Map<Integer, UfoSearchSortRelation>> ufoSortRelationCache = CacheBuilder.newBuilder() 518 + LoadingCache<String, Map<Integer, SearchSortRelation>> ufoSortRelationCache = CacheBuilder.newBuilder()
514 .expireAfterWrite(10, TimeUnit.MINUTES) 519 .expireAfterWrite(10, TimeUnit.MINUTES)
515 - .build(new CacheLoader<String, Map<Integer, UfoSearchSortRelation>>() {  
516 - public Map<Integer, UfoSearchSortRelation> load(String key) { 520 + .build(new CacheLoader<String, Map<Integer, SearchSortRelation>>() {
  521 + public Map<Integer, SearchSortRelation> load(String key) {
517 return basicDataLogicService.getUfoYohoSortRelationMap(); 522 return basicDataLogicService.getUfoYohoSortRelationMap();
518 } 523 }
519 }); 524 });
520 525
521 - public Map<Integer, UfoSearchSortRelation> getUfoSortRelationMap() { 526 + public Map<Integer, SearchSortRelation> getUfoSortRelationMap() {
522 try { 527 try {
523 return ufoSortRelationCache.get(UFO_SORT_RELATION_CACHE_KEY); 528 return ufoSortRelationCache.get(UFO_SORT_RELATION_CACHE_KEY);
524 } catch (Exception e) { 529 } catch (Exception e) {
@@ -8,6 +8,11 @@ import com.yoho.search.consumer.service.logicService.tbl.TblSortRelationLogicSer @@ -8,6 +8,11 @@ import com.yoho.search.consumer.service.logicService.tbl.TblSortRelationLogicSer
8 import com.yoho.search.consumer.service.utils.BrandRelationUtils; 8 import com.yoho.search.consumer.service.utils.BrandRelationUtils;
9 import com.yoho.search.dal.*; 9 import com.yoho.search.dal.*;
10 import com.yoho.search.dal.model.*; 10 import com.yoho.search.dal.model.*;
  11 +import com.yoho.search.dal.model.Brand;
  12 +import com.yoho.search.dal.model.ProductColor;
  13 +import com.yoho.search.dal.model.ProductSort;
  14 +import com.yoho.search.dal.model.Size;
  15 +import com.yoho.search.dal.model.ufo_product.*;
11 import org.apache.commons.collections.CollectionUtils; 16 import org.apache.commons.collections.CollectionUtils;
12 import org.springframework.beans.factory.annotation.Autowired; 17 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Service; 18 import org.springframework.stereotype.Service;
@@ -208,39 +213,39 @@ public class BasicDataLogicService { @@ -208,39 +213,39 @@ public class BasicDataLogicService {
208 return sortMapList; 213 return sortMapList;
209 } 214 }
210 215
211 - public Map<Short, UfoBrand> getUfoBrandMap() {  
212 - Map<Short, UfoBrand> ufoBrandMap = new HashMap<>();  
213 - List<UfoBrand> ufoBrandList = ufoBrandMapper.selectPageList(0, Integer.MAX_VALUE);  
214 - if (CollectionUtils.isNotEmpty(ufoBrandList)) {  
215 - ufoBrandMap = ufoBrandList.stream().collect(Collectors.toMap(UfoBrand::getId, (p) -> p)); 216 + public Map<Short, com.yoho.search.dal.model.ufo_product.Brand> getUfoBrandMap() {
  217 + Map<Short, com.yoho.search.dal.model.ufo_product.Brand> ufoBrandMap = new HashMap<>();
  218 + List<com.yoho.search.dal.model.ufo_product.Brand> brandList = ufoBrandMapper.selectPageList(0, Integer.MAX_VALUE);
  219 + if (CollectionUtils.isNotEmpty(brandList)) {
  220 + ufoBrandMap = brandList.stream().collect(Collectors.toMap(com.yoho.search.dal.model.ufo_product.Brand::getId, (p) -> p));
216 } 221 }
217 return ufoBrandMap; 222 return ufoBrandMap;
218 } 223 }
219 224
220 - public Map<Short, UfoBrandSeries> getUfoBrandSeriesMap() {  
221 - Map<Short, UfoBrandSeries> ufoBrandSeriesMap = new HashMap<>();  
222 - List<UfoBrandSeries> ufoBrandSeriesList = ufoBrandSeriesMapper.selectPageList(0, Integer.MAX_VALUE);  
223 - if (CollectionUtils.isNotEmpty(ufoBrandSeriesList)) {  
224 - ufoBrandSeriesMap = ufoBrandSeriesList.stream().collect(Collectors.toMap(UfoBrandSeries::getId, (p) -> p)); 225 + public Map<Short, BrandSeries> getUfoBrandSeriesMap() {
  226 + Map<Short, BrandSeries> ufoBrandSeriesMap = new HashMap<>();
  227 + List<BrandSeries> brandSeriesList = ufoBrandSeriesMapper.selectPageList(0, Integer.MAX_VALUE);
  228 + if (CollectionUtils.isNotEmpty(brandSeriesList)) {
  229 + ufoBrandSeriesMap = brandSeriesList.stream().collect(Collectors.toMap(BrandSeries::getId, (p) -> p));
225 } 230 }
226 return ufoBrandSeriesMap; 231 return ufoBrandSeriesMap;
227 } 232 }
228 233
229 - public Map<Short, UfoSize> getUfoSizeMap() {  
230 - Map<Short, UfoSize> ufoSizeMap = new HashMap<>();  
231 - List<UfoSize> ufoSizeList = ufoSizeMapper.selectPageList(0, Integer.MAX_VALUE);  
232 - if (CollectionUtils.isNotEmpty(ufoSizeList)) {  
233 - ufoSizeMap = ufoSizeList.stream().collect(Collectors.toMap(UfoSize::getId, (p) -> p)); 234 + public Map<Short, com.yoho.search.dal.model.ufo_product.Size> getUfoSizeMap() {
  235 + Map<Short, com.yoho.search.dal.model.ufo_product.Size> ufoSizeMap = new HashMap<>();
  236 + List<com.yoho.search.dal.model.ufo_product.Size> sizeList = ufoSizeMapper.selectPageList(0, Integer.MAX_VALUE);
  237 + if (CollectionUtils.isNotEmpty(sizeList)) {
  238 + ufoSizeMap = sizeList.stream().collect(Collectors.toMap(com.yoho.search.dal.model.ufo_product.Size::getId, (p) -> p));
234 } 239 }
235 return ufoSizeMap; 240 return ufoSizeMap;
236 } 241 }
237 242
238 - public Map<Integer, UfoSearchSortRelation> getUfoYohoSortRelationMap() {  
239 - List<UfoSearchSortRelation> ufoSearchSortRelationList = ufoSearchSortRelationMapper.selectAll();  
240 - if (CollectionUtils.isEmpty(ufoSearchSortRelationList)) { 243 + public Map<Integer, SearchSortRelation> getUfoYohoSortRelationMap() {
  244 + List<SearchSortRelation> searchSortRelationList = ufoSearchSortRelationMapper.selectAll();
  245 + if (CollectionUtils.isEmpty(searchSortRelationList)) {
241 return new HashMap<>(); 246 return new HashMap<>();
242 } 247 }
243 - return ufoSearchSortRelationList.stream().collect(Collectors.toMap(UfoSearchSortRelation::getUfoSortId, (t) -> t)); 248 + return searchSortRelationList.stream().collect(Collectors.toMap(SearchSortRelation::getUfoSortId, (t) -> t));
244 } 249 }
245 250
246 public Map<Integer, Integer> getTblRelationMap() { 251 public Map<Integer, Integer> getTblRelationMap() {
@@ -2,7 +2,7 @@ package com.yoho.search.consumer.service.logicService.ufo; @@ -2,7 +2,7 @@ package com.yoho.search.consumer.service.logicService.ufo;
2 2
3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO; 3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO;
4 import com.yoho.search.dal.UfoBrandMapper; 4 import com.yoho.search.dal.UfoBrandMapper;
5 -import com.yoho.search.dal.model.UfoBrand; 5 +import com.yoho.search.dal.model.ufo_product.Brand;
6 import org.apache.commons.collections.CollectionUtils; 6 import org.apache.commons.collections.CollectionUtils;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
@@ -28,22 +28,22 @@ public class UfoBrandFieldBuilder implements UfoIndexFieldBuilder { @@ -28,22 +28,22 @@ public class UfoBrandFieldBuilder implements UfoIndexFieldBuilder {
28 if (CollectionUtils.isEmpty(brandIdList)) { 28 if (CollectionUtils.isEmpty(brandIdList)) {
29 return; 29 return;
30 } 30 }
31 - List<UfoBrand> ufoBrandList = ufoBrandMapper.selectByIdList(brandIdList);  
32 - Map<Short, UfoBrand> ufoBrandMap = new HashMap<>();  
33 - if (CollectionUtils.isNotEmpty(ufoBrandList)) {  
34 - ufoBrandMap = ufoBrandList.stream().collect(Collectors.toMap(UfoBrand::getId, p -> p)); 31 + List<Brand> brandList = ufoBrandMapper.selectByIdList(brandIdList);
  32 + Map<Short, Brand> ufoBrandMap = new HashMap<>();
  33 + if (CollectionUtils.isNotEmpty(brandList)) {
  34 + ufoBrandMap = brandList.stream().collect(Collectors.toMap(Brand::getId, p -> p));
35 } 35 }
36 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) { 36 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) {
37 ufoProductIndexBO.setBrandName(""); 37 ufoProductIndexBO.setBrandName("");
38 ufoProductIndexBO.setBrandNameEn(""); 38 ufoProductIndexBO.setBrandNameEn("");
39 ufoProductIndexBO.setBrandSearch(""); 39 ufoProductIndexBO.setBrandSearch("");
40 - UfoBrand ufoBrand = ufoBrandMap.get(ufoProductIndexBO.getBrandId());  
41 - if (ufoBrand == null) { 40 + Brand brand = ufoBrandMap.get(ufoProductIndexBO.getBrandId());
  41 + if (brand == null) {
42 continue; 42 continue;
43 } 43 }
44 - ufoProductIndexBO.setBrandName(ufoBrand.getBrandName());  
45 - ufoProductIndexBO.setBrandNameEn(ufoBrand.getBrandNameEn());  
46 - ufoProductIndexBO.setBrandSearch(ufoBrand.getBrandSearch()); 44 + ufoProductIndexBO.setBrandName(brand.getBrandName());
  45 + ufoProductIndexBO.setBrandNameEn(brand.getBrandNameEn());
  46 + ufoProductIndexBO.setBrandSearch(brand.getBrandSearch());
47 } 47 }
48 } 48 }
49 } 49 }
@@ -2,7 +2,7 @@ package com.yoho.search.consumer.service.logicService.ufo; @@ -2,7 +2,7 @@ package com.yoho.search.consumer.service.logicService.ufo;
2 2
3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO; 3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO;
4 import com.yoho.search.dal.UfoBrandSeriesMapper; 4 import com.yoho.search.dal.UfoBrandSeriesMapper;
5 -import com.yoho.search.dal.model.UfoBrandSeries; 5 +import com.yoho.search.dal.model.ufo_product.BrandSeries;
6 import org.apache.commons.collections.CollectionUtils; 6 import org.apache.commons.collections.CollectionUtils;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
@@ -28,20 +28,20 @@ public class UfoBrandSeriesFieldBuilder implements UfoIndexFieldBuilder { @@ -28,20 +28,20 @@ public class UfoBrandSeriesFieldBuilder implements UfoIndexFieldBuilder {
28 if (CollectionUtils.isEmpty(seriesIdList)) { 28 if (CollectionUtils.isEmpty(seriesIdList)) {
29 return; 29 return;
30 } 30 }
31 - Map<Short, UfoBrandSeries> ufoBrandSeriesMap = new HashMap<>();  
32 - List<UfoBrandSeries> ufoBrandSeriesList = ufoBrandSeriesMapper.selectByIdList(seriesIdList);  
33 - if (CollectionUtils.isNotEmpty(ufoBrandSeriesList)) {  
34 - ufoBrandSeriesMap = ufoBrandSeriesList.stream().collect(Collectors.toMap(UfoBrandSeries::getId, p -> p)); 31 + Map<Short, BrandSeries> ufoBrandSeriesMap = new HashMap<>();
  32 + List<BrandSeries> brandSeriesList = ufoBrandSeriesMapper.selectByIdList(seriesIdList);
  33 + if (CollectionUtils.isNotEmpty(brandSeriesList)) {
  34 + ufoBrandSeriesMap = brandSeriesList.stream().collect(Collectors.toMap(BrandSeries::getId, p -> p));
35 } 35 }
36 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) { 36 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) {
37 ufoProductIndexBO.setSeriesName(""); 37 ufoProductIndexBO.setSeriesName("");
38 ufoProductIndexBO.setSeriesSearch(""); 38 ufoProductIndexBO.setSeriesSearch("");
39 - UfoBrandSeries ufoBrandSeries = ufoBrandSeriesMap.get(ufoProductIndexBO.getSeriesId());  
40 - if (ufoBrandSeries == null) { 39 + BrandSeries brandSeries = ufoBrandSeriesMap.get(ufoProductIndexBO.getSeriesId());
  40 + if (brandSeries == null) {
41 continue; 41 continue;
42 } 42 }
43 - ufoProductIndexBO.setSeriesName(ufoBrandSeries.getSeriesName());  
44 - ufoProductIndexBO.setSeriesSearch(ufoBrandSeries.getSeriesSearch()); 43 + ufoProductIndexBO.setSeriesName(brandSeries.getSeriesName());
  44 + ufoProductIndexBO.setSeriesSearch(brandSeries.getSeriesSearch());
45 } 45 }
46 } 46 }
47 } 47 }
@@ -2,7 +2,7 @@ package com.yoho.search.consumer.service.logicService.ufo; @@ -2,7 +2,7 @@ package com.yoho.search.consumer.service.logicService.ufo;
2 2
3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO; 3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO;
4 import com.yoho.search.dal.UfoGoodsMapper; 4 import com.yoho.search.dal.UfoGoodsMapper;
5 -import com.yoho.search.dal.model.UfoGoods; 5 +import com.yoho.search.dal.model.ufo_product.Goods;
6 import org.apache.commons.collections.CollectionUtils; 6 import org.apache.commons.collections.CollectionUtils;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
@@ -24,16 +24,16 @@ public class UfoGoodsFieldBuilder implements UfoIndexFieldBuilder { @@ -24,16 +24,16 @@ public class UfoGoodsFieldBuilder implements UfoIndexFieldBuilder {
24 24
25 @Override 25 @Override
26 public void build(List<UfoProductIndexBO> ufoProductIndexBOList, List<Integer> idList) { 26 public void build(List<UfoProductIndexBO> ufoProductIndexBOList, List<Integer> idList) {
27 - List<UfoGoods> ufoGoodsList = ufoGoodsMapper.selectByProductIdList(idList);  
28 - Map<Integer, List<UfoGoods>> ufoGoodsMap = new HashMap<>(); 27 + List<Goods> ufoGoodsList = ufoGoodsMapper.selectByProductIdList(idList);
  28 + Map<Integer, List<Goods>> ufoGoodsMap = new HashMap<>();
29 if (CollectionUtils.isNotEmpty(ufoGoodsList)) { 29 if (CollectionUtils.isNotEmpty(ufoGoodsList)) {
30 - ufoGoodsMap = ufoGoodsList.stream().collect(Collectors.groupingBy(UfoGoods::getProductId)); 30 + ufoGoodsMap = ufoGoodsList.stream().collect(Collectors.groupingBy(Goods::getProductId));
31 } 31 }
32 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) { 32 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) {
33 ufoProductIndexBO.setDefaultImages(""); 33 ufoProductIndexBO.setDefaultImages("");
34 ufoProductIndexBO.setColorIds(""); 34 ufoProductIndexBO.setColorIds("");
35 ufoProductIndexBO.setColorNames(""); 35 ufoProductIndexBO.setColorNames("");
36 - List<UfoGoods> goodsList = ufoGoodsMap.get(ufoProductIndexBO.getId()); 36 + List<Goods> goodsList = ufoGoodsMap.get(ufoProductIndexBO.getId());
37 if (CollectionUtils.isEmpty(goodsList)) { 37 if (CollectionUtils.isEmpty(goodsList)) {
38 continue; 38 continue;
39 } 39 }
@@ -42,8 +42,8 @@ public class UfoGoodsFieldBuilder implements UfoIndexFieldBuilder { @@ -42,8 +42,8 @@ public class UfoGoodsFieldBuilder implements UfoIndexFieldBuilder {
42 ufoProductIndexBO.setDefaultImages(g.getColorImage()); 42 ufoProductIndexBO.setDefaultImages(g.getColorImage());
43 } 43 }
44 }); 44 });
45 - String colorIds = goodsList.stream().map(UfoGoods::getColorId).map(s -> s.toString()).collect(Collectors.joining(","));  
46 - String colorNames = goodsList.stream().map(UfoGoods::getColorName).collect(Collectors.joining(",")); 45 + String colorIds = goodsList.stream().map(Goods::getColorId).map(s -> s.toString()).collect(Collectors.joining(","));
  46 + String colorNames = goodsList.stream().map(Goods::getColorName).collect(Collectors.joining(","));
47 ufoProductIndexBO.setColorIds(colorIds); 47 ufoProductIndexBO.setColorIds(colorIds);
48 ufoProductIndexBO.setColorNames(colorNames); 48 ufoProductIndexBO.setColorNames(colorNames);
49 } 49 }
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
5 import com.yoho.search.consumer.service.bo.UfoProductIndexBO; 5 import com.yoho.search.consumer.service.bo.UfoProductIndexBO;
6 import com.yoho.search.consumer.service.bo.UfoProductPoolBO; 6 import com.yoho.search.consumer.service.bo.UfoProductPoolBO;
7 import com.yoho.search.dal.UfoProductPoolDetailMapper; 7 import com.yoho.search.dal.UfoProductPoolDetailMapper;
8 -import com.yoho.search.dal.model.UfoProductPoolDetail; 8 +import com.yoho.search.dal.model.ufo_product.ProductPoolDetail;
9 import org.apache.commons.collections.CollectionUtils; 9 import org.apache.commons.collections.CollectionUtils;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
@@ -44,14 +44,14 @@ public class UfoProductPoolDetailFieldBuilder implements UfoIndexFieldBuilder { @@ -44,14 +44,14 @@ public class UfoProductPoolDetailFieldBuilder implements UfoIndexFieldBuilder {
44 List<UfoProductPoolBO> ufoProductPoolBOList = new ArrayList<>(); 44 List<UfoProductPoolBO> ufoProductPoolBOList = new ArrayList<>();
45 for (Integer id : idList) { 45 for (Integer id : idList) {
46 Set<Integer> poolIdSet = new HashSet<>(); 46 Set<Integer> poolIdSet = new HashSet<>();
47 - List<UfoProductPoolDetail> productPoolDetailsTemp = new ArrayList<>(); 47 + List<ProductPoolDetail> productPoolDetailsTemp = new ArrayList<>();
48 //把每个product对应的多个ProductPoolDetail的PoolId拼起来 48 //把每个product对应的多个ProductPoolDetail的PoolId拼起来
49 - List<UfoProductPoolDetail> productPoolDetails = ufoProductPoolDetailMapper.selectByProductId(id); 49 + List<ProductPoolDetail> productPoolDetails = ufoProductPoolDetailMapper.selectByProductId(id);
50 if (CollectionUtils.isEmpty(productPoolDetails)) { 50 if (CollectionUtils.isEmpty(productPoolDetails)) {
51 continue; 51 continue;
52 } 52 }
53 //先根据poolId去重 53 //先根据poolId去重
54 - for (UfoProductPoolDetail productPoolDetail : productPoolDetails) { 54 + for (ProductPoolDetail productPoolDetail : productPoolDetails) {
55 if (!poolIdSet.contains(productPoolDetail.getPoolId())) { 55 if (!poolIdSet.contains(productPoolDetail.getPoolId())) {
56 poolIdSet.add(productPoolDetail.getPoolId()); 56 poolIdSet.add(productPoolDetail.getPoolId());
57 productPoolDetailsTemp.add(productPoolDetail); 57 productPoolDetailsTemp.add(productPoolDetail);
@@ -59,7 +59,7 @@ public class UfoProductPoolDetailFieldBuilder implements UfoIndexFieldBuilder { @@ -59,7 +59,7 @@ public class UfoProductPoolDetailFieldBuilder implements UfoIndexFieldBuilder {
59 } 59 }
60 StringBuilder poolIds = new StringBuilder(); 60 StringBuilder poolIds = new StringBuilder();
61 JSONArray pools = new JSONArray(); 61 JSONArray pools = new JSONArray();
62 - for (UfoProductPoolDetail productPoolDetail : productPoolDetailsTemp) { 62 + for (ProductPoolDetail productPoolDetail : productPoolDetailsTemp) {
63 poolIds.append(productPoolDetail.getPoolId()); 63 poolIds.append(productPoolDetail.getPoolId());
64 poolIds.append(','); 64 poolIds.append(',');
65 JSONObject pool = new JSONObject(); 65 JSONObject pool = new JSONObject();
@@ -2,7 +2,7 @@ package com.yoho.search.consumer.service.logicService.ufo; @@ -2,7 +2,7 @@ package com.yoho.search.consumer.service.logicService.ufo;
2 2
3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO; 3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO;
4 import com.yoho.search.dal.UfoProductSortMapper; 4 import com.yoho.search.dal.UfoProductSortMapper;
5 -import com.yoho.search.dal.model.UfoProductSort; 5 +import com.yoho.search.dal.model.ufo_product.ProductSort;
6 import org.apache.commons.collections.CollectionUtils; 6 import org.apache.commons.collections.CollectionUtils;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
@@ -34,13 +34,13 @@ public class UfoProductSortFieldBuilder implements UfoIndexFieldBuilder { @@ -34,13 +34,13 @@ public class UfoProductSortFieldBuilder implements UfoIndexFieldBuilder {
34 if (CollectionUtils.isNotEmpty(midSortIdList)) { 34 if (CollectionUtils.isNotEmpty(midSortIdList)) {
35 sortIdList.addAll(midSortIdList); 35 sortIdList.addAll(midSortIdList);
36 } 36 }
37 - List<UfoProductSort> ufoProductSortList = ufoProductSortMapper.selectByIdList(sortIdList);  
38 - Map<Short, UfoProductSort> ufoProductSortMap = new HashMap<>();  
39 - if (CollectionUtils.isNotEmpty(ufoProductSortList)) {  
40 - ufoProductSortMap = ufoProductSortList.stream().collect(Collectors.toMap(UfoProductSort::getId, p -> p)); 37 + List<ProductSort> productSortList = ufoProductSortMapper.selectByIdList(sortIdList);
  38 + Map<Short, ProductSort> ufoProductSortMap = new HashMap<>();
  39 + if (CollectionUtils.isNotEmpty(productSortList)) {
  40 + ufoProductSortMap = productSortList.stream().collect(Collectors.toMap(ProductSort::getId, p -> p));
41 } 41 }
42 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) { 42 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) {
43 - UfoProductSort maxSort = ufoProductSortMap.get(ufoProductIndexBO.getMaxSortId()); 43 + ProductSort maxSort = ufoProductSortMap.get(ufoProductIndexBO.getMaxSortId());
44 if (maxSort != null) { 44 if (maxSort != null) {
45 ufoProductIndexBO.setMaxSortId(maxSort.getId()); 45 ufoProductIndexBO.setMaxSortId(maxSort.getId());
46 ufoProductIndexBO.setMaxSortName(maxSort.getSortName()); 46 ufoProductIndexBO.setMaxSortName(maxSort.getSortName());
@@ -48,7 +48,7 @@ public class UfoProductSortFieldBuilder implements UfoIndexFieldBuilder { @@ -48,7 +48,7 @@ public class UfoProductSortFieldBuilder implements UfoIndexFieldBuilder {
48 ufoProductIndexBO.setMaxSortId((short) -1); 48 ufoProductIndexBO.setMaxSortId((short) -1);
49 ufoProductIndexBO.setMaxSortName(""); 49 ufoProductIndexBO.setMaxSortName("");
50 } 50 }
51 - UfoProductSort midSort = ufoProductSortMap.get(ufoProductIndexBO.getMidSortId()); 51 + ProductSort midSort = ufoProductSortMap.get(ufoProductIndexBO.getMidSortId());
52 if (midSort != null) { 52 if (midSort != null) {
53 ufoProductIndexBO.setMidSortId(midSort.getId()); 53 ufoProductIndexBO.setMidSortId(midSort.getId());
54 ufoProductIndexBO.setMidSortName(midSort.getSortName()); 54 ufoProductIndexBO.setMidSortName(midSort.getSortName());
@@ -3,16 +3,14 @@ package com.yoho.search.consumer.service.logicService.ufo; @@ -3,16 +3,14 @@ package com.yoho.search.consumer.service.logicService.ufo;
3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO; 3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO;
4 import com.yoho.search.dal.UfoBuyerOrderGoodsMapper; 4 import com.yoho.search.dal.UfoBuyerOrderGoodsMapper;
5 import com.yoho.search.dal.UfoBuyerOrderMapper; 5 import com.yoho.search.dal.UfoBuyerOrderMapper;
6 -import com.yoho.search.dal.UfoStorageMapper;  
7 import com.yoho.search.dal.UfoStoragePriceMapper; 6 import com.yoho.search.dal.UfoStoragePriceMapper;
8 -import com.yoho.search.dal.model.UfoBuyerOrder;  
9 -import com.yoho.search.dal.model.UfoBuyerOrderGoods;  
10 -import com.yoho.search.dal.model.UfoStoragePrice; 7 +import com.yoho.search.dal.model.ufo_order.BuyerOrder;
  8 +import com.yoho.search.dal.model.ufo_order.BuyerOrderGoods;
  9 +import com.yoho.search.dal.model.ufo_product.StoragePrice;
11 import org.apache.commons.collections.CollectionUtils; 10 import org.apache.commons.collections.CollectionUtils;
12 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Component; 12 import org.springframework.stereotype.Component;
14 13
15 -import java.math.BigDecimal;  
16 import java.util.HashMap; 14 import java.util.HashMap;
17 import java.util.List; 15 import java.util.List;
18 import java.util.Map; 16 import java.util.Map;
@@ -33,36 +31,36 @@ public class UfoSalesNumFieldBuilder implements UfoIndexFieldBuilder { @@ -33,36 +31,36 @@ public class UfoSalesNumFieldBuilder implements UfoIndexFieldBuilder {
33 31
34 @Override 32 @Override
35 public void build(List<UfoProductIndexBO> ufoProductIndexBOList, List<Integer> idList) { 33 public void build(List<UfoProductIndexBO> ufoProductIndexBOList, List<Integer> idList) {
36 - List<UfoStoragePrice> ufoStoragePriceList = ufoStoragePriceMapper.selectByProductIdList(idList);  
37 - Map<Integer, List<UfoStoragePrice>> ufoStoragePriceMap = new HashMap<>(); 34 + List<StoragePrice> ufoStoragePriceList = ufoStoragePriceMapper.selectByProductIdList(idList);
  35 + Map<Integer, List<StoragePrice>> ufoStoragePriceMap = new HashMap<>();
38 if (CollectionUtils.isNotEmpty(ufoStoragePriceList)) { 36 if (CollectionUtils.isNotEmpty(ufoStoragePriceList)) {
39 - ufoStoragePriceMap = ufoStoragePriceList.stream().collect(Collectors.groupingBy(UfoStoragePrice::getProductId)); 37 + ufoStoragePriceMap = ufoStoragePriceList.stream().collect(Collectors.groupingBy(StoragePrice::getProductId));
40 } 38 }
41 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) { 39 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) {
42 ufoProductIndexBO.setSalesNum(0); 40 ufoProductIndexBO.setSalesNum(0);
43 - List<UfoStoragePrice> storagePriceList = ufoStoragePriceMap.get(ufoProductIndexBO.getId()); 41 + List<StoragePrice> storagePriceList = ufoStoragePriceMap.get(ufoProductIndexBO.getId());
44 if (CollectionUtils.isEmpty(storagePriceList)) { 42 if (CollectionUtils.isEmpty(storagePriceList)) {
45 continue; 43 continue;
46 } 44 }
47 - List<Integer> skupList = storagePriceList.stream().map(UfoStoragePrice::getSkup).collect(Collectors.toList()); 45 + List<Integer> skupList = storagePriceList.stream().map(StoragePrice::getSkup).collect(Collectors.toList());
48 if (CollectionUtils.isEmpty(storagePriceList)) { 46 if (CollectionUtils.isEmpty(storagePriceList)) {
49 continue; 47 continue;
50 } 48 }
51 - List<UfoBuyerOrderGoods> ufoBuyerOrderGoodsList = ufoBuyerOrderGoodsMapper.selectBySkupList(skupList);  
52 - if (CollectionUtils.isEmpty(ufoBuyerOrderGoodsList)) { 49 + List<BuyerOrderGoods> buyerOrderGoodsList = ufoBuyerOrderGoodsMapper.selectBySkupList(skupList);
  50 + if (CollectionUtils.isEmpty(buyerOrderGoodsList)) {
53 continue; 51 continue;
54 } 52 }
55 - List<Long> orderCodeList = ufoBuyerOrderGoodsList.stream().map(UfoBuyerOrderGoods::getOrderCode).collect(Collectors.toList()); 53 + List<Long> orderCodeList = buyerOrderGoodsList.stream().map(BuyerOrderGoods::getOrderCode).collect(Collectors.toList());
56 if (CollectionUtils.isEmpty(orderCodeList)) { 54 if (CollectionUtils.isEmpty(orderCodeList)) {
57 continue; 55 continue;
58 } 56 }
59 - List<UfoBuyerOrder> ufoBuyerOrderList = ufoBuyerOrderMapper.selectByOrderCodeList(orderCodeList);  
60 - if (CollectionUtils.isEmpty(ufoBuyerOrderList)) { 57 + List<BuyerOrder> buyerOrderList = ufoBuyerOrderMapper.selectByOrderCodeList(orderCodeList);
  58 + if (CollectionUtils.isEmpty(buyerOrderList)) {
61 continue; 59 continue;
62 } 60 }
63 Integer saleNum = 0; 61 Integer saleNum = 0;
64 - for(UfoBuyerOrder ufoBuyerOrder:ufoBuyerOrderList){  
65 - if(ufoBuyerOrder.getStatus()==1||ufoBuyerOrder.getStatus()==2||ufoBuyerOrder.getStatus()==3||ufoBuyerOrder.getStatus()==4||ufoBuyerOrder.getStatus()==5){ 62 + for(BuyerOrder buyerOrder : buyerOrderList){
  63 + if(buyerOrder.getStatus()==1|| buyerOrder.getStatus()==2|| buyerOrder.getStatus()==3|| buyerOrder.getStatus()==4|| buyerOrder.getStatus()==5){
66 saleNum++; 64 saleNum++;
67 } 65 }
68 } 66 }
@@ -2,7 +2,7 @@ package com.yoho.search.consumer.service.logicService.ufo; @@ -2,7 +2,7 @@ package com.yoho.search.consumer.service.logicService.ufo;
2 2
3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO; 3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO;
4 import com.yoho.search.dal.UfoStorageMapper; 4 import com.yoho.search.dal.UfoStorageMapper;
5 -import com.yoho.search.dal.model.UfoStorage; 5 +import com.yoho.search.dal.model.ufo_product.Storage;
6 import org.apache.commons.collections.CollectionUtils; 6 import org.apache.commons.collections.CollectionUtils;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
@@ -24,18 +24,18 @@ public class UfoStorageFieldBuilder implements UfoIndexFieldBuilder { @@ -24,18 +24,18 @@ public class UfoStorageFieldBuilder implements UfoIndexFieldBuilder {
24 24
25 @Override 25 @Override
26 public void build(List<UfoProductIndexBO> ufoProductIndexBOList, List<Integer> idList) { 26 public void build(List<UfoProductIndexBO> ufoProductIndexBOList, List<Integer> idList) {
27 - List<UfoStorage> ufoStorageList = ufoStorageMapper.selectByProductIdList(idList);  
28 - Map<Integer, List<UfoStorage>> ufoStorageMap = new HashMap<>(); 27 + List<Storage> ufoStorageList = ufoStorageMapper.selectByProductIdList(idList);
  28 + Map<Integer, List<Storage>> ufoStorageMap = new HashMap<>();
29 if (CollectionUtils.isNotEmpty(ufoStorageList)) { 29 if (CollectionUtils.isNotEmpty(ufoStorageList)) {
30 - ufoStorageMap = ufoStorageList.stream().collect(Collectors.groupingBy(UfoStorage::getProductId)); 30 + ufoStorageMap = ufoStorageList.stream().collect(Collectors.groupingBy(Storage::getProductId));
31 } 31 }
32 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) { 32 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) {
33 ufoProductIndexBO.setSizeIds(""); 33 ufoProductIndexBO.setSizeIds("");
34 - List<UfoStorage> storageList = ufoStorageMap.get(ufoProductIndexBO.getId()); 34 + List<Storage> storageList = ufoStorageMap.get(ufoProductIndexBO.getId());
35 if (CollectionUtils.isEmpty(storageList)) { 35 if (CollectionUtils.isEmpty(storageList)) {
36 continue; 36 continue;
37 } 37 }
38 - String sizeIds = storageList.stream().map(UfoStorage::getSizeId).map(s -> s.toString()).collect(Collectors.joining(",")); 38 + String sizeIds = storageList.stream().map(Storage::getSizeId).map(s -> s.toString()).collect(Collectors.joining(","));
39 ufoProductIndexBO.setSizeIds(sizeIds); 39 ufoProductIndexBO.setSizeIds(sizeIds);
40 } 40 }
41 41
@@ -3,8 +3,8 @@ package com.yoho.search.consumer.service.logicService.ufo; @@ -3,8 +3,8 @@ package com.yoho.search.consumer.service.logicService.ufo;
3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO; 3 import com.yoho.search.consumer.service.bo.UfoProductIndexBO;
4 import com.yoho.search.dal.UfoStorageMapper; 4 import com.yoho.search.dal.UfoStorageMapper;
5 import com.yoho.search.dal.UfoStoragePriceMapper; 5 import com.yoho.search.dal.UfoStoragePriceMapper;
6 -import com.yoho.search.dal.model.UfoStorage;  
7 -import com.yoho.search.dal.model.UfoStoragePrice; 6 +import com.yoho.search.dal.model.ufo_product.Storage;
  7 +import com.yoho.search.dal.model.ufo_product.StoragePrice;
8 import org.apache.commons.collections.CollectionUtils; 8 import org.apache.commons.collections.CollectionUtils;
9 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Component; 10 import org.springframework.stereotype.Component;
@@ -27,18 +27,18 @@ public class UfoStoragePriceFieldBuilder implements UfoIndexFieldBuilder { @@ -27,18 +27,18 @@ public class UfoStoragePriceFieldBuilder implements UfoIndexFieldBuilder {
27 27
28 @Override 28 @Override
29 public void build(List<UfoProductIndexBO> ufoProductIndexBOList, List<Integer> idList) { 29 public void build(List<UfoProductIndexBO> ufoProductIndexBOList, List<Integer> idList) {
30 - List<UfoStorage> ufoStorageList = ufoStorageMapper.selectByProductIdList(idList);  
31 - Map<Integer, UfoStorage> ufoStorageMap = new HashMap<>();  
32 - if (CollectionUtils.isNotEmpty(ufoStorageList)) {  
33 - ufoStorageMap = ufoStorageList.stream().collect(Collectors.toMap(UfoStorage::getId, p -> p)); 30 + List<Storage> storageList = ufoStorageMapper.selectByProductIdList(idList);
  31 + Map<Integer, Storage> ufoStorageMap = new HashMap<>();
  32 + if (CollectionUtils.isNotEmpty(storageList)) {
  33 + ufoStorageMap = storageList.stream().collect(Collectors.toMap(Storage::getId, p -> p));
34 } 34 }
35 - List<UfoStoragePrice> ufoStoragePriceList = ufoStoragePriceMapper.selectByProductIdList(idList);  
36 - Map<Integer, List<UfoStoragePrice>> ufoStoragePriceMap = new HashMap<>(); 35 + List<StoragePrice> ufoStoragePriceList = ufoStoragePriceMapper.selectByProductIdList(idList);
  36 + Map<Integer, List<StoragePrice>> ufoStoragePriceMap = new HashMap<>();
37 if (CollectionUtils.isNotEmpty(ufoStoragePriceList)) { 37 if (CollectionUtils.isNotEmpty(ufoStoragePriceList)) {
38 - ufoStoragePriceMap = ufoStoragePriceList.stream().collect(Collectors.groupingBy(UfoStoragePrice::getProductId)); 38 + ufoStoragePriceMap = ufoStoragePriceList.stream().collect(Collectors.groupingBy(StoragePrice::getProductId));
39 } 39 }
40 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) { 40 for (UfoProductIndexBO ufoProductIndexBO : ufoProductIndexBOList) {
41 - List<UfoStoragePrice> storagePriceList = ufoStoragePriceMap.get(ufoProductIndexBO.getId()); 41 + List<StoragePrice> storagePriceList = ufoStoragePriceMap.get(ufoProductIndexBO.getId());
42 ufoProductIndexBO.setPrice(-1d); 42 ufoProductIndexBO.setPrice(-1d);
43 if (CollectionUtils.isEmpty(storagePriceList)) { 43 if (CollectionUtils.isEmpty(storagePriceList)) {
44 continue; 44 continue;
@@ -51,30 +51,30 @@ public class UfoStoragePriceFieldBuilder implements UfoIndexFieldBuilder { @@ -51,30 +51,30 @@ public class UfoStoragePriceFieldBuilder implements UfoIndexFieldBuilder {
51 } 51 }
52 } 52 }
53 53
54 - public BigDecimal buildPrice(List<UfoStoragePrice> storagePriceList, Map<Integer, UfoStorage> ufoStorageMap) {  
55 - List<UfoStoragePrice> validStoragePriceList = new ArrayList<>();  
56 - for (UfoStoragePrice ufoStoragePrice : storagePriceList) {  
57 - if (ufoStoragePrice.getStatus() != 1) { 54 + public BigDecimal buildPrice(List<StoragePrice> storagePriceList, Map<Integer, Storage> ufoStorageMap) {
  55 + List<StoragePrice> validStoragePriceList = new ArrayList<>();
  56 + for (StoragePrice storagePrice : storagePriceList) {
  57 + if (storagePrice.getStatus() != 1) {
58 continue; 58 continue;
59 } 59 }
60 - Integer storageId = ufoStoragePrice.getStorageId(); 60 + Integer storageId = storagePrice.getStorageId();
61 if (!ufoStorageMap.containsKey(storageId)) { 61 if (!ufoStorageMap.containsKey(storageId)) {
62 continue; 62 continue;
63 } 63 }
64 - UfoStorage ufoStorage = ufoStorageMap.get(storageId);  
65 - BigDecimal suggestHighPrice = ufoStorage.getSuggestHighPrice(); 64 + Storage storage = ufoStorageMap.get(storageId);
  65 + BigDecimal suggestHighPrice = storage.getSuggestHighPrice();
66 if (suggestHighPrice == null) { 66 if (suggestHighPrice == null) {
67 - validStoragePriceList.add(ufoStoragePrice); 67 + validStoragePriceList.add(storagePrice);
68 continue; 68 continue;
69 } 69 }
70 - if (ufoStoragePrice.getPrice().compareTo(suggestHighPrice) <= 0) {  
71 - validStoragePriceList.add(ufoStoragePrice); 70 + if (storagePrice.getPrice().compareTo(suggestHighPrice) <= 0) {
  71 + validStoragePriceList.add(storagePrice);
72 } 72 }
73 } 73 }
74 if (CollectionUtils.isEmpty(validStoragePriceList)) { 74 if (CollectionUtils.isEmpty(validStoragePriceList)) {
75 return null; 75 return null;
76 } 76 }
77 - validStoragePriceList = validStoragePriceList.stream().sorted(Comparator.comparing(UfoStoragePrice::getPrice)).collect(Collectors.toList()); 77 + validStoragePriceList = validStoragePriceList.stream().sorted(Comparator.comparing(StoragePrice::getPrice)).collect(Collectors.toList());
78 if (CollectionUtils.isEmpty(validStoragePriceList)) { 78 if (CollectionUtils.isEmpty(validStoragePriceList)) {
79 return null; 79 return null;
80 } 80 }
@@ -2,9 +2,8 @@ package com.yoho.search.consumer.service.logicService.ufo.yoho; @@ -2,9 +2,8 @@ package com.yoho.search.consumer.service.logicService.ufo.yoho;
2 2
3 import com.yoho.search.consumer.service.bo.ProductIndexBO; 3 import com.yoho.search.consumer.service.bo.ProductIndexBO;
4 import com.yoho.search.consumer.service.utils.BrandNameUtils; 4 import com.yoho.search.consumer.service.utils.BrandNameUtils;
5 -import com.yoho.search.dal.model.Brand;  
6 -import com.yoho.search.dal.model.UfoBrand;  
7 -import com.yoho.search.dal.model.UfoProduct; 5 +import com.yoho.search.dal.model.ufo_product.Brand;
  6 +import com.yoho.search.dal.model.ufo_product.Product;
8 import org.springframework.stereotype.Component; 7 import org.springframework.stereotype.Component;
9 8
10 import java.util.Map; 9 import java.util.Map;
@@ -18,8 +17,8 @@ import java.util.Map; @@ -18,8 +17,8 @@ import java.util.Map;
18 @Component 17 @Component
19 public class UfoToYohoBrandService { 18 public class UfoToYohoBrandService {
20 19
21 - public void build(ProductIndexBO productIndexBO, UfoProduct ufoProduct, Map<Integer, Brand> yohoBrandMap, Map<Short, UfoBrand> ufoBrandMap, Map<Integer, Integer> ufoBrandRelation) {  
22 - UfoBrand ufoBrand = ufoBrandMap.get(ufoProduct.getBrandId()); 20 + public void build(ProductIndexBO productIndexBO, Product product, Map<Integer, com.yoho.search.dal.model.Brand> yohoBrandMap, Map<Short, Brand> ufoBrandMap, Map<Integer, Integer> ufoBrandRelation) {
  21 + Brand ufoBrand = ufoBrandMap.get(product.getBrandId());
23 if (ufoBrand == null) { 22 if (ufoBrand == null) {
24 return; 23 return;
25 } 24 }
@@ -27,7 +26,7 @@ public class UfoToYohoBrandService { @@ -27,7 +26,7 @@ public class UfoToYohoBrandService {
27 //融合到了用有货的品牌信息，否则用ufo的品牌信息 26 //融合到了用有货的品牌信息，否则用ufo的品牌信息
28 if (ufoBrandRelation.containsKey(ufoBrandId)) { 27 if (ufoBrandRelation.containsKey(ufoBrandId)) {
29 Integer yohoBrandId = ufoBrandRelation.get(ufoBrandId); 28 Integer yohoBrandId = ufoBrandRelation.get(ufoBrandId);
30 - Brand brand = yohoBrandMap.get(yohoBrandId); 29 + com.yoho.search.dal.model.Brand brand = yohoBrandMap.get(yohoBrandId);
31 if (brand == null) { 30 if (brand == null) {
32 return; 31 return;
33 } 32 }
@@ -2,8 +2,8 @@ package com.yoho.search.consumer.service.logicService.ufo.yoho; @@ -2,8 +2,8 @@ package com.yoho.search.consumer.service.logicService.ufo.yoho;
2 2
3 import com.yoho.search.consumer.service.bo.ProductIndexBO; 3 import com.yoho.search.consumer.service.bo.ProductIndexBO;
4 import com.yoho.search.dal.model.ProductColor; 4 import com.yoho.search.dal.model.ProductColor;
5 -import com.yoho.search.dal.model.UfoGoods;  
6 -import com.yoho.search.dal.model.UfoProduct; 5 +import com.yoho.search.dal.model.ufo_product.Goods;
  6 +import com.yoho.search.dal.model.ufo_product.Product;
7 import org.springframework.stereotype.Component; 7 import org.springframework.stereotype.Component;
8 import org.springframework.util.CollectionUtils; 8 import org.springframework.util.CollectionUtils;
9 9
@@ -19,22 +19,22 @@ import java.util.Map; @@ -19,22 +19,22 @@ import java.util.Map;
19 @Component 19 @Component
20 public class UfoToYohoColorService { 20 public class UfoToYohoColorService {
21 21
22 - public void build(ProductIndexBO productIndexBO, UfoProduct ufoProduct, Map<String, ProductColor> productColorNameMap, Map<Integer, List<UfoGoods>> ufoGoodsMap) {  
23 - List<UfoGoods> ufoGoodsList = ufoGoodsMap.get(ufoProduct.getId());  
24 - if (CollectionUtils.isEmpty(ufoGoodsList)) { 22 + public void build(ProductIndexBO productIndexBO, Product product, Map<String, ProductColor> productColorNameMap, Map<Integer, List<Goods>> ufoGoodsMap) {
  23 + List<Goods> goodsList = ufoGoodsMap.get(product.getId());
  24 + if (CollectionUtils.isEmpty(goodsList)) {
25 return; 25 return;
26 } 26 }
27 StringBuilder ColorIds = new StringBuilder(); 27 StringBuilder ColorIds = new StringBuilder();
28 StringBuilder ColorNames = new StringBuilder(); 28 StringBuilder ColorNames = new StringBuilder();
29 - for (UfoGoods ufoGoods : ufoGoodsList) {  
30 - if ("Y".equals(ufoGoods.getIsDefault())) {  
31 - productIndexBO.setDefaultImages(ufoGoods.getColorImage());  
32 - productIndexBO.setSknDefaultImg(ufoGoods.getColorImage());  
33 - productIndexBO.setCover_1(ufoGoods.getColorImage());  
34 - productIndexBO.setCover_2(ufoGoods.getColorImage()); 29 + for (Goods goods : goodsList) {
  30 + if ("Y".equals(goods.getIsDefault())) {
  31 + productIndexBO.setDefaultImages(goods.getColorImage());
  32 + productIndexBO.setSknDefaultImg(goods.getColorImage());
  33 + productIndexBO.setCover_1(goods.getColorImage());
  34 + productIndexBO.setCover_2(goods.getColorImage());
35 } 35 }
36 - if (productColorNameMap.containsKey(ufoGoods.getColorName())) {  
37 - ProductColor productColor = productColorNameMap.get(ufoGoods.getColorName()); 36 + if (productColorNameMap.containsKey(goods.getColorName())) {
  37 + ProductColor productColor = productColorNameMap.get(goods.getColorName());
38 ColorIds.append(productColor.getId()).append(","); 38 ColorIds.append(productColor.getId()).append(",");
39 ColorNames.append(productColor.getColorName()).append(","); 39 ColorNames.append(productColor.getColorName()).append(",");
40 } 40 }
1 package com.yoho.search.consumer.service.logicService.ufo.yoho; 1 package com.yoho.search.consumer.service.logicService.ufo.yoho;
2 2
3 import com.yoho.search.consumer.service.bo.ProductIndexBO; 3 import com.yoho.search.consumer.service.bo.ProductIndexBO;
4 -import com.yoho.search.dal.model.UfoBrandSeries;  
5 -import com.yoho.search.dal.model.UfoProduct; 4 +import com.yoho.search.dal.model.ufo_product.BrandSeries;
  5 +import com.yoho.search.dal.model.ufo_product.Product;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
7 7
8 import java.math.BigDecimal; 8 import java.math.BigDecimal;
@@ -17,36 +17,36 @@ import java.util.Map; @@ -17,36 +17,36 @@ import java.util.Map;
17 @Component 17 @Component
18 public class UfoToYohoGeneralService { 18 public class UfoToYohoGeneralService {
19 19
20 - public void build(ProductIndexBO productIndexBO, UfoProduct ufoProduct, Map<Short, UfoBrandSeries> ufoBrandSeriesMap) { 20 + public void build(ProductIndexBO productIndexBO, Product product, Map<Short, BrandSeries> ufoBrandSeriesMap) {
21 //基本 21 //基本
22 productIndexBO.setIsUfo("Y"); 22 productIndexBO.setIsUfo("Y");
23 - productIndexBO.setId("ufo-" + ufoProduct.getId());  
24 - productIndexBO.setProductSkn(ufoProduct.getId());  
25 - productIndexBO.setProductName(ufoProduct.getProductName());  
26 - productIndexBO.setUfoProductCode(ufoProduct.getProductCode());  
27 - productIndexBO.setProductKeyword(ufoProduct.getKeyWords()); 23 + productIndexBO.setId("ufo-" + product.getId());
  24 + productIndexBO.setProductSkn(product.getId());
  25 + productIndexBO.setProductName(product.getProductName());
  26 + productIndexBO.setUfoProductCode(product.getProductCode());
  27 + productIndexBO.setProductKeyword(product.getKeyWords());
28 //状态 28 //状态
29 productIndexBO.setStatus(1); 29 productIndexBO.setStatus(1);
30 - if (ufoProduct.getDelStatus() != 0 || ufoProduct.getShelveStatus() == 0) { 30 + if (product.getDelStatus() != 0 || product.getShelveStatus() == 0) {
31 productIndexBO.setStatus(0); 31 productIndexBO.setStatus(0);
32 } 32 }
33 productIndexBO.setIsSales(productIndexBO.getStatus() == 1 ? "Y" : "N"); 33 productIndexBO.setIsSales(productIndexBO.getStatus() == 1 ? "Y" : "N");
34 //系列 34 //系列
35 - UfoBrandSeries ufoBrandSeries = ufoBrandSeriesMap.get(ufoProduct.getSeriesId());  
36 - if (ufoBrandSeries != null) {  
37 - productIndexBO.setSpecialSearchField(ufoBrandSeries.getSeriesName()); 35 + BrandSeries brandSeries = ufoBrandSeriesMap.get(product.getSeriesId());
  36 + if (brandSeries != null) {
  37 + productIndexBO.setSpecialSearchField(brandSeries.getSeriesName());
38 } 38 }
39 //库存 39 //库存
40 productIndexBO.setStorageNum(BigDecimal.valueOf(100)); 40 productIndexBO.setStorageNum(BigDecimal.valueOf(100));
41 //性别 41 //性别
42 - if (ufoProduct.getGender() != null) {  
43 - productIndexBO.setGender(ufoProduct.getGender());  
44 - productIndexBO.setGenderS(ufoProduct.getGender().replace('1', '男').replace('2', '女').replace("3", "男/女")); 42 + if (product.getGender() != null) {
  43 + productIndexBO.setGender(product.getGender());
  44 + productIndexBO.setGenderS(product.getGender().replace('1', '男').replace('2', '女').replace("3", "男/女"));
45 } 45 }
46 //发售时间 46 //发售时间
47 - if (ufoProduct.getSaleTime() != null) {  
48 - productIndexBO.setFirstShelveTime(ufoProduct.getSaleTime());  
49 - productIndexBO.setShelveTime(ufoProduct.getSaleTime()); 47 + if (product.getSaleTime() != null) {
  48 + productIndexBO.setFirstShelveTime(product.getSaleTime());
  49 + productIndexBO.setShelveTime(product.getSaleTime());
50 } 50 }
51 //其他 51 //其他
52 productIndexBO.setShopId(-2); 52 productIndexBO.setShopId(-2);
@@ -3,9 +3,9 @@ package com.yoho.search.consumer.service.logicService.ufo.yoho; @@ -3,9 +3,9 @@ package com.yoho.search.consumer.service.logicService.ufo.yoho;
3 import com.yoho.search.consumer.service.bo.ProductIndexBO; 3 import com.yoho.search.consumer.service.bo.ProductIndexBO;
4 import com.yoho.search.consumer.service.bo.ProductPriceBO; 4 import com.yoho.search.consumer.service.bo.ProductPriceBO;
5 import com.yoho.search.consumer.service.logicService.ufo.UfoStoragePriceFieldBuilder; 5 import com.yoho.search.consumer.service.logicService.ufo.UfoStoragePriceFieldBuilder;
6 -import com.yoho.search.dal.model.UfoProduct;  
7 -import com.yoho.search.dal.model.UfoStorage;  
8 -import com.yoho.search.dal.model.UfoStoragePrice; 6 +import com.yoho.search.dal.model.ufo_product.Product;
  7 +import com.yoho.search.dal.model.ufo_product.Storage;
  8 +import com.yoho.search.dal.model.ufo_product.StoragePrice;
9 import org.apache.commons.collections.CollectionUtils; 9 import org.apache.commons.collections.CollectionUtils;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
@@ -27,22 +27,22 @@ public class UfoToYohoPriceService { @@ -27,22 +27,22 @@ public class UfoToYohoPriceService {
27 @Autowired 27 @Autowired
28 private UfoStoragePriceFieldBuilder ufoStoragePriceFieldBuilder; 28 private UfoStoragePriceFieldBuilder ufoStoragePriceFieldBuilder;
29 29
30 - public void build(ProductIndexBO productIndexBO, UfoProduct ufoProduct, Map<Integer, List<UfoStoragePrice>> ufoStoragePriceMap, Map<Integer, List<UfoStorage>> ufoStorageMap) {  
31 - List<UfoStorage> ufoStorageList = ufoStorageMap.get(ufoProduct.getId());  
32 - if (CollectionUtils.isEmpty(ufoStorageList)) { 30 + public void build(ProductIndexBO productIndexBO, Product product, Map<Integer, List<StoragePrice>> ufoStoragePriceMap, Map<Integer, List<Storage>> ufoStorageMap) {
  31 + List<Storage> storageList = ufoStorageMap.get(product.getId());
  32 + if (CollectionUtils.isEmpty(storageList)) {
33 productIndexBO.setStatus(0); 33 productIndexBO.setStatus(0);
34 return; 34 return;
35 } 35 }
36 - Map<Integer, UfoStorage> idStorageMap = new HashMap<>();  
37 - if (CollectionUtils.isNotEmpty(ufoStorageList)) {  
38 - idStorageMap = ufoStorageList.stream().collect(Collectors.toMap(UfoStorage::getId, p -> p)); 36 + Map<Integer, Storage> idStorageMap = new HashMap<>();
  37 + if (CollectionUtils.isNotEmpty(storageList)) {
  38 + idStorageMap = storageList.stream().collect(Collectors.toMap(Storage::getId, p -> p));
39 } 39 }
40 - List<UfoStoragePrice> ufoStoragePriceList = ufoStoragePriceMap.get(ufoProduct.getId());  
41 - if (CollectionUtils.isEmpty(ufoStoragePriceList)) { 40 + List<StoragePrice> storagePriceList = ufoStoragePriceMap.get(product.getId());
  41 + if (CollectionUtils.isEmpty(storagePriceList)) {
42 productIndexBO.setStatus(0); 42 productIndexBO.setStatus(0);
43 return; 43 return;
44 } 44 }
45 - BigDecimal price = ufoStoragePriceFieldBuilder.buildPrice(ufoStoragePriceList, idStorageMap); 45 + BigDecimal price = ufoStoragePriceFieldBuilder.buildPrice(storagePriceList, idStorageMap);
46 if (price == null) { 46 if (price == null) {
47 productIndexBO.setStatus(0); 47 productIndexBO.setStatus(0);
48 return; 48 return;
1 package com.yoho.search.consumer.service.logicService.ufo.yoho; 1 package com.yoho.search.consumer.service.logicService.ufo.yoho;
2 2
3 import com.yoho.search.consumer.service.bo.ProductIndexBO; 3 import com.yoho.search.consumer.service.bo.ProductIndexBO;
4 -import com.yoho.search.dal.model.Size;  
5 -import com.yoho.search.dal.model.UfoProduct;  
6 -import com.yoho.search.dal.model.UfoSize;  
7 -import com.yoho.search.dal.model.UfoStorage; 4 +import com.yoho.search.dal.model.ufo_product.Product;
  5 +import com.yoho.search.dal.model.ufo_product.Size;
  6 +import com.yoho.search.dal.model.ufo_product.Storage;
8 import org.apache.commons.collections.CollectionUtils; 7 import org.apache.commons.collections.CollectionUtils;
9 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
10 9
@@ -20,22 +19,22 @@ import java.util.Map; @@ -20,22 +19,22 @@ import java.util.Map;
20 @Component 19 @Component
21 public class UfoToYohoSizeService { 20 public class UfoToYohoSizeService {
22 21
23 - public void build(ProductIndexBO productIndexBO, UfoProduct ufoProduct, Map<Short, UfoSize> ufoSizeMap, Map<String, List<Size>> sizeNameMap, Map<Integer, List<UfoStorage>> ufoStorageMap) {  
24 - List<UfoStorage> ufoStorageList = ufoStorageMap.get(ufoProduct.getId());  
25 - if (CollectionUtils.isEmpty(ufoStorageList)) { 22 + public void build(ProductIndexBO productIndexBO, Product product, Map<Short, Size> ufoSizeMap, Map<String, List<com.yoho.search.dal.model.Size>> sizeNameMap, Map<Integer, List<Storage>> ufoStorageMap) {
  23 + List<Storage> storageList = ufoStorageMap.get(product.getId());
  24 + if (CollectionUtils.isEmpty(storageList)) {
26 return; 25 return;
27 } 26 }
28 StringBuilder sizeIds = new StringBuilder(); 27 StringBuilder sizeIds = new StringBuilder();
29 StringBuilder sizeNames = new StringBuilder(); 28 StringBuilder sizeNames = new StringBuilder();
30 - for (UfoStorage ufoStorage : ufoStorageList) { 29 + for (Storage storage : storageList) {
31 //通过sizeId查询到UFO的size信息 30 //通过sizeId查询到UFO的size信息
32 - if (ufoSizeMap.containsKey(ufoStorage.getSizeId())) {  
33 - UfoSize ufoSize = ufoSizeMap.get(ufoStorage.getSizeId()); 31 + if (ufoSizeMap.containsKey(storage.getSizeId())) {
  32 + Size ufoSize = ufoSizeMap.get(storage.getSizeId());
34 //通过UFO size名称映射到有货的Size 33 //通过UFO size名称映射到有货的Size
35 if (sizeNameMap.containsKey(ufoSize.getSizeName())) { 34 if (sizeNameMap.containsKey(ufoSize.getSizeName())) {
36 - List<Size> sizeList = sizeNameMap.get(ufoSize.getSizeName()); 35 + List<com.yoho.search.dal.model.Size> sizeList = sizeNameMap.get(ufoSize.getSizeName());
37 if (CollectionUtils.isNotEmpty(sizeList)) { 36 if (CollectionUtils.isNotEmpty(sizeList)) {
38 - Size size = sizeList.get(0); 37 + com.yoho.search.dal.model.Size size = sizeList.get(0);
39 sizeIds.append(size.getId()).append(","); 38 sizeIds.append(size.getId()).append(",");
40 sizeNames.append(size.getSizeName()).append(","); 39 sizeNames.append(size.getSizeName()).append(",");
41 } 40 }
@@ -2,8 +2,8 @@ package com.yoho.search.consumer.service.logicService.ufo.yoho; @@ -2,8 +2,8 @@ package com.yoho.search.consumer.service.logicService.ufo.yoho;
2 2
3 import com.yoho.search.consumer.service.bo.ProductIndexBO; 3 import com.yoho.search.consumer.service.bo.ProductIndexBO;
4 import com.yoho.search.dal.model.ProductSort; 4 import com.yoho.search.dal.model.ProductSort;
5 -import com.yoho.search.dal.model.UfoProduct;  
6 -import com.yoho.search.dal.model.UfoSearchSortRelation; 5 +import com.yoho.search.dal.model.ufo_product.Product;
  6 +import com.yoho.search.dal.model.ufo_product.SearchSortRelation;
7 import org.slf4j.Logger; 7 import org.slf4j.Logger;
8 import org.slf4j.LoggerFactory; 8 import org.slf4j.LoggerFactory;
9 import org.springframework.stereotype.Component; 9 import org.springframework.stereotype.Component;
@@ -21,13 +21,13 @@ public class UfoToYohoSortService { @@ -21,13 +21,13 @@ public class UfoToYohoSortService {
21 21
22 private static final Logger logger = LoggerFactory.getLogger(UfoToYohoSortService.class); 22 private static final Logger logger = LoggerFactory.getLogger(UfoToYohoSortService.class);
23 23
24 - public void build(ProductIndexBO productIndexBO, UfoProduct ufoProduct, Map<Integer, ProductSort> productSortMap, Map<Integer, UfoSearchSortRelation> ufoSortRelationMap) { 24 + public void build(ProductIndexBO productIndexBO, Product product, Map<Integer, ProductSort> productSortMap, Map<Integer, SearchSortRelation> ufoSortRelationMap) {
25 try { 25 try {
26 //处理大分类 26 //处理大分类
27 - if (ufoSortRelationMap.containsKey(Integer.valueOf(ufoProduct.getMaxSortId()))) {  
28 - UfoSearchSortRelation ufoSearchSortRelation = ufoSortRelationMap.get(Integer.valueOf(ufoProduct.getMaxSortId()));  
29 - if (ufoSearchSortRelation != null) {  
30 - ProductSort productSort = productSortMap.get(ufoSearchSortRelation.getYohoSortId()); 27 + if (ufoSortRelationMap.containsKey(Integer.valueOf(product.getMaxSortId()))) {
  28 + SearchSortRelation searchSortRelation = ufoSortRelationMap.get(Integer.valueOf(product.getMaxSortId()));
  29 + if (searchSortRelation != null) {
  30 + ProductSort productSort = productSortMap.get(searchSortRelation.getYohoSortId());
31 if (productSort != null) { 31 if (productSort != null) {
32 productIndexBO.setMaxSortId(productSort.getId()); 32 productIndexBO.setMaxSortId(productSort.getId());
33 productIndexBO.setMaxSortName(productSort.getId() + ":" + productSort.getSortName() + ":" + productSort.getOrderBy()); 33 productIndexBO.setMaxSortName(productSort.getId() + ":" + productSort.getSortName() + ":" + productSort.getOrderBy());
@@ -36,16 +36,16 @@ public class UfoToYohoSortService { @@ -36,16 +36,16 @@ public class UfoToYohoSortService {
36 } 36 }
37 } 37 }
38 //处理中分类和小分类 38 //处理中分类和小分类
39 - if (ufoSortRelationMap.containsKey(Integer.valueOf(ufoProduct.getMidSortId()))) {  
40 - UfoSearchSortRelation ufoSearchSortRelation = ufoSortRelationMap.get(Integer.valueOf(ufoProduct.getMidSortId()));  
41 - if (ufoSearchSortRelation != null) {  
42 - ProductSort productSortMid = productSortMap.get(ufoSearchSortRelation.getYohoSortId()); 39 + if (ufoSortRelationMap.containsKey(Integer.valueOf(product.getMidSortId()))) {
  40 + SearchSortRelation searchSortRelation = ufoSortRelationMap.get(Integer.valueOf(product.getMidSortId()));
  41 + if (searchSortRelation != null) {
  42 + ProductSort productSortMid = productSortMap.get(searchSortRelation.getYohoSortId());
43 if (productSortMid != null) { 43 if (productSortMid != null) {
44 productIndexBO.setMiddleSortId(productSortMid.getId()); 44 productIndexBO.setMiddleSortId(productSortMid.getId());
45 productIndexBO.setMiddleSortName(productSortMid.getId() + ":" + productSortMid.getSortName() + ":" + productSortMid.getOrderBy()); 45 productIndexBO.setMiddleSortName(productSortMid.getId() + ":" + productSortMid.getSortName() + ":" + productSortMid.getOrderBy());
46 productIndexBO.setMiddleSort(productSortMid.getSortName()); 46 productIndexBO.setMiddleSort(productSortMid.getSortName());
47 } 47 }
48 - ProductSort productSortSmall = productSortMap.get(ufoSearchSortRelation.getYohoSmallSortId()); 48 + ProductSort productSortSmall = productSortMap.get(searchSortRelation.getYohoSmallSortId());
49 if (productSortSmall != null) { 49 if (productSortSmall != null) {
50 productIndexBO.setSmallSortId(productSortSmall.getId()); 50 productIndexBO.setSmallSortId(productSortSmall.getId());
51 productIndexBO.setSmallSortName(productSortSmall.getId() + ":" + productSortSmall.getSortName() + ":" + productSortSmall.getOrderBy()); 51 productIndexBO.setSmallSortName(productSortSmall.getId() + ":" + productSortSmall.getSortName() + ":" + productSortSmall.getOrderBy());
@@ -8,7 +8,7 @@ import com.yoho.search.dal.TblBrandMapper; @@ -8,7 +8,7 @@ import com.yoho.search.dal.TblBrandMapper;
8 import com.yoho.search.dal.UfoBrandMapper; 8 import com.yoho.search.dal.UfoBrandMapper;
9 import com.yoho.search.dal.model.CsBrandRelation; 9 import com.yoho.search.dal.model.CsBrandRelation;
10 import com.yoho.search.dal.model.TblBrand; 10 import com.yoho.search.dal.model.TblBrand;
11 -import com.yoho.search.dal.model.UfoBrand; 11 +import com.yoho.search.dal.model.ufo_product.Brand;
12 import org.slf4j.Logger; 12 import org.slf4j.Logger;
13 import org.slf4j.LoggerFactory; 13 import org.slf4j.LoggerFactory;
14 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +46,7 @@ public class BrandRelationUtils { @@ -46,7 +46,7 @@ public class BrandRelationUtils {
46 try { 46 try {
47 Map<String, Integer> yohoBrandNameMap = basicDataLogicService.getBrandNameMap(); 47 Map<String, Integer> yohoBrandNameMap = basicDataLogicService.getBrandNameMap();
48 List<TblBrand> tblBrandList = tblBrandMapper.selectBrandPageList(0, Integer.MAX_VALUE); 48 List<TblBrand> tblBrandList = tblBrandMapper.selectBrandPageList(0, Integer.MAX_VALUE);
49 - List<UfoBrand> ufoBrandList = ufoBrandMapper.selectPageList(0, Integer.MAX_VALUE); 49 + List<Brand> brandList = ufoBrandMapper.selectPageList(0, Integer.MAX_VALUE);
50 List<CsBrandRelation> csBrandRelationList = new ArrayList<>(); 50 List<CsBrandRelation> csBrandRelationList = new ArrayList<>();
51 for (TblBrand tblBrand : tblBrandList) { 51 for (TblBrand tblBrand : tblBrandList) {
52 String tblBrandName = filterBrandName(tblBrand.getBrandNameEn()); 52 String tblBrandName = filterBrandName(tblBrand.getBrandNameEn());
@@ -56,11 +56,11 @@ public class BrandRelationUtils { @@ -56,11 +56,11 @@ public class BrandRelationUtils {
56 csBrandRelationList.add(csBrandRelation); 56 csBrandRelationList.add(csBrandRelation);
57 } 57 }
58 } 58 }
59 - for (UfoBrand ufoBrand : ufoBrandList) {  
60 - String ufoBrandName = filterBrandName(ufoBrand.getBrandName()); 59 + for (Brand brand : brandList) {
  60 + String ufoBrandName = filterBrandName(brand.getBrandName());
61 if (yohoBrandNameMap.containsKey(ufoBrandName)) { 61 if (yohoBrandNameMap.containsKey(ufoBrandName)) {
62 Integer yohoBrandId = yohoBrandNameMap.get(ufoBrandName); 62 Integer yohoBrandId = yohoBrandNameMap.get(ufoBrandName);
63 - CsBrandRelation csBrandRelation = createCsBrandRelation(yohoBrandId, null, Integer.valueOf(ufoBrand.getId())); 63 + CsBrandRelation csBrandRelation = createCsBrandRelation(yohoBrandId, null, Integer.valueOf(brand.getId()));
64 csBrandRelationList.add(csBrandRelation); 64 csBrandRelationList.add(csBrandRelation);
65 } 65 }
66 } 66 }
@@ -89,7 +89,7 @@ public class BrandRelationUtils { @@ -89,7 +89,7 @@ public class BrandRelationUtils {
89 List<String> ufoNoRelationIdList = new ArrayList<>(); 89 List<String> ufoNoRelationIdList = new ArrayList<>();
90 Map<String, Integer> yohoBrandNameMap = basicDataLogicService.getBrandNameMap(); 90 Map<String, Integer> yohoBrandNameMap = basicDataLogicService.getBrandNameMap();
91 List<TblBrand> tblBrandList = tblBrandMapper.selectBrandPageList(0, Integer.MAX_VALUE); 91 List<TblBrand> tblBrandList = tblBrandMapper.selectBrandPageList(0, Integer.MAX_VALUE);
92 - List<UfoBrand> ufoBrandList = ufoBrandMapper.selectPageList(0, Integer.MAX_VALUE); 92 + List<Brand> brandList = ufoBrandMapper.selectPageList(0, Integer.MAX_VALUE);
93 for (TblBrand tblBrand : tblBrandList) { 93 for (TblBrand tblBrand : tblBrandList) {
94 String tblBrandName = filterBrandName(tblBrand.getBrandNameEn()); 94 String tblBrandName = filterBrandName(tblBrand.getBrandNameEn());
95 if (yohoBrandNameMap.containsKey(tblBrandName)) { 95 if (yohoBrandNameMap.containsKey(tblBrandName)) {
@@ -99,13 +99,13 @@ public class BrandRelationUtils { @@ -99,13 +99,13 @@ public class BrandRelationUtils {
99 tblNoRelationIdList.add(tblBrand.getBrandNameEn() + "(" + tblBrand.getBrandId() + ")"); 99 tblNoRelationIdList.add(tblBrand.getBrandNameEn() + "(" + tblBrand.getBrandId() + ")");
100 } 100 }
101 } 101 }
102 - for (UfoBrand ufoBrand : ufoBrandList) {  
103 - String ufoBrandName = filterBrandName(ufoBrand.getBrandName()); 102 + for (Brand brand : brandList) {
  103 + String ufoBrandName = filterBrandName(brand.getBrandName());
104 if (yohoBrandNameMap.containsKey(ufoBrandName)) { 104 if (yohoBrandNameMap.containsKey(ufoBrandName)) {
105 Integer yohoBrandId = yohoBrandNameMap.get(ufoBrandName); 105 Integer yohoBrandId = yohoBrandNameMap.get(ufoBrandName);
106 - ufoRelationList.add(ufoBrand.getBrandName() + "(" + ufoBrand.getId() + "<->" + yohoBrandId + ")"); 106 + ufoRelationList.add(brand.getBrandName() + "(" + brand.getId() + "<->" + yohoBrandId + ")");
107 } else { 107 } else {
108 - ufoNoRelationIdList.add(ufoBrand.getBrandName() + "(" + ufoBrand.getId() + ")"); 108 + ufoNoRelationIdList.add(brand.getBrandName() + "(" + brand.getId() + ")");
109 } 109 }
110 } 110 }
111 JSONObject jsonObject = new JSONObject(); 111 JSONObject jsonObject = new JSONObject();