维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/product/ProductInfo.java

@@ -1,17 +1,15 @@
 package com.fjhx.entity.product;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 
@@ -31,6 +29,11 @@ public class ProductInfo extends BaseEntity {
     private String code;
 
     /**
+     * spuId
+     */
+    private Long productSpuId;
+
+    /**
      * 部门id
      */
     private Long deptId;

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/product/ProductSpuVo.java

@@ -5,8 +5,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 
- *
  * @author ${author}
  * @since 2022-11-25
  */
@@ -14,4 +12,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class ProductSpuVo extends ProductSpu {
 
+    private Long productIdList;
+
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductInfoMapper.xml

@@ -21,6 +21,7 @@
                grow_up_expected_sales,
                mature_expected_sales,
                clearance_period,
+               product_spu_id,
                CASE
                    WHEN datediff(now(), computing_time) < new_products_day THEN 1
                    WHEN datediff(now(), computing_time) < (new_products_day + grow_up_day) THEN 2

hx-service/victoriatourist/src/main/java/com/fjhx/service/product/impl/ProductInfoServiceImpl.java

@@ -67,6 +67,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
                 .ge(ProductInfo::getJdPurchasePrice, condition.get("jdPurchasePriceMin"))
                 .le(ProductInfo::getJdPurchasePrice, condition.get("jdPurchasePriceMax"))
                 .eq(ProductInfo::getCombination)
+                .eq(ProductInfo::getProductSpuId)
                 .periodTime(ProductInfo::getClearancePeriod)
                 .func(ObjectUtil.isNotEmpty(condition.get("lifeCycle")), q -> {
                     Integer lifeCycle = Convert.toInt(condition.get("lifeCycle"));