Authored by wangnan

fix

@@ -7,9 +7,10 @@ @@ -7,9 +7,10 @@
7 <result column="is_del" property="isDel" jdbcType="VARCHAR"/> 7 <result column="is_del" property="isDel" jdbcType="VARCHAR"/>
8 <result column="promotion_type" property="promotionType" jdbcType="VARCHAR"/> 8 <result column="promotion_type" property="promotionType" jdbcType="VARCHAR"/>
9 <result column="action_param" property="actionParam" jdbcType="VARCHAR"/> 9 <result column="action_param" property="actionParam" jdbcType="VARCHAR"/>
  10 + <result column="reject_param" property="rejectParam" jdbcType="VARCHAR"/>
10 </resultMap> 11 </resultMap>
11 <sql id="Base_Column_List"> 12 <sql id="Base_Column_List">
12 - promotion_id, condition_param, is_del ,promotion_type,action_param 13 + promotion_id, condition_param, is_del ,promotion_type,action_param,reject_param
13 </sql> 14 </sql>
14 15
15 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer"> 16 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -40,7 +41,8 @@ @@ -40,7 +41,8 @@
40 #{conditionParam,jdbcType=VARCHAR}, 41 #{conditionParam,jdbcType=VARCHAR},
41 #{isDel,jdbcType=VARCHAR}, 42 #{isDel,jdbcType=VARCHAR},
42 #{promotionType,jdbcType=VARCHAR}, 43 #{promotionType,jdbcType=VARCHAR},
43 - #{actionParam,jdbcType=VARCHAR}) 44 + #{actionParam,jdbcType=VARCHAR},
  45 + #{rejectParam,jdbcType=VARCHAR})
44 </insert> 46 </insert>
45 47
46 <update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.PromotionParams"> 48 <update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.PromotionParams">
@@ -48,7 +50,8 @@ @@ -48,7 +50,8 @@
48 set condition_param = #{conditionParam,jdbcType=VARCHAR}, 50 set condition_param = #{conditionParam,jdbcType=VARCHAR},
49 is_del = #{isDel,jdbcType=VARCHAR}, 51 is_del = #{isDel,jdbcType=VARCHAR},
50 promotion_type= #{promotionType,jdbcType=VARCHAR}, 52 promotion_type= #{promotionType,jdbcType=VARCHAR},
51 - action_param= #{actionParam,jdbcType=VARCHAR} 53 + action_param= #{actionParam,jdbcType=VARCHAR},
  54 + reject_param= #{rejectParam,jdbcType=VARCHAR}
52 where promotion_id = #{promotionId,jdbcType=INTEGER} 55 where promotion_id = #{promotionId,jdbcType=INTEGER}
53 </update> 56 </update>
54 </mapper> 57 </mapper>
@@ -70,11 +70,13 @@ public class PromotionIndexIndexBuilder extends IIndexBuilder { @@ -70,11 +70,13 @@ public class PromotionIndexIndexBuilder extends IIndexBuilder {
70 promotionIndexBO.setStatus(promotionInfo.getStatus()); 70 promotionIndexBO.setStatus(promotionInfo.getStatus());
71 promotionIndexBO.setTitle(promotionInfo.getTitle()); 71 promotionIndexBO.setTitle(promotionInfo.getTitle());
72 promotionIndexBO.setShowStatus(promotionInfo.getShowStatus()); 72 promotionIndexBO.setShowStatus(promotionInfo.getShowStatus());
  73 + promotionIndexBO.setPriority(promotionInfo.getPriority());
73 } 74 }
74 if (promotionParams != null) { 75 if (promotionParams != null) {
75 promotionIndexBO.setPromotionType(promotionParams.getPromotionType()); 76 promotionIndexBO.setPromotionType(promotionParams.getPromotionType());
76 promotionIndexBO.setConditionParam(promotionParams.getConditionParam()); 77 promotionIndexBO.setConditionParam(promotionParams.getConditionParam());
77 promotionIndexBO.setActionParam(promotionParams.getActionParam()); 78 promotionIndexBO.setActionParam(promotionParams.getActionParam());
  79 + promotionIndexBO.setRejectParam(promotionParams.getRejectParam());
78 } 80 }
79 return promotionIndexBO; 81 return promotionIndexBO;
80 } 82 }
@@ -39,6 +39,12 @@ @@ -39,6 +39,12 @@
39 }, 39 },
40 "actionParam": { 40 "actionParam": {
41 "type": "keyword" 41 "type": "keyword"
  42 + },
  43 + "rejectParam": {
  44 + "type": "keyword"
  45 + },
  46 + "priority": {
  47 + "type": "long"
42 } 48 }
43 } 49 }
44 } 50 }