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
6d9f30d0
Commit
6d9f30d0
authored
Jun 04, 2020
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
保存商品统计分类编号
parent
c98028b2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
3 deletions
+20
-3
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+3
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
+3
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
+5
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+3
-2
order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
+6
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
6d9f30d0
...
@@ -2662,7 +2662,9 @@ public class OrderSdkAdapter {
...
@@ -2662,7 +2662,9 @@ public class OrderSdkAdapter {
if
(
StringUtils
.
isNotBlank
(
product
.
getThirdCategoryId
())){
if
(
StringUtils
.
isNotBlank
(
product
.
getThirdCategoryId
())){
extInfo
.
setThirdCategoryId
(
product
.
getThirdCategoryId
());
extInfo
.
setThirdCategoryId
(
product
.
getThirdCategoryId
());
}
}
if
(
StringUtils
.
isNotBlank
(
product
.
getCategory
())){
extInfo
.
setThirdCensusCategoryId
(
product
.
getCategory
());
}
extInfo
.
setStapleFood
(
product
.
getStapleFood
());
extInfo
.
setStapleFood
(
product
.
getStapleFood
());
//if (product.getStapleFood()!=null && product.getStapleFood()>0) {
//if (product.getStapleFood()!=null && product.getStapleFood()>0) {
// extInfo.setStapleFood(1);
// extInfo.setStapleFood(1);
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
View file @
6d9f30d0
...
@@ -161,4 +161,7 @@ public class CreateOrderProductRequest extends BaseConfig {
...
@@ -161,4 +161,7 @@ public class CreateOrderProductRequest extends BaseConfig {
/** 是否主食**/
/** 是否主食**/
private
Integer
stapleFood
;
private
Integer
stapleFood
;
/** 商品统计分类编号**/
private
String
category
;
}
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
View file @
6d9f30d0
...
@@ -51,4 +51,9 @@ public class OrderProductAddInfoDto extends BaseConfig {
...
@@ -51,4 +51,9 @@ public class OrderProductAddInfoDto extends BaseConfig {
/** 是否主食 **/
/** 是否主食 **/
private
Integer
stapleFood
;
private
Integer
stapleFood
;
/**
* 商品统计分类编号
*/
private
String
thirdCensusCategoryId
;
}
}
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
6d9f30d0
...
@@ -117,7 +117,7 @@ public class OrderAdapter {
...
@@ -117,7 +117,7 @@ public class OrderAdapter {
* @return
* @return
*/
*/
public
BaseCreateOrderRequest
convent2CreateOrderDto
(
CreateOrderVo
createOrderVo
,
ShoppingCartGoodsDto
shoppingCartGoodsDto
,
StoreResponse
.
BizVO
storeResponseDto
)
{
public
BaseCreateOrderRequest
convent2CreateOrderDto
(
CreateOrderVo
createOrderVo
,
ShoppingCartGoodsDto
shoppingCartGoodsDto
,
StoreResponse
.
BizVO
storeResponseDto
)
{
UserDeliveryInfoDto
deliveryInfoDto
=
createOrderVo
.
getUserDeliveryInfoDto
();
//
UserDeliveryInfoDto deliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
BaseCreateOrderRequest
createOrderDto
=
getCreateOrderDto
(
createOrderVo
);
BaseCreateOrderRequest
createOrderDto
=
getCreateOrderDto
(
createOrderVo
);
OrderTaskReq
orderTask
=
null
;
OrderTaskReq
orderTask
=
null
;
if
(
StringUtils
.
isNotEmpty
(
createOrderVo
.
getTakeMealTime
())){
if
(
StringUtils
.
isNotEmpty
(
createOrderVo
.
getTakeMealTime
())){
...
@@ -1987,12 +1987,13 @@ public class OrderAdapter {
...
@@ -1987,12 +1987,13 @@ public class OrderAdapter {
createOrderProductDemoDto
.
setProductType
(
cartGoodsDetailDto
.
getProductType
());
createOrderProductDemoDto
.
setProductType
(
cartGoodsDetailDto
.
getProductType
());
createOrderProductDemoDto
.
setParentProductId
(
cartGoodsDetailDto
.
getParentProductId
());
createOrderProductDemoDto
.
setParentProductId
(
cartGoodsDetailDto
.
getParentProductId
());
createOrderProductDemoDto
.
setIsFixedProduct
(
cartGoodsDetailDto
.
getIsFixedProduct
());
createOrderProductDemoDto
.
setIsFixedProduct
(
cartGoodsDetailDto
.
getIsFixedProduct
());
// createOrderProductDemoDto.setIsFixedProduct(false);
createOrderProductDemoDto
.
setCustomerCode
(
cartGoodsDetailDto
.
getCustomerCode
());
createOrderProductDemoDto
.
setCustomerCode
(
cartGoodsDetailDto
.
getCustomerCode
());
//createOrderProductDemoDto.setProductCode(cartGoodsDetailDto.getProductCode());
createOrderProductDemoDto
.
setHasStockProudct
(
cartGoodsDetailDto
.
isStockLimit
());
createOrderProductDemoDto
.
setHasStockProudct
(
cartGoodsDetailDto
.
isStockLimit
());
createOrderProductDemoDto
.
setWeight
(
cartGoodsDetailDto
.
getWeight
());
createOrderProductDemoDto
.
setWeight
(
cartGoodsDetailDto
.
getWeight
());
createOrderProductDemoDto
.
setUnit
(
cartGoodsDetailDto
.
getUnit
());
createOrderProductDemoDto
.
setUnit
(
cartGoodsDetailDto
.
getUnit
());
createOrderProductDemoDto
.
setStapleFood
(
0
);
createOrderProductDemoDto
.
setStapleFood
(
0
);
createOrderProductDemoDto
.
setCategory
(
cartGoodsDetailDto
.
getCategory
());
return
createOrderProductDemoDto
;
return
createOrderProductDemoDto
;
}
}
...
...
order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
View file @
6d9f30d0
...
@@ -171,6 +171,12 @@ public class ShoppingCartGoodsDto {
...
@@ -171,6 +171,12 @@ public class ShoppingCartGoodsDto {
* 三方商品编号
* 三方商品编号
*/
*/
private
String
customerCode
;
private
String
customerCode
;
/**商品货号**/
// private String productCode;
/** 商品统计分类编号**/
private
String
category
;
/**
/**
* 是否限制库存
* 是否限制库存
* 用于创建订单时,是否扣减库存
* 用于创建订单时,是否扣减库存
...
...
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