yanghui
2022-11-09 3f2bd3ec32579508caebac4ea89ab7f149ae8897
#feat 商品部分提交
8个文件已修改
4个文件已添加
449 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerGoodsAttrService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerGoodsService.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientElevatingPointService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsAttrServiceImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java 273 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -317,7 +317,11 @@
    @ApiOperation(value = "查询当前用户党员信息")
    @GetMapping("/getPartyMember")
    public R getPartyMember(@RequestParam("type")Integer type){
        return partyBuildingService.getPartyMember(this.getLoginUserInfo().getPhone(),type);
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (StrUtil.isEmpty(loginUserInfo.getPhone())){
            return R.fail("请先实名认证");
        }
        return partyBuildingService.getPartyMember(loginUserInfo.getPhone(),type);
    }
    @ApiOperation(value = "查询报道单位详情")
    @GetMapping("/comPbCheckUnit/detailByPhone")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java
@@ -21,10 +21,27 @@
    private Long goodsAttrId;
    @ApiModelProperty("商品规格")
    private String goodsAttr;
    private String goodsAttrName;
    @ApiModelProperty("规格价格")
    @Min(groups = {AddGroup.class}, value = 0, message = "价格最小值为0")
    @ApiModelProperty("原价")
    @Min(groups = {AddGroup.class}, value = 0, message = "原价最小值为0")
    @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
    private BigDecimal attrPrice;
    private BigDecimal price;
    @ApiModelProperty("包邮价")
//    @Min(groups = {AddGroup.class}, value = 0, message = "包邮价最小值为0")
//    @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
    private BigDecimal freeShippingPrice;
    @ApiModelProperty("拼单价")
//    @Min(groups = {AddGroup.class}, value = 0, message = "拼单价最小值为0")
//    @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
    private BigDecimal collatePrice;
    @ApiModelProperty("商品规格图")
    private String attrPic;
    @ApiModelProperty("库存")
    private Integer stock;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java
@@ -33,7 +33,7 @@
    @ApiModelProperty("商品单位")
    private String unit;
    @ApiModelProperty("商品状态(1.上架  2.已下架  3.回收站)")
    @ApiModelProperty("商品状态(1.出售中  2.已下架  3.回收站)")
    private Integer status;
    @ApiModelProperty("商品主图")
@@ -48,7 +48,7 @@
    /**
     * 配送方式(1.商家配送 2.快递物流)
     */
    @ApiModelProperty(value = "配送方式(1.自提  2.快递)", hidden = true)
    @ApiModelProperty(value = "配送方式(1.商家配送  2.快递物流)", hidden = true)
    private Integer deliveryType;
    @ApiModelProperty("商品规格")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java
