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
order-group-application
order-group
Commits
8dd4c7a0
Commit
8dd4c7a0
authored
Aug 14, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加保存特调name
parent
02733c50
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
1 deletions
+37
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+3
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
+2
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
+2
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderSpecialExtraAttrRequest.java
+23
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+7
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
8dd4c7a0
...
@@ -2766,6 +2766,9 @@ public class OrderSdkAdapter {
...
@@ -2766,6 +2766,9 @@ public class OrderSdkAdapter {
if
(
CollectionUtils
.
isNotEmpty
(
product
.
getSpecialCodes
()))
{
if
(
CollectionUtils
.
isNotEmpty
(
product
.
getSpecialCodes
()))
{
extInfo
.
setSpecialCodes
(
product
.
getSpecialCodes
());
extInfo
.
setSpecialCodes
(
product
.
getSpecialCodes
());
}
}
if
(
CollectionUtils
.
isNotEmpty
(
product
.
getSpecialAttrs
()))
{
extInfo
.
setSpecialAttrs
(
product
.
getSpecialAttrs
());
}
if
(
0
!=
product
.
getTax
()){
if
(
0
!=
product
.
getTax
()){
extInfo
.
setTax
(
product
.
getTax
());
extInfo
.
setTax
(
product
.
getTax
());
}
}
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
View file @
8dd4c7a0
...
@@ -178,4 +178,6 @@ public class CreateOrderProductRequest extends BaseConfig {
...
@@ -178,4 +178,6 @@ public class CreateOrderProductRequest extends BaseConfig {
private
String
taxId
;
private
String
taxId
;
private
List
<
String
>
specialCodes
;
private
List
<
String
>
specialCodes
;
private
List
<
OrderSpecialExtraAttrRequest
>
specialAttrs
;
}
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
View file @
8dd4c7a0
...
@@ -72,4 +72,6 @@ public class OrderProductAddInfoDto extends BaseConfig {
...
@@ -72,4 +72,6 @@ public class OrderProductAddInfoDto extends BaseConfig {
private
String
taxId
;
private
String
taxId
;
private
List
<
String
>
specialCodes
;
private
List
<
String
>
specialCodes
;
private
List
<
OrderSpecialExtraAttrRequest
>
specialAttrs
;
}
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderSpecialExtraAttrRequest.java
0 → 100644
View file @
8dd4c7a0
package
com
.
freemud
.
sdk
.
api
.
assortment
.
order
.
request
.
order
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.util.List
;
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
OrderSpecialExtraAttrRequest
{
/**
* 属性名
*/
private
String
attributeName
;
/**
* 入机code
*/
private
String
specialCode
;
}
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
8dd4c7a0
...
@@ -2249,7 +2249,13 @@ public class OrderAdapter {
...
@@ -2249,7 +2249,13 @@ public class OrderAdapter {
createOrderProductDemoDto
.
setClassificationId
(
cartGoodsDetailDto
.
getClassificationId
());
createOrderProductDemoDto
.
setClassificationId
(
cartGoodsDetailDto
.
getClassificationId
());
createOrderProductDemoDto
.
setClassificationName
(
cartGoodsDetailDto
.
getClassificationName
());
createOrderProductDemoDto
.
setClassificationName
(
cartGoodsDetailDto
.
getClassificationName
());
if
(
CollectionUtils
.
isNotEmpty
(
cartGoodsDetailDto
.
getSpecialExtra
()))
{
if
(
CollectionUtils
.
isNotEmpty
(
cartGoodsDetailDto
.
getSpecialExtra
()))
{
createOrderProductDemoDto
.
setSpecialCodes
(
cartGoodsDetailDto
.
getSpecialExtra
().
stream
().
map
(
ShoppingCartGoodsDto
.
CartGoodsDetailDto
.
CartGoodsExtra
::
getSpecialCode
).
collect
(
Collectors
.
toList
()));
// createOrderProductDemoDto.setSpecialCodes(cartGoodsDetailDto.getSpecialExtra().stream().map(ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::getSpecialCode).collect(Collectors.toList()));
createOrderProductDemoDto
.
setSpecialAttrs
(
new
ArrayList
<>());
createOrderProductDemoDto
.
setSpecialCodes
(
new
ArrayList
<>());
cartGoodsDetailDto
.
getSpecialExtra
().
stream
().
forEach
(
o
->
{
createOrderProductDemoDto
.
getSpecialAttrs
().
add
(
new
OrderSpecialExtraAttrRequest
(
o
.
getAttributeName
(),
o
.
getSpecialCode
()));
createOrderProductDemoDto
.
getSpecialCodes
().
add
(
o
.
getSpecialCode
());
});
}
}
return
createOrderProductDemoDto
;
return
createOrderProductDemoDto
;
}
}
...
...
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