diff --git a/src/main/java/com/qs/serve/modules/goods/common/GoodsConst.java b/src/main/java/com/qs/serve/modules/goods/common/GoodsConst.java index a386b785..46343ab9 100644 --- a/src/main/java/com/qs/serve/modules/goods/common/GoodsConst.java +++ b/src/main/java/com/qs/serve/modules/goods/common/GoodsConst.java @@ -12,6 +12,6 @@ public class GoodsConst { public static final Integer SPEC_COUNT = 3; public static final Integer CATE_MAX_LEVEL = 3; //默认账套,开平 - public static String DEFAULT_BOOK = "001"; + public static String DEFAULT_PlaCE = "开平"; } diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java index fd96ae56..673661cd 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java @@ -87,7 +87,7 @@ public class GoodsSpuController { PageVo result = this.getShelfPage(param).getData(); List goodsSpuList = result.getList(); List spuCodes = goodsSpuList.stream().map(GoodsSpu::getSpuCode).collect(Collectors.toList()); - List toSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_BOOK,spuCodes); + List toSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_PlaCE,spuCodes); List inventoryCusPrices = null; try { @@ -111,11 +111,11 @@ public class GoodsSpuController { if(spu.getSpuCode().equals(skuKey.getSkuCode())){ GoodsSku goodsSku = goodsSkuService.getByCode(skuKey.getInvCode()); spu.setSkuPrice(goodsSku.getSalesPrice()); - spu.setVolume(skuKey.getVolume()); - spu.setWeight(skuKey.getWeight()); + spu.setVolume(goodsSku.getVolume().toString()); + spu.setWeight(goodsSku.getWeight().toString()); if(inventoryCusPrices!=null){ for (InventoryCusPrice cusPrice : inventoryCusPrices) { - if(cusPrice.getInvCode().equals(skuKey.getInvCode())){ + if(cusPrice.getPrice()!=null&&cusPrice.getInvCode().equals(skuKey.getInvCode())){ spu.setSkuPrice(cusPrice.getPrice()); break; } diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java index 0979d1c1..4aa60709 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java @@ -46,7 +46,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl im @Override public List getBelongPlace() { - return null; + return baseMapper.getBelongStringList(); } @Override diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java index 4a3bee80..8279cc3f 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java @@ -257,8 +257,9 @@ public class GoodsSpuServiceImpl extends ServiceImpl im @Override public List selectListBySpuCodes(List spuCodes) { - - return null; + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.in(GoodsSpu::getSpuCode,spuCodes); + return list(lqw); } /** @@ -281,10 +282,10 @@ public class GoodsSpuServiceImpl extends ServiceImpl im if(spuCodes.size()<1){ return new ArrayList<>(); } - + placeName = placeName.replace("产",""); List spuList = this.selectListBySpuCodes(spuCodes); - if(spuList.size()<1){ + if(spuList==null||spuList.size()<1){ return new ArrayList<>(); } diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index e66b2e0b..5df60381 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -141,7 +141,7 @@ public class OmsOrderServiceImpl extends ServiceImpl im goodsSpuMap.put(goodsSpu.getId(),goodsSpu); } List spuCodeList = spuList.stream().map(GoodsSpu::getSpuCode).collect(Collectors.toList()); - List spuToSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_BOOK,spuCodeList); + List spuToSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_PlaCE,spuCodeList); Map spuGetSkuMap = new HashMap<>(spuToSkuKeys.size()); for (OmsSpuToSkuKey toSkuKey : spuToSkuKeys) { spuGetSkuMap.put(toSkuKey.getSkuCode(),toSkuKey.getInvCode()); @@ -237,7 +237,7 @@ public class OmsOrderServiceImpl extends ServiceImpl im goodsSpuMap.put(goodsSpu.getId(),goodsSpu); } List spuCodeList = spuList.stream().map(GoodsSpu::getSpuCode).collect(Collectors.toList()); - List spuToSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_BOOK,spuCodeList); + List spuToSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_PlaCE,spuCodeList); Map spuGetSkuMap = new HashMap<>(spuToSkuKeys.size()); for (OmsSpuToSkuKey toSkuKey : spuToSkuKeys) { spuGetSkuMap.put(toSkuKey.getSkuCode(),toSkuKey.getInvCode()); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index b4ea9696..51649675 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -1082,12 +1082,16 @@ public class VtbVerificationServiceImpl extends ServiceImpl