Commit f6c119a1 authored by 刘文胜's avatar 刘文胜

status更新不成功

parent 55eeeff9
......@@ -138,19 +138,19 @@ public class KolonMemberServiceImpl implements KolonMemberService {
kolonMember.lastName = kolonMemberDTO.lastName;
flag = true;
}
if (!Util.isNotNull(kolonMemberDTO.status)) {
if (kolonMemberDTO.status!=null) {
kolonMember.status = kolonMemberDTO.status;
flag = true;
}
if (!Util.isNotNull(kolonMemberDTO.bonus)) {
if (kolonMemberDTO.bonus!=null) {
kolonMember.bonus = kolonMemberDTO.bonus;
flag = true;
}
if (!Util.isNotNull(kolonMemberDTO.lifecycle)) {
if (StringUtils.isNotEmpty(kolonMemberDTO.lifecycle)) {
kolonMember.lifecycle = kolonMemberDTO.lifecycle;
flag = true;
}
if (!Util.isNotNull(kolonMemberDTO.customerType)) {
if (kolonMemberDTO.customerType != null) {
kolonMember.customerType = kolonMemberDTO.customerType;
flag = true;
}
......
......@@ -28,18 +28,18 @@ kolon.property.member.ftp.putFileDir = /SCRM/
kolon.property.member.ftp.putAddFileName = newContact_YYYY-MM-dd.csv
kolon.property.member.ftp.putUpdateFileName = updateContact_YYYY-MM-dd.csv
kolon.property.product.ftp.server = 112.124.57.138
kolon.property.product.ftp.server = exchange.si.emarsys.net
kolon.property.product.ftp.port = 21
kolon.property.product.ftp.userName = mark
kolon.property.product.ftp.password = yang19821123
kolon.property.product.ftp.userName = kolon
kolon.property.product.ftp.password = UQzxqi5vbahgIARwVfKz
kolon.property.product.ftp.getFileDir = /
kolon.property.product.ftp.getFileHistoryDir = /history/
kolon.property.product.ftp.fileName = products
kolon.property.sale.ftp.server = 112.124.57.138
kolon.property.sale.ftp.server = exchange.si.emarsys.net
kolon.property.sale.ftp.port = 21
kolon.property.sale.ftp.userName = mark
kolon.property.sale.ftp.password = yang19821123
kolon.property.sale.ftp.userName = kolon
kolon.property.sale.ftp.password = UQzxqi5vbahgIARwVfKz
kolon.property.sale.ftp.getFileDir = /
kolon.property.sale.ftp.getFileHistoryDir = /history/
kolon.property.sale.ftp.fileName = sales
\ No newline at end of file
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