绑定的也提交channel code

src/main/java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java

@@ -384,21 +384,33 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 	}
 	
 	private String[] convertDataUpdate(KolonMember km,Member member, String channelCode) {
+		channelCode = getShopCode(member, channelCode);
 		String sex = member == null || member.sex == null ? null : member.sex.toString();
 		String birthday = member == null ? null : Util.dateToString(member.birthday);
 		String provinceCode = member == null || member.provinceCode == null ? null : member.provinceCode.toString();
 		String cityCode = member == null || member.cityCode == null ? null : member.cityCode.toString();
 		String sectionCode = member == null || member.sectionCode == null ? null : member.sectionCode.toString();
 		String address = member == null ? null : member.address;
-		
-		
 		return new String[] { km.csNo, km.phone, km.email, km.wechatFirstName, km.wechatLastName, sex,
 				birthday, provinceCode, cityCode, sectionCode,
 				address, null, Util.dateToString(km.updateTime), channelCode};
 	}
+
 	
 	private String[] convertDataAdd(KolonMember km,Member member, String channelCode) {
-		//获取门店编号
+		channelCode = getShopCode(member, channelCode);
+		String sex = member == null || member.sex == null ? null : member.sex.toString();
+		String birthday = member == null ? null : Util.dateToString(member.birthday);
+		String provinceCode = member == null || member.provinceCode == null ? null : member.provinceCode.toString();
+		String cityCode = member == null || member.cityCode == null ? null : member.cityCode.toString();
+		String sectionCode = member == null || member.sectionCode == null ? null : member.sectionCode.toString();
+		String address = member == null ? null : member.address;
+		return new String[] { km.csNo, km.phone, km.email, km.wechatFirstName, km.wechatLastName, sex,
+				birthday, provinceCode, cityCode, sectionCode,
+				address, Util.dateToString(km.joinTime), null, channelCode};
+	}
+	//获取门店编号
+	private String getShopCode(Member member, String channelCode) {
 		if(member != null && member.user != null && member.user.sourse != null && member.user.sourse.length() > 0){
 			String sourse = member.user.sourse;
 			//获取shopID
@@ -410,16 +422,7 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 				LOGGER.warn("kolon获取门店编号出错，没有找到ID为【"+shopId+"】门店");
 			}
 		}
-		
-		String sex = member == null || member.sex == null ? null : member.sex.toString();
-		String birthday = member == null ? null : Util.dateToString(member.birthday);
-		String provinceCode = member == null || member.provinceCode == null ? null : member.provinceCode.toString();
-		String cityCode = member == null || member.cityCode == null ? null : member.cityCode.toString();
-		String sectionCode = member == null || member.sectionCode == null ? null : member.sectionCode.toString();
-		String address = member == null ? null : member.address;
-		return new String[] { km.csNo, km.phone, km.email, km.wechatFirstName, km.wechatLastName, sex,
-				birthday, provinceCode, cityCode, sectionCode,
-				address, Util.dateToString(km.joinTime), null, channelCode};
+		return channelCode;
 	}