首页背景色bugfix

src/main/java/com/caimei365/commodity/controller/ProductPageApi.java

@@ -112,6 +112,15 @@ public class ProductPageApi {
         return pageService.getcapacity(id);
     }
 
+    @ApiOperation("根据id查自由页")
+    @GetMapping("/home/free")
+    public ResponseJson<CmPageVo> getFree(Integer id) {
+        if (id == null || id==0) {
+            return ResponseJson.error("参数异常", null);
+        }
+        return pageService.getFree(id);
+    }
+
 
 
 

src/main/java/com/caimei365/commodity/model/vo/CmPageVo.java

@@ -76,4 +76,12 @@ public class CmPageVo implements Serializable {
      * 背景图
      */
     private String backgroundImage;
+    /**
+     * 背景图方式：1平铺、2填充
+     */
+    private Integer backgroundImageWay;
+    /**
+     * 填充背景类型默认不显示 ：1使用颜色，2使用背景图
+     */
+    private Integer backgroundType;
 }

src/main/java/com/caimei365/commodity/model/vo/PageDetailVo.java

@@ -73,4 +73,8 @@ public class PageDetailVo implements Serializable {
      * 背景图
      */
     private String backgroundImage;
+
+    private Integer backgroundImageWay;
+
+    private Integer backgroundType;
 }

src/main/java/com/caimei365/commodity/service/PageService.java

@@ -224,4 +224,6 @@ public interface PageService {
      * @return
      */
     ResponseJson<PaginationVo<BaikeProductVo>> getBaikeTypeData(Integer typeId, int pageNum, int pageSize);
+
+    ResponseJson<CmPageVo> getFree(Integer id);
 }

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -246,8 +246,8 @@ public class PageServiceImpl implements PageService {
         } else {
             map.put("couponEntry", 2);
         }
-       List<AnnouncementPo>annlist= announcementMapper.gteannhade();
-        map.put("annlist",annlist);
+        List<AnnouncementPo> annlist = announcementMapper.gteannhade();
+        map.put("annlist", annlist);
         return ResponseJson.success(map);
     }
 
@@ -838,7 +838,7 @@ public class PageServiceImpl implements PageService {
     @Override
     public ResponseJson<PaginationVo<AnnouncementPo>> getannlist(int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<AnnouncementPo>list= announcementMapper.getannlist();
+        List<AnnouncementPo> list = announcementMapper.getannlist();
         PaginationVo<AnnouncementPo> pageData = new PaginationVo(list);
         return ResponseJson.success(pageData);
     }
@@ -850,7 +850,7 @@ public class PageServiceImpl implements PageService {
      */
     @Override
     public ResponseJson<AnnouncementPo> getcapacity(Integer id) {
-        AnnouncementPo announcementPo= announcementMapper.getcapacity(id);
+        AnnouncementPo announcementPo = announcementMapper.getcapacity(id);
         return ResponseJson.success(announcementPo);
     }
 
@@ -1297,4 +1297,10 @@ public class PageServiceImpl implements PageService {
         PaginationVo<BaikeProductVo> pageData = new PaginationVo<>(productList);
         return ResponseJson.success(pageData);
     }
+
+    @Override
+    public ResponseJson<CmPageVo> getFree(Integer id) {
+        CmPageVo cmPageById = pageMapper.findCmPageById(id);
+        return ResponseJson.success(cmPageById);
+    }
 }

src/main/resources/mapper/PageMapper.xml

@@ -224,7 +224,7 @@
         order by rpp.createTime desc
     </select>
     <select id="getPageDetails" resultType="com.caimei365.commodity.model.vo.PageDetailVo">
-        select  a.id, a.type, a.title, a.keywords, a.description, a.headImage as image, a.headText as content, a.buttonName, a.buttonLink,a.backgroundColour,a.backgroundImage
+        select  a.id, a.type, a.title, a.keywords, a.description, a.headImage as image, a.headText as content, a.buttonName, a.buttonLink,a.backgroundColour,a.backgroundImage,a.backgroundImageWay,a.backgroundType
         from cm_page a where a.id=#{id} and a.type=#{type} and a.enabledStatus=1
     </select>
     <select id="getEquipmentParametersByType" resultType="com.caimei365.commodity.model.vo.EquipmentParameterVo">
@@ -285,7 +285,9 @@
                redPacketEndTime,
                infoBarStatus,
                backgroundColour,
-               backgroundImage
+               backgroundImage,
+               backgroundImageWay,
+               backgroundType
         from cm_page
         where id = #{pageId}
           and enabledStatus = '1'