#联调修改

jiaosong

2023-09-15 5fa9999fd5b8b53fa4eb8f534c7335c68e04059d

#联调修改

 server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -45,6 +46,9 @@
    @ApiModelProperty(value = "名称拼音首字母")
    private String shortPinyin;

    @ApiModelProperty(value = "加价系数",example = "0")
    private BigDecimal priceRate;

    @ApiModelProperty(value = "参数属性配置")
    List<BaseCategoryRequestParam> baseCategoryRequestParamList;


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

@@ -74,6 +74,7 @@
        baseCategory2.setImgurl(baseCategory.getImgurl());
        baseCategory2.setPinyin(baseCategory.getPinyin());
        baseCategory2.setShortPinyin(baseCategory.getShortPinyin());
        baseCategory2.setPriceRate(baseCategory.getPriceRate());
        baseCategoryMapper.insert(baseCategory2);

        if (!CollectionUtils.isEmpty(baseCategory.getBaseCategoryRequestParamList())){
@@ -144,6 +145,7 @@
                .eq(BaseCategory::getId,baseCategory.getId())
                .set(BaseCategory::getName,baseCategory.getName())
                .set(BaseCategory::getImgurl,baseCategory.getImgurl())
                .set(BaseCategory::getPriceRate,baseCategory.getPriceRate())
                .set(BaseCategory::getSortnum,baseCategory.getSortnum());
        baseCategoryMapper.update(null,updateWrapper);


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

@@ -342,6 +342,7 @@
        }
        queryWrapper.leftJoin(Brand.class,Brand::getId,BaseGoods::getBrandId)
                    .leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getBaseDataId)
                    .selectAll(BaseGoods.class)
                    .selectAs(Brand::getName,BaseGoods::getBrandName)
                    .selectAs(BaseCategory::getSortnum,BaseGoods::getCategoryName);
        queryWrapper.orderByDesc(Goods::getId);

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

@@ -88,14 +88,17 @@
    @Override
    public void updateById(Brand brand) {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(brandMapper.selectCount(new QueryWrapper<Brand>()

        Brand brand1 = brandMapper.selectOne(new QueryWrapper<Brand>()
                .eq("ISDELETED",Constants.ZERO)
                .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()),"name",brand.getName())
                .and(user.getType().equals(Constants.UserType.COMPANY.getKey()),
                        i->i.apply(" name = '"+brand.getName()+"' and type = 1 ")
                                .or().apply( "  name = '"+brand.getName()+"' and COMPANY_ID = '"+user.getCompanyId()+"' and type = 0 ")
                )
        )>0){
                ).last("limit 1")
        );

        if(Objects.nonNull(brand1) && (!brand.getId().equals(brand.getId()))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"【"+brand.getName()+"】已存在");
        };
        brand.setStatus(Constants.ZERO);
@@ -117,8 +120,8 @@

    @Override
    public Brand findById(Integer id) {
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
                + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.BRAND_IMG).getCode();
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
        Brand brand = brandMapper.selectById(id);
        brand.setImgfullurl(prefixUrl+brand.getImgurl());
        return brand;
@@ -145,8 +148,8 @@
                    .or().eq(Brand::getType,Constants.ZERO);
        }
        List<Brand> list = brandMapper.selectList(wrapper);
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
                + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.BRAND_IMG).getCode();
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
        for (Brand b:list) {
            b.setImgfullurl(prefixUrl+b.getImgurl());
        }
@@ -175,7 +178,7 @@
        }
        queryWrapper.lambda().orderByAsc(Brand::getSortnum);
        IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
        brandIPage.getRecords().forEach(i->{
            i.setImgfullurl(prefixUrl+i.getImgurl());