解决冲突

jiangping

2023-09-14 cf9b836069e0a76571c6611642b2d7abb0586a2b

解决冲突

 server/company/src/main/java/com/doumee/api/business/GoodsController.java

@@ -49,7 +49,7 @@
    @PreventRepeat
    @ApiOperation("企业新建商品")
    @PostMapping("/companyCreate")
    @RequiresPermissions("business:goods:create")
//    @RequiresPermissions("business:goods:create")
    public ApiResponse companyCreate(@RequestBody Goods goods) {
        return ApiResponse.success(goodsService.companyCreate(goods));
    }

 server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java

@@ -50,13 +50,8 @@
    @ApiOperation("查询列表树")
    @PostMapping("/treeList/{type}")
    @RequiresPermissions("system:menu:query")
<<<<<<< HEAD
    public ApiResponse<List<SystemMenuListVO>> findTree ( @RequestBody SystemMenu systemMenu ) {
        return ApiResponse.success(systemMenuBiz.findTree());
=======
    public ApiResponse<List<SystemMenuListVO>> findTree (@PathVariable Integer type) {
        return ApiResponse.success(systemMenuBiz.findTreeByType(type));
>>>>>>> a7e6a3b52c64ba9add0ceb643d6915473a7770a4
    }

    @PreventRepeat

 server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java

@@ -130,7 +130,7 @@
    @Override
    public  Integer createPlat(GoodCreatePlatRequest param){
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Constants.equalsInteger(user.getType(), Constants.UserType.COMPANY.getKey())){
        if(!Constants.equalsInteger(user.getType(), Constants.UserType.COMPANY.getKey())){
            //非企业用户不能操作
            throw new BusinessException(ResponseStatus.NOT_ALLOWED);
        }
@@ -143,7 +143,7 @@
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Category category = categoryMapper.selectById(param.getCategoryId());
        if(category ==null ||Constants.equalsInteger(category.getIsdeleted(), Constants.ONE) ||Constants.equalsInteger(category.getCompanyId(), user.getCompanyId())){
        if(category ==null ||Constants.equalsInteger(category.getIsdeleted(), Constants.ONE) ||!Constants.equalsInteger(category.getCompanyId(), user.getCompanyId())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，类别信息不正确，请刷新重试！");
        }
        if(category.getPlatCateId() == null){
@@ -160,11 +160,14 @@
                if(p.getGoodsId() == null || p.getPrice() == null){
                    throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请正确选择平台商品并配置入手价！");
                }
                if(ids == null){
                    ids = new ArrayList<>();
                }
                ids.add(p.getGoodsId());
            }
        }
        goodsList = baseGoodsMapper.selectList(new QueryWrapper<>(bp).lambda().in((ids!=null && ids.size()>0),BaseGoods::getId,ids));
        if(Constants.equalsInteger(Constants.ONE, param.getType()) || goodsList==null || ids.size()!=goodsList.size()){
        if(Constants.equalsInteger(Constants.ONE, param.getType()) &&( goodsList==null || ids.size()!=goodsList.size())){
            //  如果选择平台商品和查询结果对不上，提示错误
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请正确选择平台商品！");
        }
@@ -219,6 +222,7 @@
        goods.setStatus(Constants.ZERO);
        goods.setCreateDate(new Date());
        goods.setCreator(user.getId());
        goods.setCompanyId(user.getCompanyId());
        goods.setIsdeleted(Constants.ZERO);
        //处理拼音问题
        goods.setPinyin(PinYinUtil.getFullSpell(goods.getName()));

 server/service/src/main/resources/banner.txt

@@ -2,17 +2,17 @@
${AnsiColor.BLUE}
================================================================================

                             欢迎使用伊娃框架（单应用版）
                             欢迎使用豆米框架（单应用版）
                                 Version :: 1.0

                         ████████ ██      ██     ██
                        ░██░░░░░ ░██     ░██    ████
                        ░██      ░██     ░██   ██░░██
                        ░███████ ░░██    ██   ██  ░░██
                        ░██░░░░   ░░██  ██   ██████████
                        ░██        ░░████   ░██░░░░░░██
                        ░████████   ░░██    ░██     ░██
                        ░░░░░░░░     ░░     ░░      ░░
                         ████████         ██       ██
                        ░██░░░░░ ██     ░██░██   ░██░██
                        ░██     ░░██   ░██ ░░██ ░██ ░░██
                        ░██      ░██  ░██   ░░██░██  ░░██
                        ░██      ░██ ░██     ░░██     ░░██
                        ░██      ██  ░██      ░██      ░██
                        ░████████░   ░██      ░██      ░██
                        ░░░░░░░░     ░░       ░░       ░░

      启动端口: ${server.port}  启动环境: ${project.env}  日志等级: ${logback.level}  启用Swagger: ${swagger.enabled}