Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
Overview
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
reyun
manager
Commits
1e9950fa
Commit
1e9950fa
authored
Apr 26, 2018
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2
parent
b24a292f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
workspace.xml
.idea/workspace.xml
+0
-0
TkioAccountController.java
src/main/java/tkio/controller/TkioAccountController.java
+5
-4
IoAccountController.java
src/main/java/userio/controller/IoAccountController.java
+3
-2
No files found.
.idea/workspace.xml
View file @
1e9950fa
This diff is collapsed.
Click to expand it.
src/main/java/tkio/controller/TkioAccountController.java
View file @
1e9950fa
...
...
@@ -36,8 +36,9 @@ public class TkioAccountController {
@RequestMapping
(
value
=
"/update/sale"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
updateSale
(
@CurrentAccount
User
loginAccount
,
@RequestParam
String
email
,
@RequestParam
String
accountEmail
)
{
@RequestParam
String
email
,
@RequestParam
String
accountEmail
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
accountEmail
,
"tkio修改销售为 "
+
email
,
request
,
loginAccount
.
getRole
());
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
updateSale
(
email
,
accountEmail
));
}
...
...
@@ -85,7 +86,7 @@ public class TkioAccountController {
@RequestMapping
(
value
=
"/forbidenpress"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
forbidenPress
(
@CurrentAccount
User
loginAccount
,
@RequestBody
PressMoney
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭
异常
状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"关闭
缴费
状态跟进"
,
request
,
loginAccount
.
getRole
());
userlog
.
start
();
tkioAccountService
.
forbidenPress
(
loginAccount
,
resource
);
return
ResultModel
.
OK
();
...
...
@@ -95,7 +96,7 @@ public class TkioAccountController {
@RequestMapping
(
value
=
"/enablepress"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
enablePress
(
@CurrentAccount
User
loginAccount
,
@RequestBody
PressMoney
resource
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启
异常
状态跟进"
,
request
,
loginAccount
.
getRole
());
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
resource
.
getEmail
(),
"开启
缴费
状态跟进"
,
request
,
loginAccount
.
getRole
());
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
enablePress
(
loginAccount
,
resource
));
}
...
...
src/main/java/userio/controller/IoAccountController.java
View file @
1e9950fa
...
...
@@ -35,8 +35,9 @@ public class IoAccountController {
@RequestMapping
(
value
=
"/update/sale"
,
method
=
RequestMethod
.
PUT
)
@ResponseBody
public
ResultModel
updateSale
(
@CurrentAccount
User
loginAccount
,
@RequestParam
String
email
,
@RequestParam
String
accountEmail
)
{
@RequestParam
String
email
,
@RequestParam
String
accountEmail
,
HttpServletRequest
request
)
{
UserLogThread
userlog
=
new
UserLogThread
(
loginAccount
.
getEmail
(),
loginAccount
.
getName
(),
OperateObjectTypeEnum
.
CUSTOMER
.
getKey
(),
accountEmail
,
"tkio修改销售为 "
+
email
,
request
,
loginAccount
.
getRole
());
userlog
.
start
();
return
ResultModel
.
OK
(
tkioAccountService
.
updateSale
(
email
,
accountEmail
));
}
...
...
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