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
432e1dcb
Commit
432e1dcb
authored
Aug 23, 2021
by
胡敬轩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
爱马哥预定单biztype=7
parent
4e9e2986
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletions
+7
-1
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetValidateProductInfoDto.java
+5
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+2
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetValidateProductInfoDto.java
View file @
432e1dcb
...
@@ -41,6 +41,11 @@ public class GetValidateProductInfoDto {
...
@@ -41,6 +41,11 @@ public class GetValidateProductInfoDto {
*/
*/
private
String
channel
;
private
String
channel
;
/**
* 业务类型 7-预定单 爱马哥蛋糕预定场景使用(2.0.41迭代 1032929)
*/
private
Integer
bizType
;
@Data
@Data
public
static
class
ProductInfo
{
public
static
class
ProductInfo
{
/**
/**
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
432e1dcb
...
@@ -2913,7 +2913,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -2913,7 +2913,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
// 返回构造对象
// 返回构造对象
PremiumExchangeResponseVo
premiumExchangeResponseVo
=
new
PremiumExchangeResponseVo
();
PremiumExchangeResponseVo
premiumExchangeResponseVo
=
new
PremiumExchangeResponseVo
();
premiumExchangeResponseVo
.
setResultCode
(
ActivityResultCodeEnum
.
NON_PARTICIPATE
.
getCode
());
premiumExchangeResponseVo
.
setResultCode
(
ActivityResultCodeEnum
.
NON_PARTICIPATE
.
getCode
());
List
<
CartGoods
>
cartGoodsList
=
assortmentSdkService
.
getShoppingCart
(
partnerId
,
storeId
,
userId
,
request
.
getSessionId
(),
null
,
shoppingCartBaseService
,
null
);
List
<
CartGoods
>
cartGoodsList
=
assortmentSdkService
.
getShoppingCart
(
partnerId
,
storeId
,
userId
,
request
.
getSessionId
(),
null
,
shoppingCartBaseService
,
bizType
);
if
(
grayPush
(
partnerId
,
storeId
,
"2"
))
{
if
(
grayPush
(
partnerId
,
storeId
,
"2"
))
{
// 当couponCode不为空时,需参与价格计算
// 当couponCode不为空时,需参与价格计算
ArrayList
<
CalculationSharingDiscountRequestDto
.
CalculationDiscountCoupon
>
coupons
=
new
ArrayList
<>();
ArrayList
<
CalculationSharingDiscountRequestDto
.
CalculationDiscountCoupon
>
coupons
=
new
ArrayList
<>();
...
@@ -2987,6 +2987,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -2987,6 +2987,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
getProductInfoDto
.
setStoreId
(
storeId
);
getProductInfoDto
.
setStoreId
(
storeId
);
getProductInfoDto
.
setChannel
(
menuType
);
getProductInfoDto
.
setChannel
(
menuType
);
getProductInfoDto
.
setProductIds
(
spuIds
);
getProductInfoDto
.
setProductIds
(
spuIds
);
getProductInfoDto
.
setBizType
(
bizType
);
ValidateProductInfosDto
productInfosDto
=
storeItemClient
.
validateShopContainProduct
(
getProductInfoDto
);
ValidateProductInfosDto
productInfosDto
=
storeItemClient
.
validateShopContainProduct
(
getProductInfoDto
);
if
(!
Objects
.
equals
(
productInfosDto
.
getErrcode
(),
Integer
.
valueOf
(
ResponseResult
.
SUCCESS
.
getCode
()))
if
(!
Objects
.
equals
(
productInfosDto
.
getErrcode
(),
Integer
.
valueOf
(
ResponseResult
.
SUCCESS
.
getCode
()))
||
productInfosDto
.
getData
()
==
null
||
productInfosDto
.
getData
()
==
null
...
...
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