diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java index 131c653a..9e476b0a 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java @@ -103,6 +103,8 @@ public class DouGoodsApiController { for (var s : goods.getSkuList()) { DouGoodsSku sku = new DouGoodsSku(); BeanUtils.copyProperties(s, sku); + sku.setPrice(s.getPrice()); + sku.setStockNum(s.getStockNum()); sku.setProductId(goods.getProductId().toString()); sku.setShopId(params.getShopId()); sku.setName(douGoods.getName()); diff --git a/model/src/main/java/cn/qihangerp/model/bo/DouGoodsSkuBo.java b/model/src/main/java/cn/qihangerp/model/bo/DouGoodsSkuBo.java index 74e99617..6ad1bbc6 100644 --- a/model/src/main/java/cn/qihangerp/model/bo/DouGoodsSkuBo.java +++ b/model/src/main/java/cn/qihangerp/model/bo/DouGoodsSkuBo.java @@ -10,7 +10,7 @@ public class DouGoodsSkuBo implements Serializable { * 商品数字id */ private Long productId; - private Long skuId; + private Long id; private String title; private String code; private Integer shopId; diff --git a/model/src/main/java/cn/qihangerp/model/entity/DouGoodsSku.java b/model/src/main/java/cn/qihangerp/model/entity/DouGoodsSku.java index 3a4f6a69..a63a70a1 100644 --- a/model/src/main/java/cn/qihangerp/model/entity/DouGoodsSku.java +++ b/model/src/main/java/cn/qihangerp/model/entity/DouGoodsSku.java @@ -86,7 +86,7 @@ public class DouGoodsSku implements Serializable { /** * 商品价格,单位:分 */ - private Long price; + private Integer price; /** * 创建时间,时间戳:单位秒; @@ -96,7 +96,7 @@ public class DouGoodsSku implements Serializable { /** * ku_type=0时,表示普通库存数量 ;sku_type=1时,使用stock_map,表示区域库存数量 */ - private Long stockNum; + private Integer stockNum; /** * sku_type=0时,表示预占库存数量; sku_type=1时,表示区域库存数量,使用prehold_stock_map diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java index 42872492..39e7b600 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java @@ -47,6 +47,7 @@ public class DouGoodsSkuServiceImpl extends ServiceImpl result = mapper.selectSkuPageList(pageQuery.build(), bo.getShopId(),bo.getProductId(),bo.getSkuId(),bo.getCode(),bo.getHasLink()); // return PageResult.build(result); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(bo.getId()!=null, DouGoodsSku::getId, bo.getId()) .eq(bo.getShopId()!=null,DouGoodsSku::getShopId,bo.getShopId()) .eq(bo.getProductId()!=null,DouGoodsSku::getProductId,bo.getProductId()) .eq(StringUtils.hasText(bo.getCode()),DouGoodsSku::getOutSkuId,bo.getCode()) diff --git a/vue/src/views/dou/goods/goods_list.vue b/vue/src/views/dou/goods/goods_list.vue index 7cdd6907..490536ba 100644 --- a/vue/src/views/dou/goods/goods_list.vue +++ b/vue/src/views/dou/goods/goods_list.vue @@ -116,19 +116,18 @@ @pagination="getList" /> - + - - - - + + + + +