Commit fba05327 by 周晓航

增加 链路查询

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent e26883dc
...@@ -26,7 +26,10 @@ import java.util.List; ...@@ -26,7 +26,10 @@ import java.util.List;
@Data @Data
@Builder @Builder
public class ShoppingCartInfoRequestVo { public class ShoppingCartInfoRequestVo {
/**
* 链路号
*/
private String trackingNo;
/** /**
* 爱马哥蛋糕预定 * 爱马哥蛋糕预定
* 预定单需求, bizType= 7 其他的场景默认传递null * 预定单需求, bizType= 7 其他的场景默认传递null
......
...@@ -33,10 +33,6 @@ import cn.freemud.entities.dto.user.CustomerPropertyBaseResponse; ...@@ -33,10 +33,6 @@ import cn.freemud.entities.dto.user.CustomerPropertyBaseResponse;
import cn.freemud.entities.dto.user.GetSvcInfoByMemberIdResponseVo; import cn.freemud.entities.dto.user.GetSvcInfoByMemberIdResponseVo;
import cn.freemud.entities.dto.user.StatisticalScoreRequestVo; import cn.freemud.entities.dto.user.StatisticalScoreRequestVo;
import cn.freemud.entities.vo.*; 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.entities.vo.order.CreateOrderCouponCodeVo;
import cn.freemud.enums.*; import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException; import cn.freemud.interceptor.ServiceException;
...@@ -61,10 +57,9 @@ import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressR ...@@ -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.response.QueryReceiveAddressResponse;
import com.freemud.application.sdk.api.membercenter.service.MemberCenterService; 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.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.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp; 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.QueryDeliveryRequest;
import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest; import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse; import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
...@@ -725,6 +720,7 @@ public class CheckOrder { ...@@ -725,6 +720,7 @@ public class CheckOrder {
// 预定单类型传递 购物车中进行查询 // 预定单类型传递 购物车中进行查询
.bizType(createOrderVo.getBizType()) .bizType(createOrderVo.getBizType())
.build(); .build();
shoppingCartInfoRequestVo.setTrackingNo(LogThreadLocal.getTrackingNo());
// 如果使用优惠券或者商品券,校验 couponCode // 如果使用优惠券或者商品券,校验 couponCode
// if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) { // if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {
// // 校验couponCode // // 校验couponCode
......
...@@ -9,6 +9,11 @@ import java.util.Objects; ...@@ -9,6 +9,11 @@ import java.util.Objects;
@Data @Data
public class ActivityCalculationDiscountRequestDto { public class ActivityCalculationDiscountRequestDto {
/** /**
* 链路号
*/
private String trackingNo;
/**
* 区域 * 区域
*/ */
private String area; private String area;
......
...@@ -16,7 +16,6 @@ import lombok.AllArgsConstructor; ...@@ -16,7 +16,6 @@ import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
...@@ -27,6 +26,10 @@ import java.util.List; ...@@ -27,6 +26,10 @@ import java.util.List;
@Data @Data
@Builder @Builder
public class ShoppingCartInfoRequestVo extends BaseRequestVo { public class ShoppingCartInfoRequestVo extends BaseRequestVo {
/**
* 链路号
*/
private String trackingNo;
@NotBlank(message = "sessionId不能为空") @NotBlank(message = "sessionId不能为空")
private String sessionId; private String sessionId;
......
...@@ -77,7 +77,7 @@ public class CalculationSharingDiscountService { ...@@ -77,7 +77,7 @@ public class CalculationSharingDiscountService {
, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, Integer bizType, Integer accountFlag, DiscountSharingDto sharingDto) { , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, Integer bizType, Integer accountFlag, DiscountSharingDto sharingDto) {
ActivityCalculationDiscountRequestDto calculationSharingDiscountRequestDto = this.commonSharingDto(partnerId, storeId, userId, appId, orderType); ActivityCalculationDiscountRequestDto calculationSharingDiscountRequestDto = this.commonSharingDto(partnerId, storeId, userId, appId, orderType);
calculationSharingDiscountRequestDto.setTrackingNo(shoppingCartInfoRequestVo.getTrackingNo());
// 校验后有效的商品券map // 校验后有效的商品券map
HashMap<String, CheckSpqInfoResponseDto> validCouponMap = new HashMap<>(16); HashMap<String, CheckSpqInfoResponseDto> validCouponMap = new HashMap<>(16);
List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList = new ArrayList<>(); List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment