Merge remote-tracking branch 'remotes/origin/developerA' into developerB

base-module/src/main/java/com/caimei/module/base/entity/bo/ActivityData.java

@@ -0,0 +1,30 @@
+package com.caimei.module.base.entity.bo;
+
+import com.caimei.module.base.entity.vo.ProductVo;
+import lombok.Data;
+
+import java.util.Set;
+
+/**
+ * 活动数据
+ *
+ * @author : Charles
+ * @date : 2021/2/26
+ */
+@Data
+public class ActivityData {
+    /**
+     * 供应商名称
+     */
+    private String shopName;
+
+    /**
+     * 供应商Id
+     */
+    private Integer shopId;
+
+    /**
+     * 活动商品
+     */
+    private Set<ProductVo> productSet;
+}

base-module/src/main/java/com/caimei/module/base/entity/bo/PageFloor.java

@@ -2,11 +2,13 @@ package com.caimei.module.base.entity.bo;
 
 import com.caimei.module.base.entity.vo.FloorContentVo;
 import com.caimei.module.base.entity.vo.FloorImageVo;
+import com.caimei.module.base.entity.vo.ProductVo;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * 页面楼层

base-module/src/main/java/com/caimei/module/base/entity/vo/ProductVo.java

@@ -156,4 +156,20 @@ public class ProductVo extends Product {
      * 是否启用详聊，1不开启，2开启(开启详聊不展示交易价)
      */
     private String detailTalkFlag;
+
+    /**
+     * 供应商名称
+     */
+    private String shopName;
+
+    /**
+     * 供应商id
+     */
+    private Integer shopID;
+
+    /**
+     * 是否参与美博会,1是，0否
+     */
+    private String beautyActFlag;
+
 }

product/src/main/resources/com-caimei-module-product/ProductModuleMapper.xml

@@ -14,7 +14,7 @@
         productID, brandID,bigTypeID,smallTypeID, tinyTypeID,productCategory, preferredFlag, selfTypeID, shopID, `name`, aliasName, searchKey, productRemarks,
         normalPrice, price, highestUserLevelPrice, lowestUserLevelPrice, lowestUserLevelID,
         price0, price0Grade, price0Text, price0TextFlag, price1, price1Grade, price1Text,
-        price1TextFlag, price8, price8Grade, price8Text, price8TextFlag, ladderPriceFlag,
+        price1TextFlag, price8, price8Grade, price8Text, price8Text as beautyActFlag, price8TextFlag, ladderPriceFlag,
         price2, price3, price4, price5, price6, price7, fee, stock, hasSkuFlag, mainImage,
         propertiesInfo, addTime, updateTime, sellNumber, weekSellNumber, beforeValidFlag,
         validFlag, favoriteTimes, commentScore, commentTimes, selfRecommendFlag, sysRecommendFlag,