Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jenkins
order-group
Commits
61ab5c96
Commit
61ab5c96
authored
Feb 12, 2020
by
huvchao@126.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
productGroupList
parent
21428b30
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
2 deletions
+33
-2
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/vo/ProductGroupVo.java
+29
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+4
-2
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/vo/ProductGroupVo.java
View file @
61ab5c96
...
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
...
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
import
lombok.Builder
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.apache.commons.lang.StringUtils
;
/**
/**
* 商品组信息
* 商品组信息
...
@@ -30,4 +31,32 @@ public class ProductGroupVo {
...
@@ -30,4 +31,32 @@ public class ProductGroupVo {
* 第三方商品组编码。后台人工录入,有可能不唯一。
* 第三方商品组编码。后台人工录入,有可能不唯一。
*/
*/
private
String
thirdGroupId
;
private
String
thirdGroupId
;
@Override
public
int
hashCode
()
{
StringBuilder
sb
=
new
StringBuilder
();
sb
.
append
(
groupId
).
append
(
thirdGroupId
).
append
(
groupName
);
return
sb
.
toString
().
hashCode
();
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
// 原始字符串
StringBuilder
originalString
=
new
StringBuilder
();
originalString
.
append
(
groupId
).
append
(
thirdGroupId
).
append
(
groupName
);
//当前字符串
ProductGroupVo
groupVo
=
(
ProductGroupVo
)
o
;
StringBuilder
currentString
=
new
StringBuilder
();
currentString
.
append
(
groupVo
.
groupId
).
append
(
groupVo
.
thirdGroupId
).
append
(
groupVo
.
groupName
);
return
StringUtils
.
equals
(
originalString
.
toString
(),
currentString
.
toString
());
}
}
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
61ab5c96
...
@@ -1635,6 +1635,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1635,6 +1635,7 @@ public class OrderServiceImpl implements Orderservice {
if
(
CollectionUtils
.
isNotEmpty
(
productDto
.
getComboProduct
())){
if
(
CollectionUtils
.
isNotEmpty
(
productDto
.
getComboProduct
())){
for
(
CreateOrderProductRequest
comboProduct
:
productDto
.
getComboProduct
()){
for
(
CreateOrderProductRequest
comboProduct
:
productDto
.
getComboProduct
()){
String
comboSkuId
=
comboProduct
.
getSpecification
();
String
comboSkuId
=
comboProduct
.
getSpecification
();
System
.
out
.
println
(
comboSkuId
);
if
(
products
.
get
(
comboSkuId
)
!=
null
)
{
if
(
products
.
get
(
comboSkuId
)
!=
null
)
{
comboProduct
.
setCustomerCode
(
products
.
get
(
comboSkuId
).
getCustomerCode
());
comboProduct
.
setCustomerCode
(
products
.
get
(
comboSkuId
).
getCustomerCode
());
comboProduct
.
setProductCode
(
products
.
get
(
comboSkuId
).
getProductCode
());
comboProduct
.
setProductCode
(
products
.
get
(
comboSkuId
).
getProductCode
());
...
@@ -1650,7 +1651,6 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1650,7 +1651,6 @@ public class OrderServiceImpl implements Orderservice {
}
}
}
}
}
}
}
}
return
createOrderDto
;
return
createOrderDto
;
}
}
...
@@ -1669,7 +1669,9 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1669,7 +1669,9 @@ public class OrderServiceImpl implements Orderservice {
ProductGroupVo
productGroupVo
=
ProductGroupVo
.
builder
()
ProductGroupVo
productGroupVo
=
ProductGroupVo
.
builder
()
.
groupId
(
groupDetail
.
getGroupId
()).
groupName
(
productGroup
.
getName
())
.
groupId
(
groupDetail
.
getGroupId
()).
groupName
(
productGroup
.
getName
())
.
thirdGroupId
(
productGroup
.
getGroupCode
()).
build
();
.
thirdGroupId
(
productGroup
.
getGroupCode
()).
build
();
targetGroupList
.
add
(
productGroupVo
);
if
(!
targetGroupList
.
contains
(
productGroupVo
))
{
targetGroupList
.
add
(
productGroupVo
);
}
}
}
}
}
product
.
setProductGroupList
(
targetGroupList
);
product
.
setProductGroupList
(
targetGroupList
);
...
...
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