企业端

Mr.Shi

2023-09-21 c153cd01974defe0d20ecbbb2c1f2fdc522d05f8

企业端

 company_admin/.env.development

@@ -3,11 +3,8 @@

# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'

<<<<<<< HEAD
VUE_APP_API = 'http://192.168.0.35:10022/'
=======
# VUE_APP_API = 'http://192.168.0.15:10024/'
>>>>>>> 3fbfdefe98e5d35e32d74138ce73a1b4e2fe5465

VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'


 h5/manifest.json

 h5/package-lock.json

ÎļþÒÑɾ³ý

 platform/.env.development

@@ -7,9 +7,9 @@
# ä»»åº·
# VUE_APP_API = 'http://192.168.0.15:10017/'
# ç„¦æ¾
VUE_APP_API = 'http://192.168.0.36:10023'
#VUE_APP_API = 'http://192.168.0.36:10023'
# æ±Ÿè
# VUE_APP_API = 'http://192.168.0.35:10023'
VUE_APP_API = 'http://192.168.0.35:10023'

# #测试服务器
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'

 platform/.env.staging

@@ -7,3 +7,4 @@

# https://dmtest.ahapp.net/preselect_admin_interface/doc.html
VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
VUE_APP_API = 'http://127.0.0.1:10023'

 platform/src/utils/request.js

@@ -7,6 +7,7 @@
axios.defaults.headers.common['Content-Type'] = 'application/json;charset=UTF-8'
const axiosInstance = axios.create({
  baseURL: process.env.VUE_APP_API_PREFIX,
  // baseURL: process.env.VUE_APP_API,
  // è¯·æ±‚超时时间
  timeout: 60000
})

 platform/src/views/business/goods.vue

@@ -74,7 +74,8 @@
        <el-table-column prop="brandName" label="品牌" min-width="100px"></el-table-column>
        <el-table-column prop="categoryName" label="类别" min-width="100px"></el-table-column>
        <el-table-column prop="zdPrice" label="指导价（元）" min-width="100px"></el-table-column>
        <el-table-column prop="price" label="采购价(元)" min-width="100px"></el-table-column>
        <el-table-column prop="jdPrice" label="采购价(元)" min-width="100px"></el-table-column>
        <el-table-column prop="price" label="销售价(元)" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
        <el-table-column prop="status" v-if="containPermissions(['business:basegoods:update'])" label="状态" min-width="100px">
          <template slot-scope="{row}">

 server/company/src/main/resources/application.yml

@@ -11,7 +11,7 @@
#  application:
#    name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson:

 server/platform/src/main/resources/application.yml

@@ -11,7 +11,7 @@
#  application:
#  name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson:

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

@@ -90,8 +90,8 @@
    @ExcelColumn(name="指导价（元）")
    private BigDecimal zdPrice;

    @ApiModelProperty(value = "入手价格（元）", example = "1")
    @ExcelColumn(name="入手价格（元）")
    @ApiModelProperty(value = "销售价格（元）", example = "1")
    @ExcelColumn(name="销售价格（元）")
    private BigDecimal price;
    @ApiModelProperty(value = "数据来源 0手动录入 1批量导入 2数据源同步", example = "1")
    @ExcelColumn(name="数据来源 0手动录入 1批量导入 2数据源同步")
@@ -125,5 +125,8 @@
    @TableField(exist = false)
    private List<Integer> idList;


    @ApiModelProperty(value = "采购价（元）", example = "1")
    @ExcelColumn(name="采购价（元）")
    @TableField(exist = false)
    private BigDecimal jdPrice;
}

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

@@ -31,7 +31,7 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
//    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -40,7 +40,7 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
//    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")

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

@@ -327,8 +327,9 @@
        queryWrapper.lambda().orderByAsc(BaseCategory::getSortnum);

        IPage<BaseCategory> baseCategoryIPage = baseCategoryMapper.selectPage(page, queryWrapper);
        String preUrl = getPreUrl();
        if (!CollectionUtils.isEmpty(baseCategoryIPage.getRecords())){
            baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(getPreUrl()+s.getImgurl()));
            baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(preUrl+s.getImgurl()));
        }

        return PageData.from(baseCategoryIPage);

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

@@ -359,8 +359,11 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.leftJoin(Brand.class,Brand::getId,BaseGoods::getBrandId)
                    .leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getCategoryId)
//                    .leftJoin(BaseData.class,BaseData::getId,BaseGoods::getBaseDataId)
                    .selectAll(BaseGoods.class)
                    .selectAs(BaseCategory::getPriceRate,BaseGoods::getCateRatePrice)
                    .selectAs(Brand::getName,BaseGoods::getBrandName)
//                    .selectAs(BaseData::getPrice,BaseGoods::getJdPrice)
                    .selectAs(BaseCategory::getName,BaseGoods::getCategoryName)
                    .eq(BaseGoods::getIsdeleted, Constants.ZERO)
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getName()), BaseGoods::getName,pageWrap.getModel().getName())
@@ -374,7 +377,11 @@
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
        pageData.getRecords().forEach(i->{
             if(StringUtils.isNotBlank(i.getImgurl())){
            i.setFullImgUrl(prefixUrl + i.getImgurl());
             }
             i.setJdPrice(i.getPrice());
             i.setPrice(Constants.formatBigdecimal(i.getPrice()).multiply(Constants.formatBigdecimal(i.getCateRatePrice())));
        });
        return pageData;
    }

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

