Browse Source

修改系统报价功能。

xian 3 years ago
parent
commit
7daa0af175

+ 8 - 3
watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/TaobaoTask.java

@@ -141,9 +141,11 @@ public class TaobaoTask {
                     }
                     }
                     // 组装数据
                     // 组装数据
                     SalesOrder salesOrder = packageOrder(details);
                     SalesOrder salesOrder = packageOrder(details);
-                    salesOrder.setSalesBatchId(batchIdST);
-                    salesOrderService.addOrder(salesOrder);
-                    total ++;
+                    if (salesOrder != null) {
+                        salesOrder.setSalesBatchId(batchIdST);
+                        salesOrderService.addOrder(salesOrder);
+                        total ++;
+                    }
                 }
                 }
                 // 迭代数据
                 // 迭代数据
                 hasNext = rsp.getHasNext();
                 hasNext = rsp.getHasNext();
@@ -323,6 +325,9 @@ public class TaobaoTask {
                 warranty = 1;
                 warranty = 1;
                 item.setItemWarrantyStatus(1);
                 item.setItemWarrantyStatus(1);
             }
             }
+            if (tradeOrder.getOuterSkuId() == null) {
+                return null;
+            }
             ProductColor productColor = productColorMapper.getProductColorByBar(tradeOrder.getOuterSkuId());
             ProductColor productColor = productColorMapper.getProductColorByBar(tradeOrder.getOuterSkuId());
             if(productColor.getProductIsSplit() == 1){
             if(productColor.getProductIsSplit() == 1){
                 List<ProductCombinatInfo> productCombinatList = productMapper.combinatList(productColor.getColorProductId());
                 List<ProductCombinatInfo> productCombinatList = productMapper.combinatList(productColor.getColorProductId());