Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/pad/PadDetailDTO.java

@@ -1,6 +1,7 @@
 package com.czg.account.dto.pad;
 
 import com.czg.product.entity.Product;
+import com.czg.product.vo.ProductVO;
 import lombok.Data;
 
 import java.util.List;
@@ -13,5 +14,5 @@ public class PadDetailDTO {
     private Long id;
     private Long padLayoutId;
     private List<Long> productIdList;
-    private List<Product> productList;
+    private List<ProductVO> productList;
 }

cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java

@@ -5,6 +5,7 @@ import com.czg.product.entity.Product;
 import com.czg.product.entity.ProductStockFlow;
 import com.czg.product.param.*;
 import com.czg.product.vo.ProductStatisticsVo;
+import com.czg.product.vo.ProductVO;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 
@@ -127,4 +128,7 @@ public interface ProductService extends IService<Product> {
      * @param records 商品数据集合
      */
     void refreshProductStock(ProductDTO param, List<ProductDTO> records);
+
+    List<ProductVO> listAndLowPrice(Long shopId, List<Long> productIds);
+
 }

cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductVO.java

@@ -0,0 +1,16 @@
+package com.czg.product.vo;
+
+import com.czg.product.entity.Product;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Administrator
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ProductVO extends Product {
+    private BigDecimal lowPrice;
+}