From 410b3e000dd21e17f76cc2d1fdc32863a931c5e6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 14:51:26 +0800
Subject: [PATCH] 属性对比
---
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 9 ++++++++-
server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java | 9 ++++++---
platform/.env.development | 4 ++--
platform/src/views/business/goods.vue | 3 ++-
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/platform/.env.development b/platform/.env.development
index c53b589..acb28c2 100644
--- a/platform/.env.development
+++ b/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'
diff --git a/platform/src/views/business/goods.vue b/platform/src/views/business/goods.vue
index 98ebff2..fffe446 100644
--- a/platform/src/views/business/goods.vue
+++ b/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}">
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
index adbe230..ab188eb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
+++ b/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;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
index 7c30b43..0c53211 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
+++ b/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;
}
--
Gitblit v1.9.3