Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
5ba9d7be
Commit
5ba9d7be
authored
Jul 04, 2024
by
lanbaoming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2024-07-04-8提交
parent
c32f6233
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
82 additions
and
16 deletions
+82
-16
TargetLogServiceImpl.java
.../module/order/service/targetLog/TargetLogServiceImpl.java
+82
-16
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/targetLog/TargetLogServiceImpl.java
View file @
5ba9d7be
...
...
@@ -396,10 +396,23 @@ public class TargetLogServiceImpl extends
consignorDO
.
getCustomerService
());
if
(
d0
!=
null
&&
d1
!=
null
)
{
if
(
d1
.
compareTo
(
d0
)
>
0
)
{
s_gsf
+=
",入参后归属客户经理,不算奖金。"
;
s_gsf
+=
",入仓后归属客户经理,不算奖金。"
+
String
.
valueOf
(
d0
)+
","
+
String
.
valueOf
(
d1
);
saleManid
=
0L
;
orderService
.
updateOrderSalesmanId
(
info
.
getOrderId
(),
0L
);
TargetLogDO
targetLogDO
=
targetLogMapper
.
selectById
(
targetId
);
//客户ID
targetLogDO
.
setCustomerId
(
customerId
);
//客户经理ID
targetLogDO
.
setUserId
(
saleManid
);
targetLogDO
.
setLoglev
(
loglev
);
targetLogDO
.
setGsf
(
s_gsf
);
targetLogDO
.
setGstype
(
n_gstype
);
targetLogDO
.
setUpdateTime
(
new
Date
());
targetLogMapper
.
updateById
(
targetLogDO
);
return
;
}
}
}
...
...
@@ -412,7 +425,6 @@ public class TargetLogServiceImpl extends
s_gsf
+=
",客户在公海池,不算奖金。"
;
}
TargetLogDO
targetLogDO
=
targetLogMapper
.
selectById
(
targetId
);
//客户ID
targetLogDO
.
setCustomerId
(
customerId
);
...
...
@@ -464,10 +476,23 @@ public class TargetLogServiceImpl extends
consignorDO
.
getCustomerService
());
if
(
d0
!=
null
&&
d1
!=
null
)
{
if
(
d1
.
compareTo
(
d0
)
>
0
)
{
s_gsf
+=
",入参后归属客户经理,不算奖金。"
;
s_gsf
+=
",入仓后归属客户经理,不算奖金。"
+
String
.
valueOf
(
d0
)+
","
+
String
.
valueOf
(
d1
);
saleManid
=
0L
;
orderService
.
updateOrderSalesmanId
(
info
.
getOrderId
(),
0L
);
TargetLogDO
targetLogDO
=
targetLogMapper
.
selectById
(
targetId
);
//客户ID
targetLogDO
.
setCustomerId
(
customerId
);
//客户经理ID
targetLogDO
.
setUserId
(
saleManid
);
targetLogDO
.
setLoglev
(
loglev
);
targetLogDO
.
setGsf
(
s_gsf
);
targetLogDO
.
setGstype
(
n_gstype
);
targetLogDO
.
setUpdateTime
(
new
Date
());
targetLogMapper
.
updateById
(
targetLogDO
);
return
;
}
}
}
...
...
@@ -563,10 +588,23 @@ public class TargetLogServiceImpl extends
consignorDO
.
getCustomerService
());
if
(
d0
!=
null
&&
d1
!=
null
)
{
if
(
d1
.
compareTo
(
d0
)
>
0
)
{
s_gsf
+=
",入参后归属客户经理,不算奖金。"
;
s_gsf
+=
",入仓后归属客户经理,不算奖金。"
+
String
.
valueOf
(
d0
)+
","
+
String
.
valueOf
(
d1
);
saleManid
=
0L
;
orderService
.
updateOrderSalesmanId
(
info
.
getOrderId
(),
0L
);
TargetLogDO
targetLogDO
=
targetLogMapper
.
selectById
(
targetId
);
//客户ID
targetLogDO
.
setCustomerId
(
customerId
);
//客户经理ID
targetLogDO
.
setUserId
(
saleManid
);
targetLogDO
.
setLoglev
(
loglev
);
targetLogDO
.
setGsf
(
s_gsf
);
targetLogDO
.
setGstype
(
n_gstype
);
targetLogDO
.
setUpdateTime
(
new
Date
());
targetLogMapper
.
updateById
(
targetLogDO
);
return
;
}
}
}
...
...
@@ -609,7 +647,9 @@ public class TargetLogServiceImpl extends
consigneeDO
.
getCustomerService
());
if
(
d0
!=
null
&&
d1
!=
null
)
{
if
(
d1
.
compareTo
(
d0
)
>
0
)
{
s_gsf
+=
",入参后归属客户经理,不算奖金。"
;
s_gsf
+=
",入仓后归属客户经理,不算奖金。"
+
String
.
valueOf
(
d0
)+
","
+
String
.
valueOf
(
d1
);
saleManid
=
0L
;
orderService
.
updateOrderSalesmanId
(
info
.
getOrderId
(),
0L
);
...
...
@@ -662,9 +702,9 @@ public class TargetLogServiceImpl extends
return
;
}
if
(
(
consigneeDO
.
getCustomerService
()
==
null
||
consigneeDO
.
getCustomerService
()
==
0
)
&&
consigneeDO
.
getSource
()
==
12
)
{
if
(
consigneeDO
.
getCustomerService
()
==
null
||
consigneeDO
.
getCustomerService
()
==
0
)
{
//if(consigneeDO.getSource() == 12)
//收货人客户经理为空时不算业绩
//客户来源是发货人推荐,不保留业绩记录 customer_source
//2024-06-03 添加的逻辑
...
...
@@ -689,10 +729,23 @@ public class TargetLogServiceImpl extends
consigneeDO
.
getCustomerService
());
if
(
d0
!=
null
&&
d1
!=
null
)
{
if
(
d1
.
compareTo
(
d0
)
>
0
)
{
s_gsf
+=
",入仓后归属客户经理,不算奖金。"
;
s_gsf
+=
",入仓后归属客户经理,不算奖金。"
+
String
.
valueOf
(
d0
)+
","
+
String
.
valueOf
(
d1
);
saleManid
=
0L
;
orderService
.
updateOrderSalesmanId
(
info
.
getOrderId
(),
0L
);
TargetLogDO
targetLogDO
=
targetLogMapper
.
selectById
(
targetId
);
//客户ID
targetLogDO
.
setCustomerId
(
customerId
);
//客户经理ID
targetLogDO
.
setUserId
(
saleManid
);
targetLogDO
.
setLoglev
(
loglev
);
targetLogDO
.
setGsf
(
s_gsf
);
targetLogDO
.
setGstype
(
n_gstype
);
targetLogDO
.
setUpdateTime
(
new
Date
());
targetLogMapper
.
updateById
(
targetLogDO
);
return
;
}
}
}
...
...
@@ -746,7 +799,9 @@ public class TargetLogServiceImpl extends
consignorDO
.
getCustomerService
());
if
(
d0
!=
null
&&
d1
!=
null
)
{
if
(
d1
.
compareTo
(
d0
)
>
0
)
{
s_gsf
+=
",入参后归属客户经理,不算奖金。"
;
s_gsf
+=
",入参后归属客户经理,不算奖金。"
+
String
.
valueOf
(
d0
)+
","
+
String
.
valueOf
(
d1
);
saleManid
=
0L
;
orderService
.
updateOrderSalesmanId
(
info
.
getOrderId
(),
0L
);
...
...
@@ -798,7 +853,9 @@ public class TargetLogServiceImpl extends
consignorDO
.
getCustomerService
());
if
(
d0
!=
null
&&
d1
!=
null
)
{
if
(
d1
.
compareTo
(
d0
)
>
0
)
{
s_gsf
+=
",入参后归属客户经理,不算奖金。"
;
s_gsf
+=
",入仓后归属客户经理,不算奖金。"
+
String
.
valueOf
(
d0
)+
","
+
String
.
valueOf
(
d1
);;
saleManid
=
0L
;
orderService
.
updateOrderSalesmanId
(
info
.
getOrderId
(),
0L
);
...
...
@@ -839,7 +896,9 @@ public class TargetLogServiceImpl extends
consignorDO
.
getCustomerService
());
if
(
d0
!=
null
&&
d1
!=
null
)
{
if
(
d1
.
compareTo
(
d0
)
>
0
)
{
s_gsf
+=
",入仓后归属客户经理,不算奖金。"
;
s_gsf
+=
",入仓后归属客户经理,不算奖金。"
+
String
.
valueOf
(
d0
)+
","
+
String
.
valueOf
(
d1
);
saleManid
=
0L
;
orderService
.
updateOrderSalesmanId
(
info
.
getOrderId
(),
0L
);
...
...
@@ -883,14 +942,17 @@ public class TargetLogServiceImpl extends
consignorDO
.
getCustomerService
());
if
(
d0
!=
null
&&
d1
!=
null
)
{
if
(
d1
.
compareTo
(
d0
)
>
0
)
{
s_gsf
+=
",入参后归属客户经理,不算奖金。"
;
s_gsf
+=
",入参后归属客户经理,不算奖金。"
+
String
.
valueOf
(
d0
)+
","
+
String
.
valueOf
(
d1
);
saleManid
=
0L
;
orderService
.
updateOrderSalesmanId
(
info
.
getOrderId
(),
0L
);
}
}
TargetLogDO
targetLogDO
=
targetLogMapper
.
selectById
(
targetId
);
TargetLogDO
targetLogDO
=
targetLogMapper
.
selectById
(
targetId
);
//客户ID
targetLogDO
.
setCustomerId
(
customerId
);
//客户经理ID
...
...
@@ -922,7 +984,9 @@ public class TargetLogServiceImpl extends
consigneeDO
.
getCustomerService
());
if
(
d0
!=
null
&&
d1
!=
null
)
{
if
(
d1
.
compareTo
(
d0
)
>
0
)
{
s_gsf
+=
",入参后归属客户经理,不算奖金。"
;
s_gsf
+=
",入仓后归属客户经理,不算奖金。"
+
String
.
valueOf
(
d0
)+
","
+
String
.
valueOf
(
d1
);
saleManid
=
0L
;
orderService
.
updateOrderSalesmanId
(
info
.
getOrderId
(),
0L
);
...
...
@@ -994,7 +1058,9 @@ public class TargetLogServiceImpl extends
consigneeDO
.
getCustomerService
());
if
(
d0
!=
null
&&
d1
!=
null
)
{
if
(
d1
.
compareTo
(
d0
)
>
0
)
{
s_gsf
+=
",入参后归属客户经理,不算奖金。"
;
s_gsf
+=
",入仓后归属客户经理,不算奖金。"
+
String
.
valueOf
(
d0
)+
","
+
String
.
valueOf
(
d1
);
saleManid
=
0L
;
orderService
.
updateOrderSalesmanId
(
info
.
getOrderId
(),
0L
);
...
...
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