From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
index 71152b0..39de643 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
@@ -102,7 +102,9 @@
@Override
public R pageGoodsList(PageComShopGoodsDTO pageComShopGoodsDTO) {
- Page page = new Page<>(pageComShopGoodsDTO.getPageNum(), pageComShopGoodsDTO.getPageSize());
+ long pageNum = pageComShopGoodsDTO.getPageNum()!=null?pageComShopGoodsDTO.getPageNum():1;
+ long pageSize = pageComShopGoodsDTO.getPageSize()!=null?pageComShopGoodsDTO.getPageSize():10;
+ Page page = new Page<>(pageNum, pageSize);
IPage<PageShopGoodsVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopGoodsDTO);
if (!comShopStoreVOIPage.getRecords().isEmpty()) {
comShopStoreVOIPage.getRecords().forEach(shopGoods -> {
@@ -157,9 +159,21 @@
}
addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
ComShopGoodsAttrDO comShopGoodsAttrDO = shopGoodsAttrDAO.selectById(goodsAttr.getGoodsAttrId());
- comShopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
- comShopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
- shopGoodsAttrDAO.updateById(comShopGoodsAttrDO);
+ if(comShopGoodsAttrDO!=null){
+ comShopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
+ comShopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
+ shopGoodsAttrDAO.updateById(comShopGoodsAttrDO);
+ }else{
+ comShopGoodsAttrDO = new ComShopGoodsAttrDO();
+ comShopGoodsAttrDO.setGoodsId(id);
+ comShopGoodsAttrDO.setStoreId(addShopGoodsVO.getStoreId());
+ comShopGoodsAttrDO.setGoodsName(addShopGoodsVO.getName());
+ comShopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
+ comShopGoodsAttrDO.setAttrPic(addShopGoodsVO.getGoodsPic());
+ comShopGoodsAttrDO.setIsDefault(1);
+ comShopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
+ shopGoodsAttrDAO.insert(comShopGoodsAttrDO);
+ }
});
}
return R.ok();
--
Gitblit v1.7.1