Authored by wangnan

fix

... ... @@ -7,9 +7,10 @@
<result column="is_del" property="isDel" jdbcType="VARCHAR"/>
<result column="promotion_type" property="promotionType" jdbcType="VARCHAR"/>
<result column="action_param" property="actionParam" jdbcType="VARCHAR"/>
<result column="reject_param" property="rejectParam" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
promotion_id, condition_param, is_del ,promotion_type,action_param
promotion_id, condition_param, is_del ,promotion_type,action_param,reject_param
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
... ... @@ -40,7 +41,8 @@
#{conditionParam,jdbcType=VARCHAR},
#{isDel,jdbcType=VARCHAR},
#{promotionType,jdbcType=VARCHAR},
#{actionParam,jdbcType=VARCHAR})
#{actionParam,jdbcType=VARCHAR},
#{rejectParam,jdbcType=VARCHAR})
</insert>
<update id="updateByPrimaryKey" parameterType="com.yoho.search.dal.model.PromotionParams">
... ... @@ -48,7 +50,8 @@
set condition_param = #{conditionParam,jdbcType=VARCHAR},
is_del = #{isDel,jdbcType=VARCHAR},
promotion_type= #{promotionType,jdbcType=VARCHAR},
action_param= #{actionParam,jdbcType=VARCHAR}
action_param= #{actionParam,jdbcType=VARCHAR},
reject_param= #{rejectParam,jdbcType=VARCHAR}
where promotion_id = #{promotionId,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
... ...
... ... @@ -70,11 +70,13 @@ public class PromotionIndexIndexBuilder extends IIndexBuilder {
promotionIndexBO.setStatus(promotionInfo.getStatus());
promotionIndexBO.setTitle(promotionInfo.getTitle());
promotionIndexBO.setShowStatus(promotionInfo.getShowStatus());
promotionIndexBO.setPriority(promotionInfo.getPriority());
}
if (promotionParams != null) {
promotionIndexBO.setPromotionType(promotionParams.getPromotionType());
promotionIndexBO.setConditionParam(promotionParams.getConditionParam());
promotionIndexBO.setActionParam(promotionParams.getActionParam());
promotionIndexBO.setRejectParam(promotionParams.getRejectParam());
}
return promotionIndexBO;
}
... ...
... ... @@ -39,6 +39,12 @@
},
"actionParam": {
"type": "keyword"
},
"rejectParam": {
"type": "keyword"
},
"priority": {
"type": "long"
}
}
}
... ...