Commit 3b5b0994 by hanghang.wang

Merge remote-tracking branch 'origin/master'

parents aa222a4a 71461a61
...@@ -93,10 +93,10 @@ public class ActivitySdkAdapter { ...@@ -93,10 +93,10 @@ public class ActivitySdkAdapter {
discountRequest.setChannel("pickup"); discountRequest.setChannel("pickup");
discountRequest.setVer(1); discountRequest.setVer(1);
discountRequest.setGoods(new ArrayList<CalculationDiscountRequest.CalculationDiscountGoods>()); discountRequest.setGoods(new ArrayList<CalculationDiscountRequest.CalculationDiscountGoods>());
if(CollectionUtils.isNotEmpty(extendInfoResponse.getMemberPaids())) // if(CollectionUtils.isNotEmpty(extendInfoResponse.getMemberPaids()))
discountRequest.setMemberLevel(extendInfoResponse.getMemberPaids().get(0).getPaidId()); // discountRequest.setMemberLevel(extendInfoResponse.getMemberPaids().get(0).getPaidId());
else // else
discountRequest.setMemberLevel("-1"); // discountRequest.setMemberLevel("-1");
if(CollectionUtils.isNotEmpty(extendInfoResponse.getMemberLabels())) { if(CollectionUtils.isNotEmpty(extendInfoResponse.getMemberLabels())) {
discountRequest.setCustomerLabel(extendInfoResponse.getMemberLabels().stream().map(GetMemberExtendInfoResponse.GetMemberLabels::getLabelCode).collect(Collectors.joining(","))); discountRequest.setCustomerLabel(extendInfoResponse.getMemberLabels().stream().map(GetMemberExtendInfoResponse.GetMemberLabels::getLabelCode).collect(Collectors.joining(",")));
......
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