需改 erphosting 不是1不处理

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/erp/WdtServiceImpl.java

@@ -108,8 +108,8 @@ public class WdtServiceImpl implements IGoblinErpService {
 //                for (int i = 0; i < pageCount; i++) {
 //                    param.put("page_no", i + "");
                     GoblinStoreErpConfigVo storeErpConfigVo = goblinRedisUtils.getStoreErpConfigVoByStoreId(data.getStoreId());
-                    if(storeErpConfigVo==null){
-                        log.error("storeId:{},查询失败",data.getStoreId());
+                    if (storeErpConfigVo == null) {
+                        log.error("storeId:{},查询失败", data.getStoreId());
                         continue;
                     }
                     json = erpWdtClient.execute(ErpEnum.WdtAPI.STOCK_QUERY.getUri(), param, storeErpConfigVo.getAppKey(), storeErpConfigVo.getSid(), storeErpConfigVo.getAppSecret());
@@ -163,7 +163,7 @@ public class WdtServiceImpl implements IGoblinErpService {
         for (SyncStockVo vo : stockMap) {
             String skuId = "";
             try {
-                GoblinGoodsSkuInfoVo skuInfoVo = mongoTemplate.findOne(Query.query(Criteria.where("skuErpCode").is(vo.getSpecNo()).and("erpWarehouseNo").is(vo.getWarehouseNo())), GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
+                GoblinGoodsSkuInfoVo skuInfoVo = mongoTemplate.findOne(Query.query(Criteria.where("skuErpCode").is(vo.getSpecNo()).and("erpWarehouseNo").is(vo.getWarehouseNo()).and("erpHosting").is(1)), GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
                 int changeStock = vo.getStockErpNum().subtract(BigDecimal.valueOf(skuInfoVo.getSkuStock())).intValue();
                 skuId = skuInfoVo.getSkuId();
                 //mongo修改
@@ -207,9 +207,13 @@ public class WdtServiceImpl implements IGoblinErpService {
                     String orderId = goblinRedisUtils.erpLeftPop(shopNo);
                     if (orderId != null) {
                         list.add(orderId);
+                    } else {
+                        break;
                     }
                 }
-                orderIdList.add(list);
+                if (list.size() != 0) {
+                    orderIdList.add(list);
+                }
             } else {
                 List<String> a = CollectionUtil.arrayListString();
                 a.add(singleId);