huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化店铺商品关联商品库；修复BUG#ICBJLI

This commit is contained in:
Richie 2025-05-30 10:29:21 +08:00
parent ff0b5750a5
commit ff4bac773b
10 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java
View File

@ -35,7 +35,7 @@ public class DouGoodsController extends BaseController {
@RequestMapping(value = "/skuList", method = RequestMethod.GET)
public TableDataInfo skuList(DouGoodsBo bo, PageQuery pageQuery) {
PageResult<DouGoodsSkuListVo> result = skuService.queryPageList(bo, pageQuery);
PageResult<DouGoodsSku> result = skuService.queryPageList(bo, pageQuery);
return getDataTable(result);
}

2
microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java
View File

@ -35,7 +35,7 @@ public class JdGoodsController extends BaseController {
@RequestMapping(value = "/skuList", method = RequestMethod.GET)
public TableDataInfo skuList(JdGoodsBo bo, PageQuery pageQuery) {
PageResult<JdGoodsSkuListVo> result = skuService.queryPageList(bo, pageQuery);
PageResult<JdGoodsSku> result = skuService.queryPageList(bo, pageQuery);
return getDataTable(result);
}

2
microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java
View File

@ -42,7 +42,7 @@ public class TaoGoodsController extends BaseController {
@RequestMapping(value = "/skuList", method = RequestMethod.GET)
public TableDataInfo skuList(TaoGoodsBo bo, PageQuery pageQuery) {
PageResult<TaoGoodsSkuListVo> result = skuService.queryPageList(bo, pageQuery);
PageResult<TaoGoodsSku> result = skuService.queryPageList(bo, pageQuery);
return getDataTable(result);
}

2
module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java
View File

@ -16,6 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @createDate 2024-05-31 17:23:21
*/
public interface DouGoodsSkuService extends IService<DouGoodsSku> {
PageResult<DouGoodsSkuListVo> queryPageList(DouGoodsBo bo, PageQuery pageQuery);
PageResult<DouGoodsSku> queryPageList(DouGoodsBo bo, PageQuery pageQuery);
ResultVo linkErpGoodsSku(LinkErpGoodsSkuBo bo);
}

14
module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java
View File

@ -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<DouGoodsSkuMapper, DouGo
private final OGoodsService oGoodsService;
@Override
public PageResult<DouGoodsSkuListVo> queryPageList(DouGoodsBo bo, PageQuery pageQuery) {
public PageResult<DouGoodsSku> queryPageList(DouGoodsBo bo, PageQuery pageQuery) {
if(StringUtils.hasText(bo.getCode())){
bo.setCode(bo.getCode().trim());
}
IPage<DouGoodsSkuListVo> result = mapper.selectSkuPageList(pageQuery.build(), bo.getShopId(),bo.getProductId(),bo.getSkuId(),bo.getCode(),bo.getHasLink());
return PageResult.build(result);
// IPage<DouGoodsSkuListVo> result = mapper.selectSkuPageList(pageQuery.build(), bo.getShopId(),bo.getProductId(),bo.getSkuId(),bo.getCode(),bo.getHasLink());
// return PageResult.build(result);
LambdaQueryWrapper<DouGoodsSku> queryWrapper = new LambdaQueryWrapper<DouGoodsSku>()
.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<DouGoodsSku> goodsPage = mapper.selectPage(pageQuery.build(), queryWrapper);
return PageResult.build(goodsPage);
}
@Transactional(rollbackFor = Exception.class)

2
module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java
View File

@ -15,6 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @createDate 2024-03-09 20:44:11
*/
public interface JdGoodsSkuService extends IService<JdGoodsSku> {
PageResult<JdGoodsSkuListVo> queryPageList(JdGoodsBo bo, PageQuery pageQuery);
PageResult<JdGoodsSku> queryPageList(JdGoodsBo bo, PageQuery pageQuery);
ResultVo linkErpGoodsSku(LinkErpGoodsSkuBo bo);
}

14
module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java
View File

@ -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<JdGoodsSkuMapper, JdGoods
private final OGoodsSkuService oGoodsSkuService;
private final OGoodsService oGoodsService;
@Override
public PageResult<JdGoodsSkuListVo> queryPageList(JdGoodsBo bo, PageQuery pageQuery) {
public PageResult<JdGoodsSku> queryPageList(JdGoodsBo bo, PageQuery pageQuery) {
if(StringUtils.hasText(bo.getOuterId())){
bo.setOuterId(bo.getOuterId().trim());
}
IPage<JdGoodsSkuListVo> result = mapper.selectSkuPageList(pageQuery.build(), bo.getShopId(),bo.getWareId(),bo.getSkuId(),bo.getOuterId(),bo.getHasLink());
return PageResult.build(result);
LambdaQueryWrapper<JdGoodsSku> queryWrapper = new LambdaQueryWrapper<JdGoodsSku>()
.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<JdGoodsSkuListVo> result = mapper.selectSkuPageList(pageQuery.build(), bo.getShopId(),bo.getWareId(),bo.getSkuId(),bo.getOuterId(),bo.getHasLink());
// return PageResult.build(result);
Page<JdGoodsSku> goodsPage = mapper.selectPage(pageQuery.build(), queryWrapper);
return PageResult.build(goodsPage);
}
@Transactional(rollbackFor = Exception.class)

2
module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java
View File

@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @createDate 2024-02-29 19:01:35
*/
public interface TaoGoodsSkuService extends IService<TaoGoodsSku> {
PageResult<TaoGoodsSkuListVo> queryPageList(TaoGoodsBo bo, PageQuery pageQuery);
PageResult<TaoGoodsSku> queryPageList(TaoGoodsBo bo, PageQuery pageQuery);
ResultVo linkErpGoodsSku(LinkErpGoodsSkuBo bo);
}

12
module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java
View File

@ -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<TaoGoodsSkuMapper, TaoGo
private final OGoodsSkuService oGoodsSkuService;
@Override
public PageResult<TaoGoodsSkuListVo> queryPageList(TaoGoodsBo bo, PageQuery pageQuery) {
IPage<TaoGoodsSkuListVo> result = mapper.selectSkuPageList(pageQuery.build(), bo.getShopId(),bo.getNumIid(),bo.getSkuId(),bo.getOuterId(), bo.getHasLink());
public PageResult<TaoGoodsSku> queryPageList(TaoGoodsBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TaoGoodsSku> ew = new LambdaQueryWrapper<TaoGoodsSku>()
.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<TaoGoodsSku> result = mapper.selectPage(pageQuery.build(), ew);
return PageResult.build(result);
}

2
vue/src/api/tao/shop_api.js
View File

@ -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
})