| platform/.env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| platform/src/views/business/goods.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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/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/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/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->{ i.setFullImgUrl(prefixUrl + i.getImgurl()); 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; }