@@ -293,9 +293,9 @@
        queryWrapper.select(
                "(select su1.USERNAME from system_user su1 where  su1.id = t.MANAGER_ID) as managerUserName," +
                "(select su2.REALNAME from system_user su2 where  su2.id = t.SALESMAN_ID) as salesmanRealName," +
                "(select count(su3.id) from system_user su3 where  su3.COMPANY_ID = t.ID and su3.TYPE = 2) as anchorUserNum," +
                "(select count(su4.id) from system_user su4 where  su4.COMPANY_ID = t.ID and su4.TYPE = 1) as empUserNum," +
                "(select count(g.id) from goods g   where  g.COMPANY_ID = t.ID )goodsNum");
                "(select count(su3.id) from system_user su3 where su3.deleted=0 and su3.COMPANY_ID = t.ID and su3.TYPE = 2) as anchorUserNum," +
                "(select count(su4.id) from system_user su4 where su4.deleted=0 and su4.COMPANY_ID = t.ID and su4.TYPE = 1) as empUserNum," +
                "(select count(g.id) from goods g   where g.isdeleted=0 and  g.COMPANY_ID = t.ID )goodsNum");
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName())
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getManagerUserName()),SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
                    .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,pageWrap.getModel().getStatus())

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

@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@@ -58,10 +59,21 @@
            log.info("开始上传附件信息=================end========无待处理数据===========");
            return 0;
        }
        List<String > keyList = new ArrayList<>();
        for(FileRecord model:allLis){
                keyList.add(model.getKeyval());
        }
        try {
            ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
            obs.deleteObjects(ossModel.getBucket(),keyList);
        }catch (Exception e){
        }

        Date date = new Date();
        for(FileRecord model:allLis){
            try {
                ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
                obs.deleteObjects(ossModel.getBucket(),keyList);
                obs.uploadOnlineObject(model.getUrl(),ossModel.getBucket(), model.getKeyval(),null);
                model.setStatus(Constants.ONE);
                model.setContent("上传成功");
@@ -72,6 +84,7 @@
            model.setEditDate(date);
            fileRecordMapper.updateById(model);
        }

        return  0;
    }


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

@@ -1093,7 +1093,9 @@
                .apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getEPrice()), "  t.PRICE <=  "+pageWrap.getModel().getEPrice()+" ");
        queryWrapper.orderByDesc(Goods::getId);
        IPage<Goods> goodsIPage =  goodsJoinMapper.selectJoinPage(page, Goods.class, queryWrapper);
        if(!Objects.isNull(goodsIPage.getRecords())&&goodsIPage.getRecords().size()>Constants.ZERO){
        this.dealGoodsMsg(goodsIPage.getRecords());
        }
        return PageData.from(goodsIPage);
    }

@@ -1103,8 +1105,9 @@
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
        String prefixUrlCategory = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
        List<Integer> integerList = goodsList.stream().map(Goods::getId).collect(Collectors.toList());

        List<Multifile> mFileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
                .in("OBJ_ID",integerList).eq("TYPE",Constants.ZERO));
        List<GoodsParam> goodsParamList = goodsParamMapper.selectList(new QueryWrapper<GoodsParam>()

 server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java

@@ -135,7 +135,7 @@
        // æ‰§è¡ŒæŸ¥è¯¢
        PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
        List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
        String zhuboRoomUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.ZHUBO_ROOM_URL).getCode();
        String zhuboRoomUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ZHUBO_ROOM_URL).getCode();

        for (SystemUserListVO user : userList) {
            // æŸ¥è¯¢ç”¨æˆ·è§’色列表

 server/service/src/main/resources/mappers/BaseCategoryMapper.xml

@@ -19,10 +19,10 @@
        select * from base_category ${ew.customSqlSegment}
    </select>

    <select id="selectList" resultMap="BaseCategory">
        select * from base_category ${ew.customSqlSegment}
    </select>
    <select id="selectPage" resultMap="BaseCategory">
        select * from base_category ${ew.customSqlSegment}
    </select>
<!--    <select id="selectList" resultMap="BaseCategory">-->
<!--        select * from base_category ${ew.customSqlSegment}-->
<!--    </select>-->
<!--    <select id="selectPage" resultMap="BaseCategory">-->
<!--        select * from base_category ${ew.customSqlSegment}-->
<!--    </select>-->
</mapper>

 server/zhubo/pom.xml

@@ -26,7 +26,7 @@
    </dependencies>

    <build>
        <finalName>company</finalName>
        <finalName>zhubo</finalName>
        <resources>
            <resource>
                <directory>src/main/resources</directory>

 server/zhubo/src/main/resources/application.yml

@@ -11,7 +11,7 @@
#  application:
#    name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson: