From ff4bac773b5cb9e59f1a6da9910c18b376738996 Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Fri, 30 May 2025 10:29:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=97=E9=93=BA=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=85=B3=E8=81=94=E5=95=86=E5=93=81=E5=BA=93=EF=BC=9B?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG#ICBJLI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dou/controller/DouGoodsController.java | 2 +- .../api/jd/controller/JdGoodsController.java | 2 +- .../api/tao/controller/TaoGoodsController.java | 2 +- .../open/dou/service/DouGoodsSkuService.java | 2 +- .../dou/service/impl/DouGoodsSkuServiceImpl.java | 14 +++++++++++--- .../module/open/jd/service/JdGoodsSkuService.java | 2 +- .../jd/service/impl/JdGoodsSkuServiceImpl.java | 14 +++++++++++--- .../open/tao/service/TaoGoodsSkuService.java | 2 +- .../tao/service/impl/TaoGoodsSkuServiceImpl.java | 12 ++++++++++-- vue/src/api/tao/shop_api.js | 2 +- 10 files changed, 39 insertions(+), 15 deletions(-) diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java index 92230e22..e3fe63f1 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java @@ -35,7 +35,7 @@ public class DouGoodsController extends BaseController { @RequestMapping(value = "/skuList", method = RequestMethod.GET) public TableDataInfo skuList(DouGoodsBo bo, PageQuery pageQuery) { - PageResult result = skuService.queryPageList(bo, pageQuery); + PageResult result = skuService.queryPageList(bo, pageQuery); return getDataTable(result); } diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java index fe9f93f6..232912b6 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java @@ -35,7 +35,7 @@ public class JdGoodsController extends BaseController { @RequestMapping(value = "/skuList", method = RequestMethod.GET) public TableDataInfo skuList(JdGoodsBo bo, PageQuery pageQuery) { - PageResult result = skuService.queryPageList(bo, pageQuery); + PageResult result = skuService.queryPageList(bo, pageQuery); return getDataTable(result); } diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java index 137b09c0..6487723c 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java @@ -42,7 +42,7 @@ public class TaoGoodsController extends BaseController { @RequestMapping(value = "/skuList", method = RequestMethod.GET) public TableDataInfo skuList(TaoGoodsBo bo, PageQuery pageQuery) { - PageResult result = skuService.queryPageList(bo, pageQuery); + PageResult result = skuService.queryPageList(bo, pageQuery); return getDataTable(result); } diff --git a/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java index f26e49bc..e057107e 100644 --- a/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java @@ -16,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(DouGoodsBo bo, PageQuery pageQuery); ResultVo linkErpGoodsSku(LinkErpGoodsSkuBo bo); } diff --git a/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java index 2e3e0b33..d2d6a8a4 100644 --- a/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java @@ -17,6 +17,7 @@ import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper; import cn.qihangerp.module.open.dou.service.DouGoodsSkuService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -40,12 +41,19 @@ public class DouGoodsSkuServiceImpl extends ServiceImpl queryPageList(DouGoodsBo bo, PageQuery pageQuery) { + public PageResult queryPageList(DouGoodsBo bo, PageQuery pageQuery) { if(StringUtils.hasText(bo.getCode())){ bo.setCode(bo.getCode().trim()); } - IPage result = mapper.selectSkuPageList(pageQuery.build(), bo.getShopId(),bo.getProductId(),bo.getSkuId(),bo.getCode(),bo.getHasLink()); - return PageResult.build(result); +// IPage 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.getShopId()!=null,DouGoodsSku::getShopId,bo.getShopId()) + .eq(bo.getProductId()!=null,DouGoodsSku::getProductId,bo.getProductId()) + .eq(StringUtils.hasText(bo.getCode()),DouGoodsSku::getOutSkuId,bo.getCode()) + ; + Page goodsPage = mapper.selectPage(pageQuery.build(), queryWrapper); + return PageResult.build(goodsPage); } @Transactional(rollbackFor = Exception.class) diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java index 103822a0..cc54800c 100644 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java +++ b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java @@ -15,6 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @createDate 2024-03-09 20:44:11 */ public interface JdGoodsSkuService extends IService { - PageResult queryPageList(JdGoodsBo bo, PageQuery pageQuery); + PageResult queryPageList(JdGoodsBo bo, PageQuery pageQuery); ResultVo linkErpGoodsSku(LinkErpGoodsSkuBo bo); } diff --git a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java index e3cbc78e..991e1ebe 100644 --- a/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java +++ b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java @@ -11,6 +11,7 @@ import cn.qihangerp.module.open.jd.mapper.JdGoodsMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -40,12 +41,19 @@ public class JdGoodsSkuServiceImpl extends ServiceImpl queryPageList(JdGoodsBo bo, PageQuery pageQuery) { + public PageResult queryPageList(JdGoodsBo bo, PageQuery pageQuery) { if(StringUtils.hasText(bo.getOuterId())){ bo.setOuterId(bo.getOuterId().trim()); } - IPage result = mapper.selectSkuPageList(pageQuery.build(), bo.getShopId(),bo.getWareId(),bo.getSkuId(),bo.getOuterId(),bo.getHasLink()); - return PageResult.build(result); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(bo.getShopId()!=null,JdGoodsSku::getShopId,bo.getShopId()) + .eq(bo.getWareId()!=null,JdGoodsSku::getWareId,bo.getWareId()) + .eq(StringUtils.hasText(bo.getOuterId()),JdGoodsSku::getOuterId,bo.getOuterId()) + ; +// IPage result = mapper.selectSkuPageList(pageQuery.build(), bo.getShopId(),bo.getWareId(),bo.getSkuId(),bo.getOuterId(),bo.getHasLink()); +// return PageResult.build(result); + Page goodsPage = mapper.selectPage(pageQuery.build(), queryWrapper); + return PageResult.build(goodsPage); } @Transactional(rollbackFor = Exception.class) diff --git a/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java index f188f9bf..fcf1e3cd 100644 --- a/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java @@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @createDate 2024-02-29 19:01:35 */ public interface TaoGoodsSkuService extends IService { - PageResult queryPageList(TaoGoodsBo bo, PageQuery pageQuery); + PageResult queryPageList(TaoGoodsBo bo, PageQuery pageQuery); ResultVo linkErpGoodsSku(LinkErpGoodsSkuBo bo); } diff --git a/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java index a0a48751..5c9fea97 100644 --- a/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java @@ -14,11 +14,13 @@ import cn.qihangerp.module.open.tao.domain.vo.TaoGoodsSkuListVo; import cn.qihangerp.module.open.tao.mapper.TaoGoodsMapper; import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper; import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; /** * @author TW @@ -34,8 +36,14 @@ public class TaoGoodsSkuServiceImpl extends ServiceImpl queryPageList(TaoGoodsBo bo, PageQuery pageQuery) { - IPage result = mapper.selectSkuPageList(pageQuery.build(), bo.getShopId(),bo.getNumIid(),bo.getSkuId(),bo.getOuterId(), bo.getHasLink()); + public PageResult queryPageList(TaoGoodsBo bo, PageQuery pageQuery) { + LambdaQueryWrapper ew = new LambdaQueryWrapper() + .eq(bo.getShopId()!=null,TaoGoodsSku::getShopId,bo.getShopId()) + .eq(bo.getNumIid()!=null,TaoGoodsSku::getNumIid,bo.getNumIid()) + .eq(bo.getSkuId()!=null,TaoGoodsSku::getSkuId,bo.getSkuId()) + .eq(StringUtils.hasText(bo.getOuterId()),TaoGoodsSku::getOuterId,bo.getOuterId()) + ; + IPage result = mapper.selectPage(pageQuery.build(), ew); return PageResult.build(result); } diff --git a/vue/src/api/tao/shop_api.js b/vue/src/api/tao/shop_api.js index 168d6f60..ad8860d9 100644 --- a/vue/src/api/tao/shop_api.js +++ b/vue/src/api/tao/shop_api.js @@ -26,7 +26,7 @@ export function pullLogisticsJd(data) { } export function getTaoOAuthUrl(query) { return request({ - url: '/api/tao-api/tao/oauth', + url: '/api/open-api/tao/oauth', method: 'get', params: query })