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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -925,9 +925,10 @@ public class OrderSdkAdapter {
                 if(null !=sendProductBean.getIsSendGoods() && sendProductBean.getIsSendGoods() && StringUtils.isNotEmpty(sendProductBean.getOriginalGoodsUid())){
                     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()
-                            .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))
                             .collect(Collectors.toList()));
                 }