From 1b0abc44a84f17224ae0fff992db0459db6f12fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com> Date: Sat, 24 Jan 2026 18:19:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96pdd=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pdd/controller/PddGoodsController.java | 3 +- .../cn/qihangerp/model/bo/PddGoodsBo.java | 9 +-- .../cn/qihangerp/model/bo/PddGoodsSkuBo.java | 19 +++++ .../module/service/PddGoodsSkuService.java | 3 +- .../service/impl/PddGoodsServiceImpl.java | 6 +- .../service/impl/PddGoodsSkuServiceImpl.java | 6 +- vue/src/utils/zhijian.js | 4 + vue/src/views/pdd/goods/goods_list.vue | 75 ++++++++++++------- vue/src/views/shop/index.vue | 9 ++- vue/src/views/shop/platform/index.vue | 14 ++-- 10 files changed, 100 insertions(+), 48 deletions(-) create mode 100644 model/src/main/java/cn/qihangerp/model/bo/PddGoodsSkuBo.java diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java index 25f6d2d5..4808672f 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java @@ -2,6 +2,7 @@ package cn.qihangerp.oms.pdd.controller; import cn.qihangerp.common.*; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.PddGoodsSkuBo; import cn.qihangerp.module.service.OGoodsSkuService; import cn.qihangerp.model.entity.PddGoods; import cn.qihangerp.model.entity.PddGoodsSku; @@ -31,7 +32,7 @@ public class PddGoodsController extends BaseController { } @RequestMapping(value = "/skuList", method = RequestMethod.GET) - public TableDataInfo skuList(PddGoodsSku bo, PageQuery pageQuery) { + public TableDataInfo skuList(PddGoodsSkuBo bo, PageQuery pageQuery) { PageResult result = skuService.queryPageList(bo, pageQuery); return getDataTable(result); diff --git a/model/src/main/java/cn/qihangerp/model/bo/PddGoodsBo.java b/model/src/main/java/cn/qihangerp/model/bo/PddGoodsBo.java index 7d9c722f..17af4589 100644 --- a/model/src/main/java/cn/qihangerp/model/bo/PddGoodsBo.java +++ b/model/src/main/java/cn/qihangerp/model/bo/PddGoodsBo.java @@ -10,10 +10,9 @@ public class PddGoodsBo implements Serializable { * 商品数字id */ private Long goodsId; - private Long skuId; private String title; - private String outerId; - private Integer shopId; - private Integer hasLink;//是否关联 - private Integer saleState;//状态（京东自营用） + private String outerGoodsId; + private Long shopId; + + private Integer isOnsale;//状态（1售卖中 0已下架） } diff --git a/model/src/main/java/cn/qihangerp/model/bo/PddGoodsSkuBo.java b/model/src/main/java/cn/qihangerp/model/bo/PddGoodsSkuBo.java new file mode 100644 index 00000000..cdb5fc01 --- /dev/null +++ b/model/src/main/java/cn/qihangerp/model/bo/PddGoodsSkuBo.java @@ -0,0 +1,19 @@ +package cn.qihangerp.model.bo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class PddGoodsSkuBo implements Serializable { + /** + * 商品数字id + */ + private String goodsId; + private String skuId; + private String outerId; + private Long erpSkuId; + private Long shopId; + + private Integer isSkuOnsale;//状态（1售卖中 0已下架） +} diff --git a/service/src/main/java/cn/qihangerp/module/service/PddGoodsSkuService.java b/service/src/main/java/cn/qihangerp/module/service/PddGoodsSkuService.java index 97ade992..06ee9e43 100644 --- a/service/src/main/java/cn/qihangerp/module/service/PddGoodsSkuService.java +++ b/service/src/main/java/cn/qihangerp/module/service/PddGoodsSkuService.java @@ -4,6 +4,7 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.PddGoodsSkuBo; import cn.qihangerp.model.entity.PddGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; @@ -14,6 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @createDate 2024-06-04 17:11:49 */ public interface PddGoodsSkuService extends IService { - PageResult queryPageList(PddGoodsSku bo, PageQuery pageQuery); + PageResult queryPageList(PddGoodsSkuBo bo, PageQuery pageQuery); ResultVo linkErpGoodsSku(LinkErpGoodsSkuBo bo); } diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsServiceImpl.java index c86bb23b..7d5cac4d 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsServiceImpl.java @@ -47,7 +47,11 @@ public class PddGoodsServiceImpl extends ServiceImpl @Override public PageResult queryPageList(PddGoodsBo bo, PageQuery pageQuery) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(bo.getShopId()!=null,PddGoods::getShopId,bo.getShopId()); + .eq(bo.getShopId()!=null,PddGoods::getShopId,bo.getShopId()) + .eq(bo.getGoodsId()!=null,PddGoods::getGoodsId,bo.getGoodsId()) + .eq(org.springframework.util.StringUtils.hasText(bo.getOuterGoodsId()),PddGoods::getOuterGoodsId,bo.getOuterGoodsId()) + .eq(bo.getIsOnsale()!=null,PddGoods::getIsOnsale,bo.getIsOnsale()) + ; Page goodsPage = mapper.selectPage(pageQuery.build(), queryWrapper); if(goodsPage.getRecords()!=null&&goodsPage.getRecords().size()>0){ 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 c97425f9..96fecd59 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 @@ -4,6 +4,7 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; +import cn.qihangerp.model.bo.PddGoodsSkuBo; import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.service.OGoodsService; @@ -37,13 +38,14 @@ public class PddGoodsSkuServiceImpl extends ServiceImpl queryPageList(PddGoodsSku bo, PageQuery pageQuery) { + public PageResult queryPageList(PddGoodsSkuBo bo, PageQuery pageQuery) { LambdaQueryWrapper 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.getOuterGoodsId()),PddGoodsSku::getOuterGoodsId,bo.getOuterGoodsId()) + .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()) ; IPage result = mapper.selectPage(pageQuery.build(), ew); return PageResult.build(result); diff --git a/vue/src/utils/zhijian.js b/vue/src/utils/zhijian.js index e38da4dc..9a01669e 100644 --- a/vue/src/utils/zhijian.js +++ b/vue/src/utils/zhijian.js @@ -237,3 +237,7 @@ export function amountFormatter(row, column, cellValue, index) { return '￥' + parseFloat(cellValue).toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,'); } +// 显示行号 +export function rowIndex({ row, rowIndex }) { + row.index = rowIndex + 1; +} diff --git a/vue/src/views/pdd/goods/goods_list.vue b/vue/src/views/pdd/goods/goods_list.vue index 3d14f90a..87698f9c 100644 --- a/vue/src/views/pdd/goods/goods_list.vue +++ b/vue/src/views/pdd/goods/goods_list.vue @@ -1,30 +1,30 @@