Merge remote-tracking branch 'origin/dev' into dev

blade-service/store-goods/src/main/java/com/store/goods/controller/GoodsDescController.java

@@ -39,6 +39,7 @@ import com.store.goods.vo.GoodsDescVO;
 import com.store.goods.service.IGoodsDescService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -71,6 +72,20 @@ public class GoodsDescController extends BladeController {
 			.eq(GoodsItems::getPid,detail.getId())
 			.eq(GoodsItems::getTenantId, AuthUtil.getTenantId());
 		List<GoodsItems> itemsList = goodsItemsService.list(itemsLambdaQueryWrapper);
+	    if(CollectionUtils.isNotEmpty(itemsList))
+	    {
+			//最低价
+			BigDecimal lowPrice = itemsList.stream()
+				.filter(o -> o.getPrice().compareTo(BigDecimal.ZERO) == 1)
+				.map(GoodsItems::getPrice).distinct().min(BigDecimal::compareTo).get();
+			detail.setLowPrice(lowPrice);
+			//最高价
+			BigDecimal highPrice = itemsList.stream()
+				.filter(o -> o.getPrice().compareTo(BigDecimal.ZERO) == 1)
+				.map(GoodsItems::getPrice).distinct().max(BigDecimal::compareTo).get();
+			detail.setHighPrice(highPrice);
+		}
+
 		detail.setItemsList(itemsList);
 		return R.data(detail);
 	}
@@ -88,6 +103,35 @@ public class GoodsDescController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入goodsDesc")
 	public R<IPage<GoodsDesc>> list(GoodsDesc goodsDesc, Query query) {
 		IPage<GoodsDesc> pages = goodsDescService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsDesc));
+		List<GoodsDesc> records = pages.getRecords();
+		if(CollectionUtils.isNotEmpty(records))
+		{
+			records.forEach(e->{
+				LambdaQueryWrapper<GoodsItems> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
+				itemsLambdaQueryWrapper
+					.eq(GoodsItems::getIsDeleted,0)
+					.eq(GoodsItems::getPid,e.getId())
+					.eq(GoodsItems::getTenantId, AuthUtil.getTenantId());
+				List<GoodsItems> itemsList = goodsItemsService.list(itemsLambdaQueryWrapper);
+				if(CollectionUtils.isNotEmpty(itemsList))
+				{
+					//最低价
+					BigDecimal lowPrice = itemsList.stream()
+						.filter(o -> o.getPrice().compareTo(BigDecimal.ZERO) == 1)
+						.map(GoodsItems::getPrice).distinct().min(BigDecimal::compareTo).get();
+					e.setLowPrice(lowPrice);
+					//最高价
+					BigDecimal highPrice = itemsList.stream()
+						.filter(o -> o.getPrice().compareTo(BigDecimal.ZERO) == 1)
+						.map(GoodsItems::getPrice).distinct().max(BigDecimal::compareTo).get();
+					e.setHighPrice(highPrice);
+				}
+
+			});
+
+		}
+
+
 		return R.data(pages);
 	}
 

blade-service/store-goods/src/main/java/com/store/goods/entity/GoodsDesc.java

@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
@@ -117,4 +118,12 @@ public class GoodsDesc implements Serializable {
 	    @ApiModelProperty(value = "图片")
 		private String picture;
 
+		@ApiModelProperty(value = "最低价")
+		@TableField(exist = false)
+	    private BigDecimal lowPrice;
+
+		@ApiModelProperty(value = "最高价")
+		@TableField(exist = false)
+		private BigDecimal highPrice;
+
 }

blade-service/store-goods/src/main/java/com/store/goods/entity/GoodsItems.java

@@ -167,9 +167,9 @@ public class GoodsItems implements Serializable {
 	*/
 		@ApiModelProperty(value = "修改时间")
 		private Date updateTime;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
+		/**
+		* 是否已删除（0 否 1是）
+		*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		@TableLogic
 		private Integer isDeleted;
@@ -177,5 +177,19 @@ public class GoodsItems implements Serializable {
 		@ApiModelProperty(value = "租户id")
 		private String tenantId;
 
+		@ApiModelProperty(value = "品牌")
+		private String brand;
+
+		@ApiModelProperty(value = "花纹")
+		private String brandItem;
+
+		@ApiModelProperty(value = "规格型号")
+		private String typeNo;
+
+		@ApiModelProperty(value = "商品编码")
+		private String goodsCode;
+
+		@ApiModelProperty(value = "商品名称")
+		private String goodsName;
 
 }