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
a68866ed
Commit
a68866ed
authored
Oct 20, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增接口 查询促销反馈是否是 V3算计
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
c0123d50
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
65 additions
and
3 deletions
+65
-3
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java
+11
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityBaseResponseDto.java
+3
-3
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/PromotionResultVO.java
+14
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/ShoppingCartNewService.java
+2
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartCollageServiceImpl.java
+5
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java
+5
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java
+5
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+14
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java
+6
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java
View file @
a68866ed
...
...
@@ -284,6 +284,17 @@ public class ShoppingCartController {
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
replaceGoodsByShop
(
request
);
}
/**
* 一单多券
* 券码需要知道配置的数据 是否是V3算价
*
*/
@PostMapping
(
value
=
"/getV3Promotion"
)
@ApiAnnotation
(
logMessage
=
"/getV3Promotion"
)
public
BaseResponse
getV3Promotion
(
@LogParams
@RequestBody
@Validated
BaseRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartNewServiceImpl
.
class
).
getV3Promotion
(
request
);
}
@Autowired
private
ShoppingCartBaseServiceImpl
shoppingCartService
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityBaseResponseDto.java
View file @
a68866ed
...
...
@@ -5,7 +5,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
public
class
ActivityBaseResponseDto
{
public
class
ActivityBaseResponseDto
<
T
>
{
private
int
ver
;
/**
...
...
@@ -14,9 +14,9 @@ public class ActivityBaseResponseDto {
private
String
statusCode
;
/**
*状态码描述
*
状态码描述
*/
private
String
msg
;
private
T
result
;
}
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/PromotionResultVO.java
0 → 100644
View file @
a68866ed
package
cn
.
freemud
.
entities
.
dto
.
shoppingCart
;
import
lombok.Data
;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2021/10/20 上午11:32
* @description :
*/
@Data
public
class
PromotionResultVO
{
private
boolean
v3Promotion
;
}
shopping-cart-application-service/src/main/java/cn/freemud/service/ShoppingCartNewService.java
View file @
a68866ed
...
...
@@ -315,4 +315,6 @@ public interface ShoppingCartNewService {
default
BaseResponse
<
PremiumExchangeResponseVo
>
premiumExchange
(
PremiumExchangeRequestVo
request
){
return
null
;
};
BaseResponse
getV3Promotion
(
BaseRequestVo
request
);
}
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartCollageServiceImpl.java
View file @
a68866ed
...
...
@@ -926,6 +926,11 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
return
nowCartGoodsList
;
}
@Override
public
BaseResponse
getV3Promotion
(
BaseRequestVo
request
)
{
return
null
;
}
public
List
<
CartGoods
>
getShoppingCart
(
AddShoppingCartGoodsRequestVo
addShoppingCartGoodsRequestVo
)
{
return
null
;
}
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java
View file @
a68866ed
...
...
@@ -780,6 +780,11 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
return
nowCartGoodsList
;
}
@Override
public
BaseResponse
getV3Promotion
(
BaseRequestVo
request
)
{
return
null
;
}
/**
* 添加非商品券商品
*
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java
View file @
a68866ed
...
...
@@ -678,6 +678,11 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
return
oldAllCartGoodsList
;
}
@Override
public
BaseResponse
getV3Promotion
(
BaseRequestVo
request
)
{
return
null
;
}
private
void
checkBase
(
CustomerInfoVo
assortmentCustomerInfoVo
)
{
if
(
assortmentCustomerInfoVo
==
null
||
assortmentCustomerInfoVo
.
getMemberId
()
==
null
)
{
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
a68866ed
...
...
@@ -32,6 +32,7 @@ import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountResponseDto;
import
cn.freemud.entities.dto.openplatform.WeixinProductRequestDto
;
import
cn.freemud.entities.dto.openplatform.WeixinProductResponseDto
;
import
cn.freemud.entities.dto.pay.*
;
import
cn.freemud.entities.dto.shoppingCart.PromotionResultVO
;
import
cn.freemud.entities.dto.shoppingCart.SendPoint
;
import
cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
;
import
cn.freemud.entities.dto.user.GetUserScoreUseDetailRequest
;
...
...
@@ -3165,6 +3166,19 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
return
ResponseUtil
.
success
(
premiumExchangeResponseVo
);
}
@Override
public
BaseResponse
getV3Promotion
(
BaseRequestVo
request
)
{
boolean
grayPush
=
grayPush
(
request
.
getPartnerId
(),
request
.
getShopId
(),
"2"
);
PromotionResultVO
vo
=
new
PromotionResultVO
();
if
(
grayPush
)
{
ActivityBaseResponseDto
<
PromotionResultVO
>
responseDto
=
activityClient
.
getV3Promotion
(
request
);
if
(
responseDto
!=
null
&&
StringUtils
.
equals
(
responseDto
.
getStatusCode
(),
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
))
{
vo
.
setV3Promotion
(
responseDto
.
getResult
().
isV3Promotion
());
}
}
return
ResponseUtil
.
success
(
vo
);
}
private
void
removeByProductStock
(
List
<
PremiumExchangeResponseVo
.
PremiumExchangeProduct
>
products
,
List
<
ValidateProductInfosDto
.
ProductData
>
productDataList
,
String
partnerId
,
String
storeId
,
String
channel
)
{
List
<
Long
>
limitSkuIds
=
new
ArrayList
<>();
productDataList
.
stream
().
forEach
(
ProductData
->
{
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java
View file @
a68866ed
...
...
@@ -19,6 +19,8 @@ import cn.freemud.entities.dto.*;
import
cn.freemud.entities.dto.activity.ActivityQueryResponseDto
;
import
cn.freemud.entities.dto.calculate.ActivityCalculationDiscountRequestDto
;
import
cn.freemud.entities.dto.calculate.ActivityCalculationDiscountResponseDto
;
import
cn.freemud.entities.dto.shoppingCart.PromotionResultVO
;
import
cn.freemud.entities.vo.BaseRequestVo
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -73,4 +75,8 @@ public interface ActivityClient {
@PostMapping
(
"/promotioncenter/calculateservice/discount/sharing"
)
//@IgnoreFeignLogAnnotation(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE,messageFieldName=ResponseCodeKeyConstant.MEG)
ActivityCalculationDiscountResponseDto
calculationSharingDiscount
(
ActivityCalculationDiscountRequestDto
shareDiscountRequestDto
);
@PostMapping
(
"/activity/getV3Promotion"
)
@IgnoreFeignLogAnnotation
(
logMessage
=
"/activity/getV3Promotion"
,
excludeStatusCodes
=
{
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
},
statusCodeFieldName
=
ResponseCodeKeyConstant
.
STATUS_CODE
,
messageFieldName
=
ResponseCodeKeyConstant
.
MSG
)
ActivityBaseResponseDto
<
PromotionResultVO
>
getV3Promotion
(
BaseRequestVo
request
);
}
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