Merge branch 'test'

# Conflicts:
#	deploy/src/main/bin/env.sh

@@ -3,15 +3,10 @@
 <config>
     <group>
 		<!--yoho-search-autoconfig-->
-<<<<<<< HEAD
-		<property name="yoho.searchservice.env.webapphome" defaultValue="/home/test/yoho-search-service/deploy" description="应用根目录"/>
-        <property name="yoho.searchservice.env.serverport" defaultValue="7" description="应用端口"/>
-        <property name="yoho.searchservice.env.namespace" defaultValue="search-service" description="应用命名空间"/>
-=======
+
 		<property name="yoho.search.service.env.webapphome" defaultValue="/home/test/yoho-search-service/deploy" description="应用根目录"/>
         <property name="yoho.search.service.env.serverport" defaultValue="7" description="应用端口"/>
         <property name="yoho.search.service.env.namespace" defaultValue="search-service" description="应用命名空间"/>
->>>>>>> dev
 		<property name="yoho.env.javahome" defaultValue="/usr/local/java" description="" />
 		<property name="yoho.env.productmode" defaultValue="TEST" description="" />
 		<property name="yoho.env.serverhome" defaultValue="/usr/local/tomcat" description="" />

 set JAVA_MEM_OPT= -Xms1024m -Xmx1024m -XX:MaxPermSize=128m -Djava.net.preferIPv4Stack=true
 set JAVA_HOME=/usr/local/java
-<<<<<<< HEAD
-set WEB_APP_HOME=/home/master/yoho-search-service/deploy
-
-
-set CATALINA_HOME=/usr/local/tomcat
-set CATALINA_BASE=/home/master/yoho-search/deploy/tomcat_server
-=======
-set WEB_APP_HOME=/home/dev/yoho-search-service/deploy
-
+set WEB_APP_HOME=/home/test/yoho-search-service/deploy
 
 set CATALINA_HOME=/usr/local/tomcat
-set CATALINA_BASE=/home/dev/yoho-search-service/deploy/tomcat_server
->>>>>>> dev
+set CATALINA_BASE=/home/test/yoho-search/deploy/tomcat_server
 
 
 rem set JAVA_DEBUG_OPT= -server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8082,server=y,suspend=n

@@ -208,7 +208,11 @@ public class SearchSortSizeService {
 		if (paramMap.containsKey(ISearchConstans.PARAM_SEARCH_BREAKING)) {
 			sizeSortReqBO.setBreaking(paramMap.get(ISearchConstans.PARAM_SEARCH_BREAKING));
 		}
-
+		
+		if (paramMap.containsKey(ISearchConstans.PARAM_SEARCH_ISDISCOUNT)) {
+			sizeSortReqBO.setIsdiscount(paramMap.get(ISearchConstans.PARAM_SEARCH_ISDISCOUNT));
+		}
+		
 		if (paramMap.containsKey(ISearchConstans.PARAM_SEARCH_STORAGENUM)) {
 			sizeSortReqBO.setStorage_num(paramMap.get(ISearchConstans.PARAM_SEARCH_STORAGENUM));
 		}

@@ -2,7 +2,7 @@ package com.yoho.search.vo;
 
 public class SizeSortReqBO {
 
-	private String isdiscount = "Y";// 是否打折
+	private String isdiscount = "";// 是否打折
 	private String storage_num = "1";
 	private String breaking = "1";