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
fba05327
Commit
fba05327
authored
Nov 30, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加 链路查询
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
e26883dc
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
9 deletions
+16
-9
order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
+4
-1
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+2
-6
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountRequestDto.java
+5
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
+4
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
View file @
fba05327
...
...
@@ -26,7 +26,10 @@ import java.util.List;
@Data
@Builder
public
class
ShoppingCartInfoRequestVo
{
/**
* 链路号
*/
private
String
trackingNo
;
/**
* 爱马哥蛋糕预定
* 预定单需求, bizType= 7 其他的场景默认传递null
...
...
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
fba05327
...
...
@@ -33,10 +33,6 @@ import cn.freemud.entities.dto.user.CustomerPropertyBaseResponse;
import
cn.freemud.entities.dto.user.GetSvcInfoByMemberIdResponseVo
;
import
cn.freemud.entities.dto.user.StatisticalScoreRequestVo
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.CreateOrderVo
;
import
cn.freemud.entities.vo.GetMemberCouponRequestVo
;
import
cn.freemud.entities.vo.SellCouponCreateOrderVo
;
import
cn.freemud.entities.vo.ShoppingCartInfoRequestVo
;
import
cn.freemud.entities.vo.order.CreateOrderCouponCodeVo
;
import
cn.freemud.enums.*
;
import
cn.freemud.interceptor.ServiceException
;
...
...
@@ -61,10 +57,9 @@ import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressR
import
com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse
;
import
com.freemud.application.sdk.api.membercenter.service.MemberCenterService
;
import
com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp
;
import
com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto
;
import
com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest
;
import
com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest
;
import
com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse
;
...
...
@@ -725,6 +720,7 @@ public class CheckOrder {
// 预定单类型传递 购物车中进行查询
.
bizType
(
createOrderVo
.
getBizType
())
.
build
();
shoppingCartInfoRequestVo
.
setTrackingNo
(
LogThreadLocal
.
getTrackingNo
());
// 如果使用优惠券或者商品券,校验 couponCode
// if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {
// // 校验couponCode
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountRequestDto.java
View file @
fba05327
...
...
@@ -9,6 +9,11 @@ import java.util.Objects;
@Data
public
class
ActivityCalculationDiscountRequestDto
{
/**
* 链路号
*/
private
String
trackingNo
;
/**
* 区域
*/
private
String
area
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
View file @
fba05327
...
...
@@ -16,7 +16,6 @@ import lombok.AllArgsConstructor;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.NotEmpty
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
...
...
@@ -27,6 +26,10 @@ import java.util.List;
@Data
@Builder
public
class
ShoppingCartInfoRequestVo
extends
BaseRequestVo
{
/**
* 链路号
*/
private
String
trackingNo
;
@NotBlank
(
message
=
"sessionId不能为空"
)
private
String
sessionId
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
View file @
fba05327
...
...
@@ -77,7 +77,7 @@ public class CalculationSharingDiscountService {
,
ShoppingCartInfoRequestVo
shoppingCartInfoRequestVo
,
Integer
bizType
,
Integer
accountFlag
,
DiscountSharingDto
sharingDto
)
{
ActivityCalculationDiscountRequestDto
calculationSharingDiscountRequestDto
=
this
.
commonSharingDto
(
partnerId
,
storeId
,
userId
,
appId
,
orderType
);
calculationSharingDiscountRequestDto
.
setTrackingNo
(
shoppingCartInfoRequestVo
.
getTrackingNo
());
// 校验后有效的商品券map
HashMap
<
String
,
CheckSpqInfoResponseDto
>
validCouponMap
=
new
HashMap
<>(
16
);
List
<
ActivityCalculationDiscountRequestDto
.
CalculationDiscountGoods
>
calculationDiscountGoodsList
=
new
ArrayList
<>();
...
...
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