@@ -1,6 +1,7 @@
package com.panzhihua.common.model.vos.shop;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -106,13 +107,13 @@
     * 商品规格列表
     */
    @ApiModelProperty("商品规格列表")
    private List<ComShopGoodsAttrVO> goodsAttrList;
    private List<ComShopFlowerGoodsAttrVO> goodsAttrList;
    /**
     * 店铺信息
     */
    @ApiModelProperty("商品店铺信息")
    private PageShopStoreVO shopStoreVO;
    private ConvenientMerchantVO convenientMerchantVO;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("创建时间")
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO;
import com.panzhihua.common.model.vos.shop.ComShopGoodsVO;
import com.panzhihua.common.model.vos.shop.PageShopFlowerGoodsVO;
import com.panzhihua.common.model.vos.shop.PageShopGoodsVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsDO;
import org.apache.ibatis.annotations.Mapper;
@@ -19,7 +20,7 @@
@Mapper
public interface ComShopFlowerGoodsDAO extends BaseMapper<ComShopFlowerGoodsDO> {
    IPage<ComShopFlowerGoodsVO> pageShopGoods(@Param("page") Page page, @Param("pageComShopFlowerGoodsDTO") PageComShopFlowerGoodsDTO pageComShopFlowerGoodsDTO);
    IPage<PageShopFlowerGoodsVO> pageShopGoods(@Param("page") Page page, @Param("pageComShopFlowerGoodsDTO") PageComShopFlowerGoodsDTO pageComShopFlowerGoodsDTO);
    /**
     * 根据店铺id查询商品列表
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerGoodsAttrService.java
New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsAttrDO;
/**
 * @ClassName: ComShopFlowerGoodsAttrService
 * @Author: yh
 * @Date: 2022/11/8 17:19
 * @Description: 商品规格
 */
public interface ComShopFlowerGoodsAttrService extends IService<ComShopFlowerGoodsAttrDO> {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerGoodsService.java
New file
@@ -0,0 +1,82 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.ComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsDO;
/**
 * @ClassName: ComShopFlowerGoodsService
 * @Author: yh
 * @Date: 2022/11/8 17:16
 * @Description: 商品
 */
public interface ComShopFlowerGoodsService extends IService<ComShopFlowerGoodsDO> {
    /**
     * 添加商品
     *
     * @param addShopFlowerGoodsVO
     * @return
     */
    R saveShopFlowerGoods(AddShopFlowerGoodsVO addShopFlowerGoodsVO);
    /**
     * 商品列表-分页查询
     *
     * @param pageComShopFlowerGoodsDTO
     *            查询参数
     * @return PageShopStoreVO
     */
    R pageFlowerGoodsList(PageComShopFlowerGoodsDTO pageComShopFlowerGoodsDTO);
    /**
     * 分页查询商品列表
     *
     * @param comShopFlowerGoodsDTO
     *            请求参数
     * @return 商品列表
     */
    R pageShopFlowerGoodsByApp(ComShopFlowerGoodsDTO comShopFlowerGoodsDTO);
    /**
     * 根据商品id查询商品信息
     *
     * @param goodsId
     *            商品id
     * @return 商品信息
     */
    R shopFlowerGoodsDetail(Long goodsId);
    /**
     * 编辑商品
     *
     * @param id
     *            商铺ID
     * @param addShopFlowerGoodsVO
     * @return
     */
    R editFlowerShopGoods(Long id, AddShopFlowerGoodsVO addShopFlowerGoodsVO);
    /**
     * 删除商品
     *
     * @param id
     * @return
     */
    R deleteShopFlowerGoods(Long[] id);
    /**
     * 修改商品状态
     *
     * @param id
     * @return
     */
    R changeStatus(Long id, Integer status);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientElevatingPointService.java
@@ -42,4 +42,11 @@
     * @return
     */
    R deletePoint(Long pointId, Long operator);
    /**
     * 详情
     * @param pointId
     * @return
     */
    R detailPoint(Long pointId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsAttrServiceImpl.java
New file
@@ -0,0 +1,23 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComShopFlowerGoodsAttrDAO;
import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO;
import com.panzhihua.service_community.model.dos.ComShopFlowerGoodsAttrDO;
import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO;
import com.panzhihua.service_community.service.ComShopFlowerGoodsAttrService;
import com.panzhihua.service_community.service.ComShopGoodsAttrService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
 * @auther yh
 * @create 2022-11-08 17:25:45
 * @describe 商品规格表服务实现类
 */
@Slf4j
@Service
public class ComShopFlowerGoodsAttrServiceImpl extends ServiceImpl<ComShopFlowerGoodsAttrDAO, ComShopFlowerGoodsAttrDO>
    implements ComShopFlowerGoodsAttrService {
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
New file
@@ -0,0 +1,273 @@
package com.panzhihua.service_community.service.impl;
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 com.google.common.collect.Lists;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.shop.ComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.utlis.DifferentLongListUtil;
import com.panzhihua.service_community.dao.ComShopFlowerGoodsAttrDAO;
import com.panzhihua.service_community.dao.ComShopFlowerGoodsDAO;
import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComShopFlowerGoodsAttrService;
import com.panzhihua.service_community.service.ComShopFlowerGoodsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
 * @ClassName: ComShopFlowerGoodsServiceImpl
 * @Author: yh
 * @Date: 2022/11/8 17:17
 * @Description: 商品
 */
@Service
@Slf4j
public class ComShopFlowerGoodsServiceImpl extends ServiceImpl<ComShopFlowerGoodsDAO, ComShopFlowerGoodsDO> implements ComShopFlowerGoodsService {
    @Resource
    private ComShopFlowerGoodsAttrService comShopFlowerGoodsAttrService;
    @Resource
    private ComShopFlowerGoodsAttrDAO shopFlowerGoodsAttrDAO;
    @Resource
    private ConvenientMerchantDAO convenientMerchantDAO;
    @Override
    public R saveShopFlowerGoods(AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
        if (addShopFlowerGoodsVO == null) {
            return R.ok("500", "数据为空!");
        }
        String[] images = addShopFlowerGoodsVO.getGoodsPic().split(",");
        ComShopFlowerGoodsDO shopGoodsDO = new ComShopFlowerGoodsDO();
        BeanUtils.copyProperties(addShopFlowerGoodsVO, shopGoodsDO);
        shopGoodsDO.setOriginalPrice(addShopFlowerGoodsVO.getPrice());
        if (images.length > 1) {
            shopGoodsDO.setGoodsPic(images[0]);
        }
        shopGoodsDO.setImages(addShopFlowerGoodsVO.getGoodsPic());
        shopGoodsDO.setSale(0);
        shopGoodsDO.setDetails(addShopFlowerGoodsVO.getDetails());
        int goodsId = this.baseMapper.insert(shopGoodsDO);
        if (goodsId > 0) {
            ArrayList<ComShopFlowerGoodsAttrDO> goodsAttrDOS = Lists.newArrayList();
            ComShopFlowerGoodsDO goodDO = this.baseMapper.selectById(shopGoodsDO.getId());
            addShopFlowerGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
                // 维护商品规格表
                if (goodDO == null) {
                    throw new ServiceException("商品id不存在!");
                }
                ComShopFlowerGoodsAttrDO shopGoodsAttrDO = new ComShopFlowerGoodsAttrDO();
                shopGoodsAttrDO.setGoodsId(shopGoodsDO.getId());
                shopGoodsAttrDO.setStoreId(goodDO.getStoreId());
                shopGoodsAttrDO.setGoodsName(goodDO.getName());
                shopGoodsAttrDO.setGoodsAttrName(goodsAttr.getGoodsAttrName());
                shopGoodsAttrDO.setIsDefault(1);
                shopGoodsAttrDO.setPrice(goodsAttr.getPrice());
                shopGoodsAttrDO.setCollatePrice(goodsAttr.getCollatePrice());
                shopGoodsAttrDO.setFreeShippingPrice(goodsAttr.getFreeShippingPrice());
                shopGoodsAttrDO.setAttrPic(goodsAttr.getAttrPic());
                shopGoodsAttrDO.setStock(goodsAttr.getStock());
                shopGoodsAttrDO.setSale(0);
                goodsAttrDOS.add(shopGoodsAttrDO);
            });
            if (goodsAttrDOS.size() > 0) {
                comShopFlowerGoodsAttrService.saveBatch(goodsAttrDOS);
            }
        }
        return R.ok();
    }
    /**
     * 分页查询
     *
     * @param pageComShopFlowerGoodsDTO 查询参数
     * @return
     */
    @Override
    public R pageFlowerGoodsList(PageComShopFlowerGoodsDTO pageComShopFlowerGoodsDTO) {
        long pageNum = pageComShopFlowerGoodsDTO.getPageNum() != null ? pageComShopFlowerGoodsDTO.getPageNum() : 1;
        long pageSize = pageComShopFlowerGoodsDTO.getPageSize() != null ? pageComShopFlowerGoodsDTO.getPageSize() : 10;
        Page page = new Page<>(pageNum, pageSize);
        IPage<PageShopFlowerGoodsVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopFlowerGoodsDTO);
        if (!comShopStoreVOIPage.getRecords().isEmpty()) {
            comShopStoreVOIPage.getRecords().forEach(shopGoods -> {
                List<ComShopFlowerGoodsAttrDO> goodsAttrDOs =
                        shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().lambda()
                                .eq(ComShopFlowerGoodsAttrDO::getGoodsId, shopGoods.getId()));
                ArrayList<AddShopFlowerGoodsAttrVO> goodsAttrVOList = Lists.newArrayList();
                for (ComShopFlowerGoodsAttrDO oneGoodsAttrDO : goodsAttrDOs) {
                    AddShopFlowerGoodsAttrVO goodsAttrVO = new AddShopFlowerGoodsAttrVO();
                    BeanUtils.copyProperties(oneGoodsAttrDO, goodsAttrVO);
                    goodsAttrVOList.add(goodsAttrVO);
                }
                shopGoods.setGoodsAttrs(goodsAttrVOList);
            });
        }
        return R.ok(comShopStoreVOIPage);
    }
    /**
     * 分页查询商品列表
     *
     * @param comShopFlowerGoodsDTO 请求参数
     * @return
     */
    @Override
    public R pageShopFlowerGoodsByApp(ComShopFlowerGoodsDTO comShopFlowerGoodsDTO) {
        Page page = new Page<>(comShopFlowerGoodsDTO.getPageNum(), comShopFlowerGoodsDTO.getPageSize());
        IPage<ComShopFlowerGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page, comShopFlowerGoodsDTO);
        if (!goodsVOIPage.getRecords().isEmpty()) {
            goodsVOIPage.getRecords().forEach(goodsVo -> {
                List<ComShopFlowerGoodsAttrVO> goodsAttrList = shopFlowerGoodsAttrDAO.getGoodsAttr(goodsVo.getId());
                if (!goodsAttrList.isEmpty()) {
                    ComShopFlowerGoodsAttrVO comShopFlowerGoodsAttrVO = goodsAttrList.get(0);
                    goodsVo.setGoodsAttrList(goodsAttrList);
                    goodsVo.setGoodsPic(comShopFlowerGoodsAttrVO.getAttrPic());
                    goodsVo.setOriginalPrice(comShopFlowerGoodsAttrVO.getPrice());
                    goodsVo.setPrice(comShopFlowerGoodsAttrVO.getCollatePrice());
                }
            });
        }
        return R.ok(goodsVOIPage);
    }
    @Override
    public R shopFlowerGoodsDetail(Long goodsId) {
        // 根据id查询商品信息
        ComShopFlowerGoodsDO goodsDO = this.baseMapper.selectById(goodsId);
        if (goodsDO == null || goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.deleteStatus.yes)) {
            return R.fail(403, "商品不存在");
        }
        if (!goodsDO.getStatus().equals(ComShopFlowerGoodsDO.status.sell)) {
            return R.fail(405, "商品已下架");
        }
        // 根据商品id查询商品规格信息
        List<ComShopFlowerGoodsAttrVO> goodsAttrList = new ArrayList<>();
        List<ComShopFlowerGoodsAttrDO> goodsAttrDOS =
                shopFlowerGoodsAttrDAO.selectList(new QueryWrapper<ComShopFlowerGoodsAttrDO>().eq("goods_id", goodsId));
        goodsAttrDOS.forEach(attrDO -> {
            ComShopFlowerGoodsAttrVO goodsAttrVO = new ComShopFlowerGoodsAttrVO();
            BeanUtils.copyProperties(attrDO, goodsAttrVO);
            goodsAttrList.add(goodsAttrVO);
        });
        // 查询商品店铺信息
        ConvenientMerchantDO convenientMerchantDO = convenientMerchantDAO.selectById(goodsDO.getStoreId());
        ConvenientMerchantVO convenientMerchantVO = new ConvenientMerchantVO();
        BeanUtils.copyProperties(convenientMerchantDO, convenientMerchantVO);
        // 设置值
        ComShopFlowerGoodsVO shopGoods = new ComShopFlowerGoodsVO();
        BeanUtils.copyProperties(goodsDO, shopGoods);
        shopGoods.setGoodsAttrList(goodsAttrList);
        shopGoods.setConvenientMerchantVO(convenientMerchantVO);
        return R.ok(shopGoods);
    }
    @Override
    public R editFlowerShopGoods(Long id, AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
        if (addShopFlowerGoodsVO == null) {
            return R.ok("500", "数据为空!");
        }
        LambdaQueryWrapper<ComShopFlowerGoodsDO> query =
                new LambdaQueryWrapper<ComShopFlowerGoodsDO>().eq(ComShopFlowerGoodsDO::getId, id);
        ComShopFlowerGoodsDO shopGoodsDO = new ComShopFlowerGoodsDO();
        BeanUtils.copyProperties(addShopFlowerGoodsVO, shopGoodsDO);
        shopGoodsDO.setOriginalPrice(addShopFlowerGoodsVO.getPrice());
        int update = this.baseMapper.update(shopGoodsDO, query);
        if (update < 1) {
            throw new ServiceException("修改失败");
        }
        // 修改规格表
        List<ComShopFlowerGoodsAttrDO> comShopFlowerGoodsAttrDOS = shopFlowerGoodsAttrDAO
                .selectList(new LambdaQueryWrapper<ComShopFlowerGoodsAttrDO>().eq(ComShopFlowerGoodsAttrDO::getGoodsId, id));
        if (addShopFlowerGoodsVO.getGoodsAttrVOList().size() == 0) {
            shopFlowerGoodsAttrDAO
                    .delete(new LambdaQueryWrapper<ComShopFlowerGoodsAttrDO>().eq(ComShopFlowerGoodsAttrDO::getGoodsId, id));
            ComShopFlowerGoodsAttrDO comShopFlowerGoodsAttrDO = new ComShopFlowerGoodsAttrDO();
            comShopFlowerGoodsAttrDO.setGoodsId(id);
            comShopFlowerGoodsAttrDO.setStoreId(addShopFlowerGoodsVO.getStoreId());
            comShopFlowerGoodsAttrDO.setGoodsName(addShopFlowerGoodsVO.getName());
            comShopFlowerGoodsAttrDO.setGoodsAttrName("默认");
            comShopFlowerGoodsAttrDO.setAttrPic(addShopFlowerGoodsVO.getGoodsPic());
            comShopFlowerGoodsAttrDO.setIsDefault(1);
            comShopFlowerGoodsAttrDO.setPrice(addShopFlowerGoodsVO.getPrice());
            shopFlowerGoodsAttrDAO.insert(comShopFlowerGoodsAttrDO);
        } else {
            List<Long> attrIds =
                    comShopFlowerGoodsAttrDOS.stream().map(ComShopFlowerGoodsAttrDO::getId).collect(Collectors.toList());
            List<Long> voAttrIds = addShopFlowerGoodsVO.getGoodsAttrVOList().stream().map(AddShopFlowerGoodsAttrVO::getGoodsAttrId)
                    .collect(Collectors.toList());
            // 需要删除的规格ID——针对编辑时删除了规格的情况
            List<Long> deleteIds = DifferentLongListUtil.getDiffrent(attrIds, voAttrIds);
            if (deleteIds.size() != 0) {
                shopFlowerGoodsAttrDAO.deleteBatchIds(deleteIds);
            }
            addShopFlowerGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
                ComShopFlowerGoodsAttrDO comShopGoodsAttrDO = shopFlowerGoodsAttrDAO.selectById(goodsAttr.getGoodsAttrId());
                if (comShopGoodsAttrDO != null) {
                    comShopGoodsAttrDO.setPrice(goodsAttr.getPrice());
                    comShopGoodsAttrDO.setCollatePrice(goodsAttr.getCollatePrice());
                    comShopGoodsAttrDO.setFreeShippingPrice(goodsAttr.getFreeShippingPrice());
                    comShopGoodsAttrDO.setGoodsAttrName(goodsAttr.getGoodsAttrName());
                    comShopGoodsAttrDO.setAttrPic(goodsAttr.getAttrPic());
                    comShopGoodsAttrDO.setStock(goodsAttr.getStock());
                    shopFlowerGoodsAttrDAO.updateById(comShopGoodsAttrDO);
                } else {
                    comShopGoodsAttrDO = new ComShopFlowerGoodsAttrDO();
                    comShopGoodsAttrDO.setGoodsId(shopGoodsDO.getId());
                    comShopGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId());
                    comShopGoodsAttrDO.setGoodsName(shopGoodsDO.getName());
                    comShopGoodsAttrDO.setGoodsAttrName(goodsAttr.getGoodsAttrName());
                    comShopGoodsAttrDO.setIsDefault(1);
                    comShopGoodsAttrDO.setPrice(goodsAttr.getPrice());
                    comShopGoodsAttrDO.setCollatePrice(goodsAttr.getCollatePrice());
                    comShopGoodsAttrDO.setFreeShippingPrice(goodsAttr.getFreeShippingPrice());
                    comShopGoodsAttrDO.setAttrPic(goodsAttr.getAttrPic());
                    comShopGoodsAttrDO.setStock(goodsAttr.getStock());
                    comShopGoodsAttrDO.setSale(0);
                    shopFlowerGoodsAttrDAO.insert(comShopGoodsAttrDO);
                }
            });
        }
        return R.ok();
    }
    @Override
    public R deleteShopFlowerGoods(Long[] id) {
        LambdaQueryWrapper<ComShopFlowerGoodsDO> query = new LambdaQueryWrapper<ComShopFlowerGoodsDO>().in(ComShopFlowerGoodsDO::getId, id);
        List<ComShopFlowerGoodsDO> comShopGoodsDOS = this.baseMapper.selectList(query);
        for (ComShopFlowerGoodsDO one : comShopGoodsDOS) {
            one.setDeleteStatus(ComShopFlowerGoodsDO.deleteStatus.yes);
            this.baseMapper.updateById(one);
        }
        return R.ok();
    }
    @Override
    public R changeStatus(Long id, Integer status) {
        ComShopFlowerGoodsDO shopGoodsDO = this.baseMapper.selectById(id);
        if (shopGoodsDO == null) {
            return R.fail("id有误!");
        }
        shopGoodsDO.setStatus(status);
        this.baseMapper.updateById(shopGoodsDO);
        return R.ok();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
@@ -111,4 +111,10 @@
        }
        return R.fail("删除失败");
    }
    @Override
    public R detailPoint(Long pointId) {
        ConvenientElevatingPointDO convenientElevatingPointDO = this.baseMapper.selectById(pointId);
        return R.ok(convenientElevatingPointDO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsMapper.xml
@@ -31,7 +31,7 @@
        price, unit, `order`, stock, details, remark, goods_describe, delivery_type, delete_status,
        create_at, update_at
    </sql>
    <select id="pageShopGoods" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO">
    <select id="pageShopGoods" resultType="com.panzhihua.common.model.vos.shop.PageShopFlowerGoodsVO">
        select c.id,c.type_id,ccm.name as
        storeName,c.name,c.store_id,c.goods_pic,c.images,c.status,c.sale,c.original_price,c.price,c.unit,c.order,c.stock,c.details,c.remark,c.goods_describe,c.delivery_type,c.delete_status,c.create_at,c.update_at
        from com_shop_flower_goods c