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
144c75de
Commit
144c75de
authored
Sep 14, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/zxh/订单新增商品spu数量字段-20220914' into qa
parents
0ec54c0f
e2f4a92a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
1 deletions
+11
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+1
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
+5
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+0
-0
order-application-service/src/test/spock/cn/freemud/service/impl/OrderAdapterServiceImplTest.groovy
+0
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderItemCreateReq.java
+5
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
144c75de
...
@@ -3230,7 +3230,7 @@ public class OrderSdkAdapter {
...
@@ -3230,7 +3230,7 @@ public class OrderSdkAdapter {
orderItemCreateReq
.
setPhotoUrl
(
productRequest
.
getPhotoUrl
());
orderItemCreateReq
.
setPhotoUrl
(
productRequest
.
getPhotoUrl
());
orderItemCreateReq
.
setPackPrice
(
productRequest
.
getPackPrice
());
orderItemCreateReq
.
setPackPrice
(
productRequest
.
getPackPrice
());
// 拼单加购人信息 add by miaohui 2020.10.12 end
// 拼单加购人信息 add by miaohui 2020.10.12 end
orderItemCreateReq
.
setProductSpuQuantity
(
product
.
getProductSpuQuantity
());
orderItemList
.
add
(
orderItemCreateReq
);
orderItemList
.
add
(
orderItemCreateReq
);
if
(
product
.
getTotalDiscountAmount
()
!=
null
&&
product
.
getTotalDiscountAmount
()
>
0L
&&
!
isMaterial
)
{
if
(
product
.
getTotalDiscountAmount
()
!=
null
&&
product
.
getTotalDiscountAmount
()
>
0L
&&
!
isMaterial
)
{
//优惠信息转换
//优惠信息转换
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
View file @
144c75de
...
@@ -281,4 +281,9 @@ public class CreateOrderProductRequest extends BaseConfig {
...
@@ -281,4 +281,9 @@ public class CreateOrderProductRequest extends BaseConfig {
* 【订C,“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
* 【订C,“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
*/
*/
private
String
linkedId
;
private
String
linkedId
;
/**
* 订单新增商品SPU数量字段 https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
*/
private
Integer
productSpuQuantity
;
}
}
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
144c75de
This diff is collapsed.
Click to expand it.
order-application-service/src/test/spock/cn/freemud/service/impl/OrderAdapterServiceImplTest.groovy
View file @
144c75de
This diff is collapsed.
Click to expand it.
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderItemCreateReq.java
View file @
144c75de
...
@@ -163,4 +163,9 @@ public class OrderItemCreateReq {
...
@@ -163,4 +163,9 @@ public class OrderItemCreateReq {
*/
*/
private
Long
packPrice
;
private
Long
packPrice
;
/**
* 订单新增商品SPU数量字段 https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
*/
private
Integer
productSpuQuantity
;
}
}
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