Commit 0c9e9ac1 by zhiheng.zhang

是否是赠品判断空

parent 50dbc32c
...@@ -920,10 +920,10 @@ public class OrderSdkAdapter { ...@@ -920,10 +920,10 @@ public class OrderSdkAdapter {
if(null != productList && productList.size() >0) { if(null != productList && productList.size() >0) {
for (QueryOrdersResponse.DataBean.OrderBean.ProductBean sendProductBean : productList) { for (QueryOrdersResponse.DataBean.OrderBean.ProductBean sendProductBean : productList) {
sendProductBean.setIsPrint(true); sendProductBean.setIsPrint(true);
if(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() && !sendProductBean.getIsSendGoods()) { if (null !=sendProductBean.getIsSendGoods() && 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))
......
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