Commit dfb242fa authored by 陈家荣's avatar 陈家荣

update

parent e7a42aff
...@@ -384,15 +384,15 @@ public class KolonMemberServiceImpl implements KolonMemberService { ...@@ -384,15 +384,15 @@ public class KolonMemberServiceImpl implements KolonMemberService {
} }
private String[] convertDataUpdate(KolonMember km,Member member, String channelCode) { private String[] convertDataUpdate(KolonMember km,Member member, String channelCode) {
String sex = member == null ? null : member.sex.toString(); String sex = member == null || member.sex == null ? null : member.sex.toString();
String birthday = member == null ? null : Util.dateToString(member.birthday); String birthday = member == null ? null : Util.dateToString(member.birthday);
String provinceCode = member == null ? null : member.provinceCode.toString(); String provinceCode = member == null || member.provinceCode == null ? null : member.provinceCode.toString();
String cityCode = member == null ? null : member.cityCode.toString(); String cityCode = member == null || member.cityCode == null ? null : member.cityCode.toString();
String sectionCode = member == null ? null : member.sectionCode.toString(); String sectionCode = member == null || member.sectionCode == null ? null : member.sectionCode.toString();
String address = member == null ? null : member.address; String address = member == null ? null : member.address;
return new String[] { km.csNo.toString(), km.phone, km.email, km.wechatFirstName, km.wechatLastName, sex, return new String[] { km.csNo, km.phone, km.email, km.wechatFirstName, km.wechatLastName, sex,
birthday, provinceCode, cityCode, sectionCode, birthday, provinceCode, cityCode, sectionCode,
address, null, Util.dateToString(km.updateTime), channelCode}; address, null, Util.dateToString(km.updateTime), channelCode};
} }
...@@ -407,13 +407,13 @@ public class KolonMemberServiceImpl implements KolonMemberService { ...@@ -407,13 +407,13 @@ public class KolonMemberServiceImpl implements KolonMemberService {
channelCode = mongoPiShop.shopCode; channelCode = mongoPiShop.shopCode;
} }
String sex = member == null ? null : member.sex.toString(); String sex = member == null || member.sex == null ? null : member.sex.toString();
String birthday = member == null ? null : Util.dateToString(member.birthday); String birthday = member == null ? null : Util.dateToString(member.birthday);
String provinceCode = member == null ? null : member.provinceCode.toString(); String provinceCode = member == null || member.provinceCode == null ? null : member.provinceCode.toString();
String cityCode = member == null ? null : member.cityCode.toString(); String cityCode = member == null || member.cityCode == null ? null : member.cityCode.toString();
String sectionCode = member == null ? null : member.sectionCode.toString(); String sectionCode = member == null || member.sectionCode == null ? null : member.sectionCode.toString();
String address = member == null ? null : member.address; String address = member == null ? null : member.address;
return new String[] { km.csNo.toString(), km.phone, km.email, km.wechatFirstName, km.wechatLastName, sex, return new String[] { km.csNo, km.phone, km.email, km.wechatFirstName, km.wechatLastName, sex,
birthday, provinceCode, cityCode, sectionCode, birthday, provinceCode, cityCode, sectionCode,
address, Util.dateToString(km.joinTime), null, channelCode}; address, Util.dateToString(km.joinTime), null, channelCode};
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment