Commit 3e62bf75 by chongfu.liang

Merge remote-tracking branch 'origin/feature/20200528_1.9.25_集点参数为0不要调会员接口'

parents 9b2e0411 076e6bb1
...@@ -294,7 +294,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -294,7 +294,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
if(activityTypes.contains(221)){ if(activityTypes.contains(221)){
DiscountDTO discountDTO=baseResponse.getData().getDiscounts().stream().filter(d -> 221==d.getType()).findFirst().get(); DiscountDTO discountDTO=baseResponse.getData().getDiscounts().stream().filter(d -> 221==d.getType()).findFirst().get();
SendPointRequest pointRequest=memberSdkAdapter.convert2SendPointRequest(confirmOrderRequest,orderByIdResponse.getData(),discountDTO); SendPointRequest pointRequest=memberSdkAdapter.convert2SendPointRequest(confirmOrderRequest,orderByIdResponse.getData(),discountDTO);
memberPropertyService.sendMemberPoint(pointRequest,confirmOrderRequest.getTrackingNo()); 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