Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
task-kolon
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
piplus-v3
task-kolon
Commits
f6c119a1
Commit
f6c119a1
authored
Jun 16, 2016
by
刘文胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
status更新不成功
parent
55eeeff9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
KolonMemberServiceImpl.java
...java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java
+4
-4
kolon.sandbox.properties
src/main/resources/kolon.sandbox.properties
+6
-6
No files found.
src/main/java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java
View file @
f6c119a1
...
...
@@ -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
;
}
...
...
src/main/resources/kolon.sandbox.properties
View file @
f6c119a1
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment