Skip to content

O
order-group
Commit c8a29152 by hanghang.wang
Options

小票打印赠品和加价购冲突

parent c3743a76
Showing with 3 additions and 2 deletions
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
...@@ -925,9 +925,10 @@ public class OrderSdkAdapter { ...@@ -925,9 +925,10 @@ public class OrderSdkAdapter {
if(null !=sendProductBean.getIsSendGoods() && sendProductBean.getIsSendGoods() && StringUtils.isNotEmpty(sendProductBean.getOriginalGoodsUid())){ if(null !=sendProductBean.getIsSendGoods() && sendProductBean.getIsSendGoods() && StringUtils.isNotEmpty(sendProductBean.getOriginalGoodsUid())){
sendProductBean.setIsPrint(false); sendProductBean.setIsPrint(false);
} }
if (null !=sendProductBean.getIsSendGoods() && null !=sendProductBean.getIsSendGoods() && !sendProductBean.getIsSendGoods()) { if (StringUtils.isNotEmpty(sendProductBean.getCartGoodsUid()) && null !=sendProductBean.getIsSendGoods() && !sendProductBean.getIsSendGoods() ) {
sendProductBean.setSendProduct(productList.stream() sendProductBean.setSendProduct(productList.stream()
.filter(productBean -> productBean.getOriginalGoodsUid().equalsIgnoreCase(sendProductBean.getCartGoodsUid()) && productBean.getIsSendGoods() == true) .filter(productBean ->productBean.getOriginalGoodsUid().equalsIgnoreCase(sendProductBean.getCartGoodsUid())
&& productBean.getIsSendGoods() == true)
.map(o -> JSON.parseObject(JSON.toJSONString(o), QueryOrdersResponse.DataBean.OrderBean.ProductBean.class)) .map(o -> JSON.parseObject(JSON.toJSONString(o), QueryOrdersResponse.DataBean.OrderBean.ProductBean.class))
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
......
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