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 d32fc999..131c653a 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,7 @@ public class DouGoodsApiController { for (var s : goods.getSkuList()) { DouGoodsSku sku = new DouGoodsSku(); BeanUtils.copyProperties(s, sku); + sku.setProductId(goods.getProductId().toString()); sku.setShopId(params.getShopId()); sku.setName(douGoods.getName()); sku.setImg(douGoods.getImg()); diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java index 2e78857c..aef87d13 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java @@ -2,6 +2,7 @@ package cn.qihangerp.oms.dou.controller; import cn.qihangerp.common.*; +import cn.qihangerp.model.bo.DouGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.service.OGoodsSkuService; import cn.qihangerp.model.entity.DouGoods; @@ -32,7 +33,7 @@ public class DouGoodsController extends BaseController { } @RequestMapping(value = "/skuList", method = RequestMethod.GET) - public TableDataInfo skuList(DouGoodsBo bo, PageQuery pageQuery) { + public TableDataInfo skuList(DouGoodsSkuBo bo, PageQuery pageQuery) { PageResult result = skuService.queryPageList(bo, pageQuery); return getDataTable(result); diff --git a/model/src/main/java/cn/qihangerp/model/bo/DouGoodsSkuBo.java b/model/src/main/java/cn/qihangerp/model/bo/DouGoodsSkuBo.java new file mode 100644 index 00000000..74e99617 --- /dev/null +++ b/model/src/main/java/cn/qihangerp/model/bo/DouGoodsSkuBo.java @@ -0,0 +1,18 @@ +package cn.qihangerp.model.bo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class DouGoodsSkuBo implements Serializable { + /** + * 商品数字id + */ + private Long productId; + private Long skuId; + private String title; + private String code; + private Integer shopId; + private Integer hasLink;//是否关联 +} diff --git a/service/src/main/java/cn/qihangerp/module/service/DouGoodsSkuService.java b/service/src/main/java/cn/qihangerp/module/service/DouGoodsSkuService.java index a14d532d..57de270f 100644 --- a/service/src/main/java/cn/qihangerp/module/service/DouGoodsSkuService.java +++ b/service/src/main/java/cn/qihangerp/module/service/DouGoodsSkuService.java @@ -3,6 +3,7 @@ package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; +import cn.qihangerp.model.bo.DouGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.entity.DouGoodsSku; import cn.qihangerp.model.bo.DouGoodsBo; @@ -15,6 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @createDate 2024-05-31 17:23:21 */ public interface DouGoodsSkuService extends IService { - PageResult queryPageList(DouGoodsBo bo, PageQuery pageQuery); + PageResult queryPageList(DouGoodsSkuBo bo, PageQuery pageQuery); ResultVo linkErpGoodsSku(LinkErpGoodsSkuBo bo); } diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java index e796ef36..a35c3549 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java @@ -48,7 +48,7 @@ public class DouGoodsServiceImpl extends ServiceImpl public PageResult queryPageList(DouGoodsBo bo, PageQuery pageQuery) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(bo.getShopId()!=null,DouGoods::getShopId,bo.getShopId()) - + .eq(bo.getProductId()!=null,DouGoods::getProductId,bo.getProductId()) ; Page goodsPage = mapper.selectPage(pageQuery.build(), queryWrapper); @@ -97,7 +97,7 @@ public class DouGoodsServiceImpl extends ServiceImpl item.setErpGoodsSkuId(oGoodsSkus.get(0).getId().toString()); } } - List pddGoodsSkus = skuMapper.selectList(new LambdaQueryWrapper().eq(DouGoodsSku::getSpecId, item.getSpecId())); + List pddGoodsSkus = skuMapper.selectList(new LambdaQueryWrapper().eq(DouGoodsSku::getId, item.getId())); if(pddGoodsSkus!=null && !pddGoodsSkus.isEmpty()){ item.setModifyTime(new Date()); skuMapper.updateById(item); 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 f0f6c476..42872492 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 @@ -3,6 +3,7 @@ package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; +import cn.qihangerp.model.bo.DouGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsSku; @@ -39,7 +40,7 @@ public class DouGoodsSkuServiceImpl extends ServiceImpl queryPageList(DouGoodsBo bo, PageQuery pageQuery) { + public PageResult queryPageList(DouGoodsSkuBo bo, PageQuery pageQuery) { if(StringUtils.hasText(bo.getCode())){ bo.setCode(bo.getCode().trim()); } diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsSkuServiceImpl.java index 96fecd59..5c385ee5 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsSkuServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsSkuServiceImpl.java @@ -42,7 +42,7 @@ public class PddGoodsSkuServiceImpl extends ServiceImpl ew = new LambdaQueryWrapper() .eq(bo.getShopId()!=null,PddGoodsSku::getShopId,bo.getShopId()) .eq(bo.getGoodsId()!=null,PddGoodsSku::getGoodsId,bo.getGoodsId()) - .eq(bo.getSkuId()!=null,PddGoodsSku::getSkuId,bo.getSkuId()) + .eq(StringUtils.hasText(bo.getSkuId()),PddGoodsSku::getSkuId,bo.getSkuId()) .eq(bo.getErpSkuId()!=null,PddGoodsSku::getErpGoodsSkuId,bo.getErpSkuId()) .eq(StringUtils.hasText(bo.getOuterId()),PddGoodsSku::getOuterId,bo.getOuterId()) .eq(bo.getIsSkuOnsale()!=null,PddGoodsSku::getIsSkuOnsale,bo.getIsSkuOnsale()) diff --git a/vue/src/views/dou/goods/goods_list.vue b/vue/src/views/dou/goods/goods_list.vue index d9520d2a..7cdd6907 100644 --- a/vue/src/views/dou/goods/goods_list.vue +++ b/vue/src/views/dou/goods/goods_list.vue @@ -1,30 +1,30 @@