小票打印

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

@@ -910,8 +910,8 @@ public class OrderSdkAdapter {
             if(StringUtils.isNotEmpty(productBean.getExtInfo())) {
                 OrderProductAddInfoDto extInfo = JSONObject.parseObject(productBean.getExtInfo(), OrderProductAddInfoDto.class);
                 productBean.setIsSendGoods(null == extInfo.getIsSendGoods() ? false : extInfo.getIsSendGoods());
-                productBean.setCartGoodsUid(null == extInfo.getCartGoodsUid() ? "" : extInfo.getCartGoodsUid());
-                productBean.setOriginalGoodsUid(null == extInfo.getOriginalGoodsUid() ? "" : extInfo.getOriginalGoodsUid());
+                productBean.setCartGoodsUid(StringUtils.isBlank(extInfo.getCartGoodsUid()) ? "" : extInfo.getCartGoodsUid());
+                productBean.setOriginalGoodsUid(StringUtils.isBlank(extInfo.getOriginalGoodsUid()) ? "" : extInfo.getOriginalGoodsUid());
             }
 
             productList.add(productBean);
@@ -919,9 +919,13 @@ public class OrderSdkAdapter {
 
         if(null != productList && productList.size() >0) {
             for (QueryOrdersResponse.DataBean.OrderBean.ProductBean sendProductBean : productList) {
+                if(sendProductBean.getIsSendGoods() && StringUtils.isBlank(sendProductBean.getOriginalGoodsUid())){
+                    sendProductBean.setIsPrint(true);
+                }
                 if (null !=sendProductBean.getIsSendGoods() && !sendProductBean.getIsSendGoods()) {
                     sendProductBean.setSendProduct(productList.stream()
                             .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()));
                 }
             }