diff --git a/bweb/src/main/java/com/bweb/controller/goods/GoodsController.java b/bweb/src/main/java/com/bweb/controller/goods/GoodsController.java
index 98ff890..c82b54f 100644
--- a/bweb/src/main/java/com/bweb/controller/goods/GoodsController.java
+++ b/bweb/src/main/java/com/bweb/controller/goods/GoodsController.java
@@ -530,6 +530,7 @@ public class GoodsController {
@ApiOperation(value = "查询京东商品")
public ResponseData getJdGoodsList(@RequestParam(value = "title" , required = false) String title,
@RequestParam(value = "goodsType" , required = false) Long goodsType,
+ @RequestParam(value = "id" , required = false) Long id,
@RequestParam(value = "goodsBrand" , required = false) Integer goodsBrand,
@RequestParam(value = "salePriceS" , required = false) BigDecimal salePriceS,
@RequestParam(value = "salePriceE" , required = false) BigDecimal salePriceE,
@@ -547,6 +548,7 @@ public class GoodsController {
}
}
param.put("title", title);
+ param.put("id", id);
param.put("goodsBrand", goodsBrand);
param.put("salePriceS", salePriceS);
param.put("salePriceE", salePriceE);
@@ -565,6 +567,7 @@ public class GoodsController {
@ApiOperation(value = "导出京东商品")
public ResponseData exportJdGoods(@RequestParam(value = "title" , required = false) String title,
@RequestParam(value = "goodsType" , required = false) Long goodsType,
+ @RequestParam(value = "id" , required = false) Long id,
@RequestParam(value = "goodsBrand" , required = false) Integer goodsBrand,
@RequestParam(value = "salePriceS" , required = false) BigDecimal salePriceS,
@RequestParam(value = "salePriceE" , required = false) BigDecimal salePriceE, HttpServletRequest request) {
@@ -587,6 +590,7 @@ public class GoodsController {
}
map.put("title", title);
map.put("goodsBrand", goodsBrand);
+ map.put("id", id);
map.put("salePriceS", salePriceS);
map.put("salePriceE", salePriceE);
diff --git a/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java b/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java
index 249317c..4434b15 100644
--- a/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java
+++ b/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java
@@ -83,6 +83,7 @@ public class BsOrderGoodsController {
public ResponseData getListGoods(@RequestParam(value = "logisticsNo" , required = false) String logisticsNo,
@RequestParam(value = "goodsType" , required = false) Long goodsType,
@RequestParam(value = "goodsBrand" , required = false) Long goodsBrand,
+ @RequestParam(value = "goodsSpecsId" , required = false) Long goodsSpecsId,
@RequestParam(value = "orderNo" , required = false) String orderNo,
@RequestParam(value = "childOrderNo" , required = false) String childOrderNo,
@RequestParam(value = "userPhone" , required = false) String userPhone,
@@ -117,6 +118,7 @@ public class BsOrderGoodsController {
map.put("logisticsNo", logisticsNo);
map.put("goodsType", goodsType);
map.put("goodsBrand", goodsBrand);
+ map.put("goodsSpecsId", goodsSpecsId);
map.put("orderNo", orderNo);
map.put("childOrderNo", childOrderNo);
map.put("userPhone", userPhone);
diff --git a/service/src/main/java/com/hfkj/dao/GoodsMsgMapperExt.java b/service/src/main/java/com/hfkj/dao/GoodsMsgMapperExt.java
index f9732f0..335ed85 100644
--- a/service/src/main/java/com/hfkj/dao/GoodsMsgMapperExt.java
+++ b/service/src/main/java/com/hfkj/dao/GoodsMsgMapperExt.java
@@ -24,6 +24,8 @@ public interface GoodsMsgMapperExt {
" a.goods_type_name as goodsTypeName," +
" a.goods_brand_name as goodsBrandName," +
" a.title as title," +
+ " b.id as id," +
+ " b.ext_3 as costPrice," +
" a.list_img as listImg," +
" b.sale_price as salePrice, " +
" b.third_price as thirdPrice," +
@@ -34,6 +36,7 @@ public interface GoodsMsgMapperExt {
" and a.goods_type_parent = #{param.goodsTypeParent} " +
" and a.title like concat('%',#{param.title},'%') " +
" and a.goods_type = #{param.goodsType} " +
+ " and b.id = #{param.id} " +
" and a.goods_brand = #{param.goodsBrand} " +
" = #{param.salePriceS} ]]>" +
" " +
diff --git a/service/src/main/java/com/hfkj/model/goods/JdGoodsModel.java b/service/src/main/java/com/hfkj/model/goods/JdGoodsModel.java
index b90f7cf..4b8f6ae 100644
--- a/service/src/main/java/com/hfkj/model/goods/JdGoodsModel.java
+++ b/service/src/main/java/com/hfkj/model/goods/JdGoodsModel.java
@@ -43,13 +43,17 @@ public class JdGoodsModel {
@ExcelProperty("售卖价格")
public BigDecimal salePrice;
+ @ColumnWidth(20)
+ @ExcelProperty("京东价")
+ public BigDecimal thirdPrice;
+
@ColumnWidth(15)
@ExcelProperty("售卖价格")
public BigDecimal price;
@ColumnWidth(20)
- @ExcelProperty("京东价")
- public BigDecimal thirdPrice;
+ @ExcelProperty("成本价")
+ public BigDecimal costPrice;
@ColumnWidth(20)
@ExcelProperty({"原价"})
diff --git a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java
index 431a454..4d77d6a 100644
--- a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java
+++ b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java
@@ -153,6 +153,10 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
if (MapUtils.getLong(map, "goodsType") != null) {
criteria.andGoodsTypeIdEqualTo(MapUtils.getLong(map, "goodsType"));
}
+ if (MapUtils.getLong(map, "goodsSpecsId") != null) {
+ criteria.andGoodsSpecsIdEqualTo(MapUtils.getLong(map, "goodsSpecsId"));
+ }
+
if (MapUtils.getLong(map, "goodsBrand") != null) {
criteria.andGoodsBrandIdEqualTo(MapUtils.getLong(map, "goodsBrand"));
}