Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-04-29 1ef187142b42b859ab20be4d9c75185a6f256751

Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java

@@ -22,6 +22,7 @@
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -162,14 +163,14 @@

    @ApiOperation(value = "新增商品")
    @PostMapping("/goods/save")
    R saveShopGoods(@RequestBody AddShopGoodsVO addShopGoodsVO) {
    R saveShopGoods(@RequestBody @Validated(AddGroup.class) AddShopGoodsVO addShopGoodsVO) {
        return communityService.saveShopGoods(addShopGoodsVO);
    }


    @ApiOperation(value = "编辑商品")
    @PostMapping("/goods/edit/{id}")
    R editShopGoods(@PathVariable("id") Long id, @RequestBody AddShopGoodsVO addShopGoodsVO) {
    R editShopGoods(@PathVariable("id") Long id, @RequestBody @Validated(AddGroup.class) AddShopGoodsVO addShopGoodsVO) {
        return communityService.editShopGoods(id, addShopGoodsVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java

@@ -27,7 +27,7 @@
    private String title;

    @ApiModelProperty("办事指南内容")
    @NotNull(groups = {AddGroup.class}, message = "内容不能为空")
    @NotBlank(groups = {AddGroup.class}, message = "内容不能为空")
    @Length(groups = {AddGroup.class}, max = 500)
    private String content;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.shop;

import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
    private String goodsAttr;

    @ApiModelProperty("规格价格")
    @Min(value = 0,message = "价格最小值为0")
    @Digits(integer = 8, fraction = 2)
    @Min(groups = {AddGroup.class}, value = 0,message = "价格最小值为0")
    @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
    private BigDecimal attrPrice;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java

@@ -1,9 +1,11 @@
package com.panzhihua.common.model.vos.shop;

import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.Valid;
import javax.validation.constraints.Digits;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
@@ -26,8 +28,8 @@
    private String name;

    @ApiModelProperty("商品现价")
    @Min(value = 0,message = "价格最小值为0")
    @Digits(integer = 8, fraction = 2)
    @Min(groups = {AddGroup.class}, value = 0,message = "价格最小值为0")
    @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
    private BigDecimal price;


@@ -48,5 +50,6 @@
    private String details;

    @ApiModelProperty("商品规格")
    @Valid
    private List<AddShopGoodsAttrVO> goodsAttrVOList;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -6,6 +6,10 @@
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
@@ -2264,6 +2268,32 @@
    R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);

    /**
     * 管理后台查询邻里圈列表
     * @param comActNeighborCircleAdminDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighborByAdmin")
    R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);


    /**
     * 后台修改邻里圈
     * @param comActNeighborCircleAdminDTO  请求参数
     */
    @PostMapping("/neighbor/changeStatusByAdmin")
    R changeStatusByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);


    /**
     * 后台修改邻里圈
     * @param id  邻里圈id
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/deleteByAdmin")
    R deleteByAdmin(@RequestParam("id")Long id);


    /**
     * 用户查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java

@@ -1,9 +1,17 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.service_community.service.ComActNeighborCircleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -51,6 +59,46 @@
    }

    /**
     * 管理后台查询邻里圈列表
     * @param comActNeighborCircleAdminDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("pageNeighborByAdmin")
    public R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
        return comActNeighborCircleService.pageNeighborByAdmin(comActNeighborCircleAdminDTO);
    }

    /**
     * 后台添加邻里圈
     * @param addNeighborCircleAdminVO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("addNeighborByAdmin")
    public R pageNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
        return comActNeighborCircleService.addNeighborByAdmin(addNeighborCircleAdminVO);
    }

    /**
     * 后台修改邻里圈
     * @param editNeighborCircleAdminVO  请求参数
     */
    @PostMapping("changeStatusByAdmin")
    public R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
        return comActNeighborCircleService.changeStatusByAdmin(editNeighborCircleAdminVO);
    }

    /**
     * 后台修改邻里圈
     * @param id  邻里圈id
     * @return  邻里圈列表
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("deleteByAdmin")
    public R deleteByAdmin(@RequestParam("id")Long id) {
        return comActNeighborCircleService.deleteByAdmin(id);
    }

    /**
     * 用户查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java

@@ -50,13 +50,26 @@
    R addNeighborByAdmin(AddNeighborCircleAdminVO addNeighborCircleAdminVO);

    /**
     * 修改
     * 后台修改邻里圈
     * @param editNeighborCircleAdminVO
     * @return
     */
    R changeStatusByAdmin(EditNeighborCircleAdminVO editNeighborCircleAdminVO);

    /**
     *后台删除未审核的邻里圈（待审核状态不可删除，显示、隐藏、已驳回的都可以删除）
     * @return
     */
    R deleteByAdmin(Long id);

    /**
     * 查看详情
     * @param id
     * @return
     */
    R detailNeighborByAdmin(Long id);

    /**
     * 用户查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -1,7 +1,9 @@
package com.panzhihua.service_community.service.impl;

import java.util.Date;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
@@ -20,6 +22,8 @@
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleFabulousDO;
import com.panzhihua.service_community.service.ComActNeighborCircleBrowseService;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActNeighborCircleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -27,6 +31,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;

import java.util.List;

/**
@@ -40,7 +45,18 @@

    @Resource
    private ComActNeighborCircleBrowseService comActNeighborCircleBrowseService;

    @Resource
    ComActNeighborCircleFabulousDAO neighborCircleFabulousDAO;

    @Resource
    ComActNeighborCircleBrowseDAO neighborCircleBrowseDAO;

    @Resource
    ComActNeighborCircleCommentDAO neighborCircleCommentDAO;

    @Resource
    ComActNeighborCircleCommentReplyDAO neighborCircleCommentReplyDAO;
    private ComActNeighborCircleCommentDAO comActNeighborCircleCommentDAO;
    @Resource
    private ComActNeighborCircleCommentReplyDAO comActNeighborCircleCommentReplyDAO;
@@ -354,4 +370,38 @@

        return R.ok();
    }

    @Override
    public R deleteByAdmin(Long id) {
        ComActNeighborCircleDO comActNeighborCircleDO = this.baseMapper.selectById(id);
        if (comActNeighborCircleDO == null) {
            return R.fail();
        }
        if (comActNeighborCircleDO.getStatus() == 1) {
            return R.fail("待审核的邻里圈不能删除");
        }
        //邻里圈删除
        this.baseMapper.deleteById(id);
        //邻里圈评论删除
        neighborCircleCommentDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleCommentDO>()
                .eq(ComActNeighborCircleCommentDO::getCircleId, id));
        //邻里圈回复删除
        neighborCircleCommentReplyDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleCommentReplyDO>()
                .eq(ComActNeighborCircleCommentReplyDO::getCircleId, id));
        //邻里圈浏览器记录
        neighborCircleBrowseDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleBrowseDO>()
                .eq(ComActNeighborCircleBrowseDO::getNeighborId,id));
        //邻里圈点赞删除
        neighborCircleBrowseDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleBrowseDO>()
                .eq(ComActNeighborCircleBrowseDO::getNeighborId,id));
/*        neighborCircleFabulousDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleFabulousDO>()
                .eq(ComActNeighborCircleFabulousDO::get))*/
            return R.ok();

    }

    @Override
    public R detailNeighborByAdmin(Long id) {
        return null;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java

@@ -44,7 +44,7 @@
            "left join com_act c on u.community_id=c.community_id\n" +
            "<where>" +
            "<if test='pageFeedBackDTO.phone != null and pageFeedBackDTO.phone.trim() != &quot;&quot;'>" +
            "and u.phone=#{pageFeedBackDTO.phone}\n" +
            "and u.phone like concat('%',#{pageFeedBackDTO.phone},'%') \n" +
            " </if> " +
            "<if test='pageFeedBackDTO.name != null and pageFeedBackDTO.name.trim() != &quot;&quot;'>" +
            "and u.name like concat('%',#{pageFeedBackDTO.name},'%')   \n" +