会服会员批量绑定功能

fun-common-soa/src/main/resources/debug/app.properties

-imageEndpoint=http://7x2w1g.com1.z0.glb.clouddn.com
+imageEndpoint=http://img.iwanoutdoor.com
 accessKey=s_FZUyzvhxv10JMRzJOBwy5rObZWYlEwwNC9rVt2
 secretKey=flCPDL5VVrWx4n9VnzSr6zN1wN4XZega_3cWPqmH
 bucketName=ofrog
@@ -18,7 +18,7 @@ rpcConnectionTimeout=300000
 weather.appkey=10003
 weather.serverPath=http://api.k780.com:88/?app=weather.future&weaid=
 weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json
-weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
+weather.imagePath=http://img.iwanoutdoor.com/
 
 #payment3
 payment.queryPayStatusPath=https://payapi.ctrip.com/api-merchant/json/QueryPayStatusV3                        

fun-common-soa/src/main/resources/development/app.properties

-imageEndpoint=http://7x2w1g.com1.z0.glb.clouddn.com
+imageEndpoint=http://img.iwanoutdoor.com
 accessKey=s_FZUyzvhxv10JMRzJOBwy5rObZWYlEwwNC9rVt2
 secretKey=flCPDL5VVrWx4n9VnzSr6zN1wN4XZega_3cWPqmH
 bucketName=ofrog
@@ -18,7 +18,7 @@ rpcConnectionTimeout=300000
 weather.appkey=10003
 weather.serverPath=http://api.k780.com:88/?app=weather.future&weaid=
 weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json
-weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
+weather.imagePath=http://img.iwanoutdoor.com/
 
 #payment3
 

fun-common-soa/src/main/resources/test/app.properties

-imageEndpoint=http://7x2w1g.com1.z0.glb.clouddn.com
+imageEndpoint=http://img.iwanoutdoor.com
 accessKey=s_FZUyzvhxv10JMRzJOBwy5rObZWYlEwwNC9rVt2
 secretKey=flCPDL5VVrWx4n9VnzSr6zN1wN4XZega_3cWPqmH
 bucketName=ofrog
@@ -18,7 +18,7 @@ rpcConnectionTimeout=300000
 weather.appkey=10003
 weather.serverPath=http://api.k780.com:88/?app=weather.future&weaid=
 weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json
-weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
+weather.imagePath=http://img.iwanoutdoor.com/
 
 #payment2
 payment.queryPayStatusPath=https://payapi.ctrip.com/api-merchant/json/QueryPayStatusV3

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/CommuneAdmBean.java

@@ -168,11 +168,34 @@ public class CommuneAdmBean implements java.io.Serializable {
 	public void setCustomerRegionMsg(String customerRegionMsg) {
 		this.customerRegionMsg = customerRegionMsg;
 	}
-    
-    
+    	   
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof CommuneAdmBean)) {
+			return false;
+		}
+
+		CommuneAdmBean communeAdmBean = (CommuneAdmBean) o;
 
-	
+/*		if (id.intValue() != communeAdmBean.id.intValue()){
+			return false;
+		}*/
+		
+		boolean aaa = mobilePhone != null ? mobilePhone
+					.equals(communeAdmBean.mobilePhone)
+					: communeAdmBean.mobilePhone == null;
 
+		return aaa;
+
+	}
 
-	
+    @Override
+    public int hashCode() {
+        int result = id;
+        result = 31 * result + (mobilePhone != null ? mobilePhone.hashCode() : 0);
+        return result;
+    }
 }

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/CommuneAdmQuery.java

@@ -40,6 +40,10 @@ public class CommuneAdmQuery extends AbstractPagedQuery<CommuneAdmQuery> {
      * 客户区域：1.北方 2.东方 3.南方广州 4.南方深圳
      */
     private Integer customerRegion;
+    /**
+     * 批量的电话号码拼接
+     */
+    private String mobileOfcommunes;
 	
 	
 	public String getUid() {
@@ -120,7 +124,12 @@ public class CommuneAdmQuery extends AbstractPagedQuery<CommuneAdmQuery> {
 	public void setNotlabels(String notlabels) {
 		this.notlabels = notlabels;
 	}
-	
+	public String getMobileOfcommunes() {
+		return mobileOfcommunes;
+	}
+	public void setMobileOfcommunes(String mobileOfcommunes) {
+		this.mobileOfcommunes = mobileOfcommunes;
+	}
 	
 	
 }

tatugit stat

@@ -2,7 +2,7 @@
 index 2c85038..e4f93bf 100644
 --- a/fun-common-soa/src/main/resources/development/app.properties
 +++ b/fun-common-soa/src/main/resources/development/app.properties
-@@ -22,14 +22,14 @@ weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
+@@ -22,14 +22,14 @@ weather.imagePath=http://img.iwanoutdoor.com/
  
  #payment2
  #payment.createPayOrderPath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/createpayorder