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
86373e8b
Commit
86373e8b
authored
Jun 17, 2021
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下单和发券
parent
d8845837
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
5 deletions
+12
-5
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+2
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
+8
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+2
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
+0
-4
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
86373e8b
...
@@ -3165,13 +3165,14 @@ public class OrderSdkAdapter {
...
@@ -3165,13 +3165,14 @@ public class OrderSdkAdapter {
if
(
StringUtils
.
isNotBlank
(
product
.
getSplitIndex
())){
if
(
StringUtils
.
isNotBlank
(
product
.
getSplitIndex
())){
extInfo
.
setSplitIndex
(
product
.
getSplitIndex
());
extInfo
.
setSplitIndex
(
product
.
getSplitIndex
());
}
}
extInfo
.
setIsMonthCard
(
product
.
getIsMonthCard
());
extInfo
.
setIsB3S1Coupon
(
product
.
getIsB3S1Coupon
());
extInfo
.
setStapleFood
(
product
.
getStapleFood
());
extInfo
.
setStapleFood
(
product
.
getStapleFood
());
extInfo
.
setOriginalGoodsUid
(
product
.
getOriginalGoodsUid
());
extInfo
.
setOriginalGoodsUid
(
product
.
getOriginalGoodsUid
());
extInfo
.
setCartGoodsUid
(
product
.
getCartGoodsUid
());
extInfo
.
setCartGoodsUid
(
product
.
getCartGoodsUid
());
// todo 订单行扩展字段商品组
// todo 订单行扩展字段商品组
extInfo
.
setProductGroupList
(
product
.
getProductGroupList
());
extInfo
.
setProductGroupList
(
product
.
getProductGroupList
());
extInfo
.
setIsSendGoods
(
product
.
getIsSendGoods
());
// 是否需要积分,农工商发送积分需要判断商品是否是送积分的商品
// 是否需要积分,农工商发送积分需要判断商品是否是送积分的商品
// 发积分的操作移到消费者,所以这个值需要保存下来
// 发积分的操作移到消费者,所以这个值需要保存下来
if
(
product
.
getNeedBonus
()
!=
null
){
if
(
product
.
getNeedBonus
()
!=
null
){
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
View file @
86373e8b
...
@@ -251,4 +251,12 @@ public class CreateOrderProductRequest extends BaseConfig {
...
@@ -251,4 +251,12 @@ public class CreateOrderProductRequest extends BaseConfig {
* 是否赠品
* 是否赠品
*/
*/
private
Boolean
isSendGoods
;
private
Boolean
isSendGoods
;
/**
* 是否是月享卡商品
*/
private
int
isMonthCard
=
0
;
/**
* 是否是买3赠1券商品
*/
private
int
isB3S1Coupon
=
0
;
}
}
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
86373e8b
...
@@ -2653,6 +2653,8 @@ public class OrderAdapter {
...
@@ -2653,6 +2653,8 @@ public class OrderAdapter {
});
});
createOrderProductDemoDto
.
setComboProduct
(
comboProducts
);
createOrderProductDemoDto
.
setComboProduct
(
comboProducts
);
}
else
if
(
ProductTypeEnum
.
VIRTUAL_PRODUCT
.
getCode
().
equals
(
cartGoodsDetailDto
.
getProductType
()))
{
}
else
if
(
ProductTypeEnum
.
VIRTUAL_PRODUCT
.
getCode
().
equals
(
cartGoodsDetailDto
.
getProductType
()))
{
createOrderProductDemoDto
.
setIsMonthCard
(
cartGoodsDetailDto
.
getIsMonthCard
());
createOrderProductDemoDto
.
setIsB3S1Coupon
(
cartGoodsDetailDto
.
getIsB3S1Coupon
());
if
(
cartGoodsDetailDto
.
getIsMonthCard
()
==
1
)
{
if
(
cartGoodsDetailDto
.
getIsMonthCard
()
==
1
)
{
createOrderProductDemoDto
.
setCardId
(
cartGoodsDetailDto
.
getMonthCardInfo
().
getCardNo
());
createOrderProductDemoDto
.
setCardId
(
cartGoodsDetailDto
.
getMonthCardInfo
().
getCardNo
());
createOrderProductDemoDto
.
setCardCode
(
cartGoodsDetailDto
.
getMonthCardInfo
().
getCardCode
());
createOrderProductDemoDto
.
setCardCode
(
cartGoodsDetailDto
.
getMonthCardInfo
().
getCardCode
());
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
View file @
86373e8b
...
@@ -274,10 +274,6 @@ public class ShoppingCartGoodsDto {
...
@@ -274,10 +274,6 @@ public class ShoppingCartGoodsDto {
*/
*/
private
int
isMonthCard
;
private
int
isMonthCard
;
/**
/**
* 是否为种子券商品 1:是;0:否
*/
private
int
isSeedCouponGoods
;
/**
* 月享卡信息
* 月享卡信息
*/
*/
private
MonthCardVo
monthCardInfo
;
private
MonthCardVo
monthCardInfo
;
...
...
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