Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yanxuan-qc-change-system
Overview
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
yx-qc-change-flow
yanxuan-qc-change-system
Commits
468a44f2
Commit
468a44f2
authored
Apr 10, 2023
by
穆龙飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify:增加sku信息
parent
4fd26689
Pipeline
#47145
passed with stages
in 1 minute 19 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
0 deletions
+38
-0
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+4
-0
ChangeRecord.java
.../netease/mail/yanxuan/change/dal/entity/ChangeRecord.java
+10
-0
ChangeFlowCreateReq.java
...anxuan/change/dal/meta/model/req/ChangeFlowCreateReq.java
+11
-0
ChangeFlowSubmitReq.java
...anxuan/change/dal/meta/model/req/ChangeFlowSubmitReq.java
+12
-0
ChangeFlowController.java
...l/yanxuan/change/web/controller/ChangeFlowController.java
+1
-0
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
468a44f2
...
...
@@ -458,6 +458,7 @@ public class ChangeFlowBiz {
if
(
ChangeSubjectEnum
.
PRODUCT
.
getType
().
equals
(
changeFlowCreateReq
.
getChangeSubject
()))
{
// 当变更类型是商品时有值
changeRecord
.
setChangeItem
(
changeFlowCreateReq
.
getChangeItems
());
changeRecord
.
setChangeSku
(
changeFlowCreateReq
.
getChangeSkus
());
}
if
(
ChangeSubjectEnum
.
SUPPLIER
.
getType
().
equals
(
changeFlowCreateReq
.
getChangeSubject
()))
{
changeRecord
.
setChangeSupplier
(
changeFlowCreateReq
.
getChangeSupplier
());
...
...
@@ -475,6 +476,7 @@ public class ChangeFlowBiz {
changeRecord
.
setCreateTime
(
DateUtils
.
getCurrentTime
());
changeRecord
.
setUpdateTime
(
DateUtils
.
getCurrentTime
());
changeRecord
.
setCreator
(
uid
);
changeRecord
.
setChangeProfitAmount
(
changeFlowCreateReq
.
getChangeProfitAmount
());
return
changeRecord
;
}
...
...
@@ -532,6 +534,7 @@ public class ChangeFlowBiz {
.
collect
(
Collectors
.
toList
());
changeRecord
.
setParticipateChangeExecDepartment
(
JSON
.
toJSONString
(
execDepartmentList
));
changeRecord
.
setChangeItem
(
changeFlowSubmitReq
.
getChangeItems
());
changeRecord
.
setChangeSku
(
changeFlowSubmitReq
.
getChangeSkus
());
changeRecord
.
setChangeSupplier
(
changeFlowSubmitReq
.
getChangeSupplier
());
changeRecord
.
setChangeReason
(
changeFlowSubmitReq
.
getChangeReason
());
changeRecord
.
setChangeContent
(
changeFlowSubmitReq
.
getChangeContent
());
...
...
@@ -541,6 +544,7 @@ public class ChangeFlowBiz {
changeRecord
.
setChangeProfitDesc
(
changeFlowSubmitReq
.
getChangeProfitDesc
());
changeRecord
.
setChangeConfirmResultTime
(
changeFlowSubmitReq
.
getChangeConfirmResultTime
());
changeRecord
.
setUpdateTime
(
DateUtils
.
getCurrentTime
());
changeRecord
.
setChangeProfitAmount
(
changeFlowSubmitReq
.
getChangeProfitAmount
());
// 提交工单
String
submitNode
=
flowService
.
submitFlow
(
flowId
.
toString
(),
flowDataDTO
,
uid
,
ChangeFlowEnum
.
CHANGE_FLOW_SUBMIT
.
getTopoId
(),
JSON
.
toJSONString
(
content
),
true
,
...
...
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/entity/ChangeRecord.java
View file @
468a44f2
...
...
@@ -83,6 +83,11 @@ public class ChangeRecord {
private
String
changeItem
;
/**
* 变更sku
*/
private
String
changeSku
;
/**
* 变更供应商(变更主体为供应商时有效)
*/
private
String
changeSupplier
;
...
...
@@ -173,6 +178,11 @@ public class ChangeRecord {
private
Integer
autoSubmitEmail
;
/**
* 变更收益金额
*/
private
String
changeProfitAmount
;
/**
* 创建时间
*/
private
Long
createTime
;
...
...
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowCreateReq.java
View file @
468a44f2
...
...
@@ -63,6 +63,11 @@ public class ChangeFlowCreateReq {
private
String
changeItems
;
/**
* 变更sku信息
*/
private
String
changeSkus
;
/**
* 变更供应商
*/
private
String
changeSupplier
;
...
...
@@ -142,4 +147,9 @@ public class ChangeFlowCreateReq {
* 同舟用户所属供应商
*/
private
String
supplier
;
/**
* 变更收益金额
*/
private
String
changeProfitAmount
;
}
\ No newline at end of file
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowSubmitReq.java
View file @
468a44f2
...
...
@@ -45,6 +45,12 @@ public class ChangeFlowSubmitReq {
* 变更商品
*/
private
String
changeItems
;
/**
* 变更sku信息
*/
private
String
changeSkus
;
/**
* 变更供应商
*/
...
...
@@ -109,4 +115,9 @@ public class ChangeFlowSubmitReq {
* 备注
*/
private
String
remark
;
/**
* 变更收益金额
*/
private
String
changeProfitAmount
;
}
\ No newline at end of file
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeFlowController.java
View file @
468a44f2
...
...
@@ -83,6 +83,7 @@ public class ChangeFlowController {
@RequestParam
(
name
=
"pageSize"
,
defaultValue
=
"10"
)
Integer
pageSize
,
@RequestParam
(
name
=
"createSource"
)
Integer
createSource
,
@RequestParam
(
name
=
"itemId"
,
required
=
false
)
String
itemId
,
@RequestParam
(
name
=
"skuId"
,
required
=
false
)
String
skuId
,
@RequestParam
(
name
=
"supplier"
,
required
=
false
)
String
supplier
,
@RequestParam
(
name
=
"parentChangeClassId"
,
required
=
false
)
Long
parentChangeClassId
,
@RequestParam
(
name
=
"sonChangeClassId"
,
required
=
false
)
Long
sonChangeClassId
,
...
...
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