Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-16 0f05b70118465756237eedac2e393b4f80cf3103

Merge remote-tracking branch 'origin/master'

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

New file
@@ -0,0 +1,111 @@
package com.panzhihua.applets_backstage.api;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireListVo;
import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;

/**
 * @auther llming
 * @describe 商城管理
 */
@Slf4j
@Api(tags = {"商城管理模块"})
@RestController("/shop")
public class ShopApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;

    @ApiOperation(value = "分页查询商铺", response = ComShopStoreVO.class)
    @PostMapping("/page")
    public R pageVolunteer(@RequestBody PageComShopStoreDTO pageComShopStoreDTO) {
        return communityService.pageStoreList(pageComShopStoreDTO);
    }

    @ApiOperation(value = "保存商铺")
    @PostMapping("/save")
    public R saveStore(@Valid @RequestBody ShopStoreVO storeVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long loginUserId = loginUserInfo.getUserId();
        if (storeVO == null) {
            return R.fail();
        }
        R<SysUserVO> sysUserVO = userService.getSysUserVOByPhone(storeVO.getPhone());
        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(sysUserVO.getData()));
        SysUserVO entityVo = jsonObject.toJavaObject(SysUserVO.class);
        storeVO.setSysUserId(entityVo.getUserId());
        storeVO.setLoginUserId(loginUserId);
        R r1 = communityService.saveStore(storeVO);
        //保存sys_user
        if (R.isOk(r1)) {
            AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
            administratorsUserVO.setAccount(storeVO.getStoreAccount());
            administratorsUserVO.setPassword(storeVO.getStorePassword());
            administratorsUserVO.setType(5);
            administratorsUserVO.setAreaId(null);
            administratorsUserVO.setStatus(1);
            administratorsUserVO.setPhone(storeVO.getPhone());
            administratorsUserVO.setRoleId(888888888l);
            administratorsUserVO.setShopStoreName(storeVO.getName());
            administratorsUserVO.setShopStorePhone(storeVO.getPhone());
            R r = userService.addUserBackstage(administratorsUserVO);
        }
        return R.ok();
    }

    @ApiOperation(value = "编辑店铺、启用、禁用")
    @PostMapping("/edit/{id}")
    @ApiImplicitParam(name = "id", value = "商铺id")
    public R editStore(@Valid @RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) {
        R<LoginUserInfoVO> sysUserVO = userService.getUserInfoByUserId(storeVO.getSysUserId() + "");
        if (sysUserVO.getData() == null) {
            return R.fail("没有相关的用户！");
        }
        LoginUserInfoVO user = JSON.parseObject(JSON.toJSONString(sysUserVO.getData())).toJavaObject(LoginUserInfoVO.class);
        storeVO.setSysUserId(user.getUserId());

        R<ShopStoreVO> storeInfoVO = communityService.getStoreInfo(id);
        if( storeInfoVO.getCode()==500){
            return R.fail(storeInfoVO.getMsg());
        }
        ShopStoreVO shopStoreVO = JSON.parseObject(JSON.toJSONString(storeInfoVO.getData())).toJavaObject(ShopStoreVO.class);
        ChangePasswordVO changePasswordVO = new ChangePasswordVO();
        changePasswordVO.setOldPassword(shopStoreVO.getStorePassword());
        changePasswordVO.setUserId(user.getUserId());
        changePasswordVO.setNewPassword(storeVO.getStorePassword());
        R r = userService.changePassword(changePasswordVO);
        if (R.isOk(r)) {
            return communityService.editStore(storeVO, id);
        }
        return R.fail();
    }

    @ApiOperation(value = "删除商铺")
    @PostMapping("/delete")
    public R delete(@RequestBody Long[] ids) {
        return communityService.deleteStore(ids);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java

New file
@@ -0,0 +1,19 @@
package com.panzhihua.common.model.dtos.shop;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @auther llming
 * @describe 分页查询商品
 */
@ApiModel("分页查询商品")
@Data
public class PageComShopGoodsDTO {
    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java

@@ -12,7 +12,16 @@
@Data
@ApiModel("分页查询店铺")
public class PageComShopStoreDTO {

    @ApiModelProperty(value = "商家姓名")
    private String contacts;
    @ApiModelProperty(value = "商家账号")
    private String name;
    @ApiModelProperty(value = "店铺名称")
    private String account;
    @ApiModelProperty(value = "配送方式（1.商家配送  2.快递物流）")
    private Integer deliveryType;
    @ApiModelProperty(value = "店铺状态（1.启用  2.禁用）")
    private Integer status;
    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum;


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

New file
@@ -0,0 +1,13 @@
package com.panzhihua.common.model.vos.shop;

import io.swagger.annotations.ApiModel;
import lombok.Data;

/**
 * @auther llming
 * @describe
 */
@Data
@ApiModel("商品")
public class ComShopOrderGoodsVO {
}

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

New file
@@ -0,0 +1,40 @@
package com.panzhihua.common.model.vos.shop;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @auther llming
 * @describe 商品
 */
@Data
@ApiModel("商品")
public class ShopGoodsVO {

    @ApiModelProperty("店铺id")
    private Long storeId;


    @ApiModelProperty("店铺名称")
    private String name;

    @ApiModelProperty("商品现价")
    private BigDecimal price;


    @ApiModelProperty("商品单位")
    private String unit;


    @ApiModelProperty("商品状态(1.出售中  2.已下架  3.回收站)")
    private Integer status;

    @ApiModelProperty("商品主图")
    private String goodsPic;

    @ApiModelProperty("商品描述")
    private String goodsDescribe;
}

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

New file
@@ -0,0 +1,68 @@
package com.panzhihua.common.model.vos.shop;

import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;


/**
 * @auther llming
 * @describe
 */
@Data
@ApiModel("商家")
public class ShopStoreVO {

    @ApiModelProperty("商家姓名")
    private String contacts;

    @ApiModelProperty("店铺名称")
    @NotBlank(message = "店铺名称不能为空")
    @Size(max = 15,min = 1,message = "限制15字")
    private String name;

    @ApiModelProperty("联系方式")
    @NotBlank(message = "手机号码不能为空")
    @NotNull(message = "手机号不能为空")
    @Length(min = 11, max = 11, message = "手机号只能为11位")
    @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误")
    private String phone;


    @ApiModelProperty("店铺登陆账号")
    @NotBlank(message = "店铺登陆账号不能为空")
    private String storeAccount;


    @ApiModelProperty("店铺登陆密码")
    @NotBlank(message = "店铺登陆密码不能为空")
    private String storePassword;


    @ApiModelProperty("配送方式（1.商家配送  2.快递物流）")
    @NotNull(message = "配送方式（1.商家配送  2.快递物流）")
    private Integer deliveryType;


    @ApiModelProperty("店铺logo")
    private String logo;
    /**
     * 保存时添加sys_user所需
     */
    @ApiModelProperty("sysUserId")
    @JsonIgnore
    private Long sysUserId;
    /**
     * 当前登陆用户Id
     */
    @JsonIgnore
    private Long loginUserId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java

@@ -44,7 +44,7 @@
    @Min(groups = {AddGroup.class},value =1,message = "账户状态不能为空")
    private Integer status;

    @ApiModelProperty(value = "人员所在平台 用户类型 1 小程序 2 运营平台 3 社区平台 4 街道平台",hidden = true)
    @ApiModelProperty(value = "人员所在平台 用户类型 1 小程序 2 运营平台 3 社区平台 4 街道平台 5 商家",hidden = true)
    private Integer type;

    @ApiModelProperty(value = "小区id",hidden = true)
@@ -73,4 +73,10 @@
    @ApiModelProperty(value = "角色名字")
    private String roleName;

    @ApiModelProperty(value = "商铺名称")
    private String shopStoreName;

    @ApiModelProperty(value = "商铺Id")
    private String shopStorePhone;

}

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

@@ -4,12 +4,14 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -1754,4 +1756,41 @@
    @PostMapping("/questnaire/usersanswequestnaire")
    R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, @RequestParam("userId") Long userId);

    /**
     * 店铺列表-分页查询
     * @param pageComShopStoreDTO 分页条件
     */
    @PostMapping("/shop/pageShopStore")
    R pageStoreList(@RequestBody PageComShopStoreDTO pageComShopStoreDTO);

    /**
     * 保存店铺
     * @param storeVO 数据
     */
    @PostMapping("/shop/saveStore")
    R saveStore(@RequestBody ShopStoreVO storeVO);


    /**
     * 编辑店铺、启用、禁用
     * @param storeVO 数据
     * @param id 商铺id
     */
    @PostMapping("/shop/editStore/{id}")
    R editStore(@RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id);

    /**
     * 删除店铺
     * @param id 商铺id
     */
    @PostMapping("/shop/deleteStore")
    R deleteStore(@RequestBody Long[] id);

    /**
     * 获取详情
     * @param id 商铺id
     */
    @GetMapping("/shop/getStoreInfo")
    R getStoreInfo(@RequestParam("id")Long id);

}

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

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

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.service_community.service.ComShopStoreService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.validation.constraints.NotNull;

@Slf4j
@RestController
@@ -24,9 +26,55 @@
     * @param pageComShopStoreDTO 查询参数
     * @return ComShopStoreVO
     */
    @PostMapping("pageShopStore")
    @PostMapping("/pageShopStore")
    public R pageShopStore(@RequestBody PageComShopStoreDTO pageComShopStoreDTO){
        return comShopStoreService.pageStoreList(pageComShopStoreDTO);
    }

    /**
     * 保存店铺
     *
     * @param storeVO
     * @return
     */
    @PostMapping("/saveStore")
    public R saveStore(@RequestBody ShopStoreVO storeVO) {
        return comShopStoreService.saveStore(storeVO);
    }

    /**
     * 编辑店铺、启用、禁用
     *
     * @param storeVO
     * @param id 商铺Id
     * @return
     */
    @PostMapping("/editStore/{id}")
    public R editStore(@RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) {
        return comShopStoreService.editStore(id, storeVO);
    }

    /**
     * 删除店铺
     *
     * @param id
     * @return
     */
    @PostMapping("/deleteStore")
    public R deleteStore(@RequestBody Long[] id) {
        return comShopStoreService.deleteStore(id);
    }

    /**
     * 获取详情
     *
     * @param id
     * @return
     */
    @GetMapping("/getStoreInfo")
    public R getOneInfo(@RequestParam("id") Long id) {
        return comShopStoreService.getOneInfo(id);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java

@@ -1,8 +1,13 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

/**
 * @auther lyq
@@ -12,4 +17,7 @@
@Mapper
public interface ComShopGoodsDAO extends BaseMapper<ComShopGoodsDO> {

    @Select("select id,type_id,name,store_id,goods_pic,images,status,sale,original_price,price,unit,order,stock,details,remark,goods_describe,delivery_type,delete_status,create_at,update_at from com_shop_store")
    IPage<ComShopStoreVO> pageShopGoods(Page page, PageComShopGoodsDTO pageComShopGoodsDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopStoreDO.java

@@ -114,10 +114,13 @@
    private Date updateAt;

    /**
     * 负责人
     */
    private String contacts;
    /**
     * 管理后台用户id
     */
    private Long sysUserId;

    @Override
    public String toString() {
        return "ComShopStoreDO{" +

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ShopGoodsVO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;

/**
@@ -10,4 +13,35 @@
 */
public interface ComShopGoodsService extends IService<ComShopGoodsDO> {

    /**
     * 添加商品
     * @param shopGoodsVO
     * @return
     */
    R saveShopGoods(ShopGoodsVO shopGoodsVO);

    /**
     * 商品列表-分页查询
     * @param pageComShopGoodsDTO 查询参数
     * @return ComShopStoreVO
     */
    R pageStoreList(PageComShopGoodsDTO pageComShopGoodsDTO);



    /**
     * 编辑商品、上架、下架
     *
     * @param id 商铺ID
     * @param shopGoodsVO
     * @return
     */
    R editShopGoods(Long id, ShopGoodsVO shopGoodsVO);

    /**
     * 删除商品
     * @param id
     * @return
     */
    R deleteShopGoods(Long[] id);
}

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

@@ -10,4 +10,5 @@
 */
public interface ComShopOrderGoodsService extends IService<ComShopOrderGoodsDO> {


}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComShopOrderOperateDO;

/**

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

@@ -1,8 +1,11 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;

/**
@@ -18,4 +21,35 @@
     * @return ComShopStoreVO
     */
    R pageStoreList(PageComShopStoreDTO pageComShopStoreDTO);

    /**
     * 保存店铺
     * @param storeVO
     * @return
     */
    R saveStore(ShopStoreVO storeVO);


    /**
     * 编辑店铺、启用、禁用
     *
     * @param id 商铺ID
     * @param storeVO
     * @return
     */
    R editStore(Long id, ShopStoreVO storeVO);

    /**
     * 删除店铺
     * @param id
     * @return
     */
    R deleteStore(Long[] id);

    /**
     * 获取详情
     * @param id
     * @return
     */
    R getOneInfo(Long id);
}

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

@@ -1,10 +1,19 @@
package com.panzhihua.service_community.service.impl;

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 com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
import com.panzhihua.common.model.vos.shop.ShopGoodsVO;
import com.panzhihua.service_community.dao.ComShopGoodsDAO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;
import com.panzhihua.service_community.service.ComShopGoodsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

/**
@@ -15,5 +24,43 @@
@Slf4j
@Service
public class ComShopGoodsServiceImpl extends ServiceImpl<ComShopGoodsDAO, ComShopGoodsDO> implements ComShopGoodsService {
    @Override
    public R saveShopGoods(ShopGoodsVO shopGoodsVO) {
        if (shopGoodsVO == null) {
            return R.ok("500", "数据为空！");
        }
        ComShopGoodsDO shopGoodsDO = new ComShopGoodsDO();
        BeanUtils.copyProperties(shopGoodsVO, shopGoodsDO);
        shopGoodsDO.setSale(0);
        this.baseMapper.insert(shopGoodsDO);
        return R.ok();
    }

    @Override
    public R pageStoreList(PageComShopGoodsDTO pageComShopGoodsDTO) {
        Page page = new Page<>(pageComShopGoodsDTO.getPageNum(), pageComShopGoodsDTO.getPageSize());
        IPage<ComShopStoreVO> comShopStoreVOIPage = this.baseMapper.pageShopGoods(page, pageComShopGoodsDTO);
        return R.ok(comShopStoreVOIPage);
    }

    @Override
    public R editShopGoods(Long id, ShopGoodsVO shopGoodsVO) {
        if (shopGoodsVO == null) {
            return R.ok("500", "数据为空！");
        }
        LambdaQueryWrapper<ComShopGoodsDO> query = new LambdaQueryWrapper<ComShopGoodsDO>().eq(ComShopGoodsDO::getId, id);
        ComShopGoodsDO shopGoodsDO = new ComShopGoodsDO();
        BeanUtils.copyProperties(shopGoodsVO,shopGoodsDO);
        int update = this.baseMapper.update(shopGoodsDO, query);
        return update > 0 ? R.ok() : R.fail();
    }

    @Override
    public R deleteShopGoods(Long[] id) {
        ComShopGoodsDO storeDO = new ComShopGoodsDO();
        storeDO.setDeleteStatus(2);
        LambdaQueryWrapper<ComShopGoodsDO> query = new LambdaQueryWrapper<ComShopGoodsDO>().eq(ComShopGoodsDO::getId, id);
        int update = this.baseMapper.update(storeDO, query);
        return update > 0 ? R.ok() : R.fail();
    }
}

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

@@ -1,13 +1,21 @@
package com.panzhihua.service_community.service.impl;

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 com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
import com.panzhihua.common.model.vos.shop.ShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.service_community.dao.ComShopStoreDAO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;
import com.panzhihua.service_community.service.ComShopStoreService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

/**
@@ -18,11 +26,54 @@
@Slf4j
@Service
public class ComShopStoreServiceImpl extends ServiceImpl<ComShopStoreDAO, ComShopStoreDO> implements ComShopStoreService {

    @Override
    public R pageStoreList(PageComShopStoreDTO pageComShopStoreDTO){
        Page page = new Page<>(pageComShopStoreDTO.getPageNum(),pageComShopStoreDTO.getPageSize());
        return R.ok(this.baseMapper.pageShopStore(page,pageComShopStoreDTO));
        IPage<ComShopStoreVO> comShopStoreVOIPage = this.baseMapper.pageShopStore(page, pageComShopStoreDTO);
        return R.ok(comShopStoreVOIPage);
    }

    @Override
    public R saveStore(ShopStoreVO storeVO) {
        if (storeVO == null) {
            return R.ok("500", "数据为空！");
        }
        ComShopStoreDO storeDO = new ComShopStoreDO();
        BeanUtils.copyProperties(storeVO, storeDO);
        storeDO.setSale(0);
        this.baseMapper.insert(storeDO);
        return R.ok();
    }

    @Override
    public R editStore(Long id, ShopStoreVO storeVO) {
        if (storeVO == null) {
            return R.ok("500", "数据为空！");
        }
        LambdaQueryWrapper<ComShopStoreDO> query = new LambdaQueryWrapper<ComShopStoreDO>().eq(ComShopStoreDO::getId, id);
        ComShopStoreDO storeDO = new ComShopStoreDO();
        BeanUtils.copyProperties(storeVO, storeDO);
        int update = this.baseMapper.update(storeDO, query);
        return update > 0 ? R.ok() : R.fail();
    }

    @Override
    public R deleteStore(Long[] id) {
        ComShopStoreDO storeDO = new ComShopStoreDO();
        storeDO.setDeleteStatus(2);
        LambdaQueryWrapper<ComShopStoreDO> query = new LambdaQueryWrapper<ComShopStoreDO>().eq(ComShopStoreDO::getId, id);
        int update = this.baseMapper.update(storeDO, query);
        return update > 0 ? R.ok() : R.fail();
    }

    @Override
    public R getOneInfo(Long id) {
        ComShopStoreDO comShopStoreDO = this.baseMapper.selectById(id);
        if (comShopStoreDO == null) {
            R.fail(500,"商铺不存在");
        }
        ShopStoreVO shopStoreVO = new ShopStoreVO();
        BeanUtils.copyProperties(comShopStoreDO,shopStoreVO);
        return R.ok(shopStoreVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -742,13 +742,19 @@
    public R addUserBackstage(AdministratorsUserVO administratorsUserVO) {
        SysUserDO sysUserDO=new SysUserDO();
        Long roleId = administratorsUserVO.getRoleId();
        if (roleId.intValue() == 999999999 || roleId.intValue() == 888888888) {
        Long communityId = administratorsUserVO.getCommunityId();
        if (roleId.intValue()==999999999) {
            //新增社区高级管理员角色
            SysRoleDO sysRoleDO=new SysRoleDO();
            if(roleId.intValue() == 999999999){
            sysRoleDO.setCommunityId(communityId);
            sysRoleDO.setRoleName("超级管理员");
            sysRoleDO.setRoleKey("chaojiguanliyuan"+communityId);
            }else{
                sysRoleDO.setCommunityId(0L);
                sysRoleDO.setRoleName(administratorsUserVO.getShopStoreName());
                sysRoleDO.setRoleKey("shanghupingtai" + administratorsUserVO.getShopStorePhone());
            }
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            int insert = roleDAO.insert(sysRoleDO);
@@ -1304,6 +1310,7 @@

    /**
     * 获取最近七天数据
     *
     * @return
     */
    private List<Date> getServenDays() {