产品查询修改

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -44,6 +44,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.mocha.feign.ISalesPolicyClient;
 import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.feign.IOrderItemsClient;
@@ -496,17 +497,36 @@ public class GoodsDescController extends BladeController {
 
 	/**
 	 * 根据类别id获得属于该类别的所有商品数据
+	 * @param current
+	 * @param size
+	 * @param goodsTypeId 	类型id
+	 * @param cname   		商品名称
+	 * @param typeno		规格编码
+	 * @param brandItem		花纹
+	 * @param brand			品牌
 	 * @return list
 	 */
 	@GetMapping("/getGoodsList")
-	public R<?> getGoodsList(GoodsDesc goodsDesc) {
-		LambdaQueryWrapper<GoodsDesc> LambdaQueryWrapper = new LambdaQueryWrapper<>();
-		LambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId());
-		LambdaQueryWrapper.eq(GoodsDesc::getIsDeleted, 0);
-		LambdaQueryWrapper.eq(GoodsDesc::getGoodsTypeId, goodsDesc.getGoodsTypeId());
-		List<GoodsDesc> List = goodsDescService.list(LambdaQueryWrapper);
-
-		List.forEach(good -> {
+	public R<?> getGoodsList(@RequestParam(name = "current", defaultValue = "1") Integer current,
+							 @RequestParam(name = "size", defaultValue = "10") Integer size,
+							 @RequestParam(name = "goodsTypeId", required = false) String goodsTypeId,
+							 @RequestParam(name = "cname", required = false) String cname,
+							 @RequestParam(name = "typeno", required = false) String typeno,
+							 @RequestParam(name = "brandItem", required = false) String brandItem,
+							 @RequestParam(name = "brand", required = false) String brand
+	) {
+		LambdaQueryWrapper<GoodsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId());
+		lambdaQueryWrapper.eq(GoodsDesc::getIsDeleted, 0);
+		lambdaQueryWrapper.eq(GoodsDesc::getGoodsTypeId, goodsTypeId);
+		lambdaQueryWrapper.like(StringUtil.isNotBlank(cname), GoodsDesc::getCname, cname);
+		lambdaQueryWrapper.like(StringUtil.isNotBlank(typeno), GoodsDesc::getTypeno, typeno);
+		lambdaQueryWrapper.like(StringUtil.isNotBlank(brandItem), GoodsDesc::getBrandItem, brandItem);
+		lambdaQueryWrapper.like(StringUtil.isNotBlank(brand), GoodsDesc::getBrand, brand);
+		Page<GoodsDesc> page = new Page<>(current, size);
+		IPage<GoodsDesc> iPage = goodsDescService.page(page, lambdaQueryWrapper);
+
+		iPage.getRecords().forEach(good -> {
 			List<GoodsFiles> filesList = goodsFilesMapper.selectList(new LambdaQueryWrapper<GoodsFiles>()
 				.eq(GoodsFiles::getPid, good.getId())
 				.eq(GoodsFiles::getIsDeleted, 0)
@@ -514,6 +534,6 @@ public class GoodsDescController extends BladeController {
 			good.setFilesList(filesList);
 		});
 
-		return R.data(List);
+		return R.data(iPage);
 	}
 }