Commit d6801323 by 张洪涛

Merge branch '20200729_订单完成时送集点_zhanghongtao' of…

Merge branch '20200729_订单完成时送集点_zhanghongtao' of gitlab.freemud.com:order-group-application/order-group into qa
parents 18112e3e 4534328a
...@@ -335,16 +335,6 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -335,16 +335,6 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
if(extendInfo.getData() == null){ if(extendInfo.getData() == null){
return orderSdkAdapter.convent2PayAccessResponse(response); return orderSdkAdapter.convent2PayAccessResponse(response);
} }
CalculationDiscountRequest discountRequest=activitySdkAdapter.convert2CalculationDiscountRequestDto(orderByIdResponse.getData(),extendInfo.getData());
BaseResponse<CalculationDiscountResponseDTO> baseResponse=promotionSdkService.calculationDiscount(discountRequest,confirmOrderRequest.getTrackingNo());
List<Integer> activityTypes=baseResponse.getData().getDiscounts().stream().map(DiscountDTO::getType).collect(Collectors.toList());
if(activityTypes.contains(221)){
DiscountDTO discountDTO=baseResponse.getData().getDiscounts().stream().filter(d -> 221==d.getType()).findFirst().get();
SendPointRequest pointRequest=memberSdkAdapter.convert2SendPointRequest(confirmOrderRequest,orderByIdResponse.getData(),discountDTO);
if (pointRequest.getSendPoint() != 0) {
memberPropertyService.sendMemberPoint(pointRequest,confirmOrderRequest.getTrackingNo());
}
}
return orderSdkAdapter.convent2PayAccessResponse(response); return orderSdkAdapter.convent2PayAccessResponse(response);
} }
......
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