提交公告管理

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

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.jws.WebParam;
 import java.util.List;
 import java.util.Map;
 
@@ -98,13 +99,16 @@ public class ProductPageApi {
     @ApiImplicitParam(required = false, name = "source", value = "来源：1网站，2小程序")
     @GetMapping("/home/title")
     ResponseJson<PaginationVo<AnnouncementPo>> getannlist(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                          @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+                                                          @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return pageService.getannlist(pageNum, pageSize);
     }
+
     @ApiOperation("公告展示内容页面")
     @GetMapping("/home/capacity")
-    public ResponseJson<List<AnnouncementPo>> getcapacity(Integer id) {
-
+    public ResponseJson<AnnouncementPo> getcapacity(Integer id) {
+        if (id == null || id==0) {
+            return ResponseJson.error("参数异常", null);
+        }
         return pageService.getcapacity(id);
     }
 

src/main/java/com/caimei365/commodity/mapper/AnnouncementMapper.java

@@ -1,6 +1,7 @@
 package com.caimei365.commodity.mapper;
 
 
+import com.caimei365.commodity.model.ResponseJson;
 import com.caimei365.commodity.model.po.AnnouncementPo;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -26,6 +27,6 @@ public interface AnnouncementMapper {
      * 根据id查找公告内容
      * @return
      */
-    List<AnnouncementPo> getcapacity(Integer id);
+   AnnouncementPo getcapacity(Integer id);
 
 }

src/main/java/com/caimei365/commodity/model/po/AnnouncementPo.java

@@ -1,6 +1,7 @@
 package com.caimei365.commodity.model.po;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,10 +17,13 @@ public class AnnouncementPo {
     //状态1为上线2为下线
     private String state;
     //创建时间
+    @JsonFormat(pattern = "yyyy年MM月dd日")
     private Date creationtime;
     //上线时间
+    @JsonFormat(pattern = "yyyy年MM月dd日")
     private Date livetime;
     //下线时间
+    @JsonFormat(pattern = "yyyy年MM月dd日")
     private Date  offlinetime;
 
 }

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

@@ -126,6 +126,6 @@ public interface PageService {
      *
      * @param  id 公告列表Id
      */
-    ResponseJson<List<AnnouncementPo>> getcapacity(Integer id);
+    ResponseJson<AnnouncementPo> getcapacity(Integer id);
 
 }

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

@@ -228,11 +228,9 @@ public class PageServiceImpl implements PageService {
      * @param id 公告列表Id
      */
     @Override
-    public ResponseJson<List<AnnouncementPo>> getcapacity(Integer id) {
-
-
+    public ResponseJson<AnnouncementPo> getcapacity(Integer id) {
         //根据id查询内容
-        List<AnnouncementPo> capacity=announcementMapper.getcapacity(id);
+        AnnouncementPo capacity=announcementMapper.getcapacity(id);
         return ResponseJson.success(capacity);
     }
 

src/main/resources/mapper/AnnouncementMapper.xml

@@ -8,7 +8,7 @@
         FROM `announcement_management`
         WHERE state=1
         ORDER BY Creationtime DESC
-        LIMIT 2
+        LIMIT 10
     </select>
 
 <select id="getannlist" resultType="com.caimei365.commodity.model.po.AnnouncementPo">
@@ -19,7 +19,7 @@
 </select>
 
     <select id="getcapacity" resultType="com.caimei365.commodity.model.po.AnnouncementPo">
-        SELECT capacity,Creationtime
+        SELECT title,capacity,Creationtime
         FROM `announcement_management`
         WHERE id = #{id} AND state=1
     </select>

src/main/resources/mapper/PageMapper.xml

@@ -21,7 +21,7 @@
         order by -sort desc, creationTime desc
     </select>
     <select id="getHomePageFloor" resultType="com.caimei365.commodity.model.vo.PageFloorVo">
-        select id, type, floorTitle as title, floorDetail as detail
+        select id, type, floorTitle as title, floorDetail as detail,productType
 		from new_page_floor
 		where delFlag = 0
 		<if test="source == 1">
@@ -47,12 +47,12 @@
     <select id="getFloorContentById" resultType="com.caimei365.commodity.model.vo.FloorContentVo">
         select
          id, floorId, centreId, templateType, pcAdsImage1, pcAdsImage2, pcAdsImage3,
-         appletsAdsImage1, appletsAdsImage2, appletsAdsImage3, adsLink1, adsLink2, adsLink3
+         appletsAdsImage1, appletsAdsImage2, appletsAdsImage3, adsLink1, adsLink2, adsLink3,productType
          from new_page_floor_content where floorId = #{id}
     </select>
     <select id="getFloorImageById" resultType="com.caimei365.commodity.model.vo.FloorImageVo">
         select
-            id, floorId, centreId, productId, name, link, image, appletsImage, label, pcStatus, appletsStatus, sort, createDate
+            id, floorId, centreId, productId, name, link, image, appletsImage, label, pcStatus, appletsStatus, sort, createDate,productType
         from new_page_floor_image
         where floorId = #{id}
         <if test="source == 1">
@@ -118,14 +118,14 @@
         where p.productID = #{productId} and p.validFlag = 2
     </select>
     <select id="getSupplierFloorImage" resultType="com.caimei365.commodity.model.vo.ShopFloorVo">
-        select id, crmImage, wwwImage, wwwLink
+        select id, crmImage, wwwImage, wwwLink,productType
         from new_page_quality_supplier_image
         limit 1
     </select>
     <select id="getSupplierImage" resultType="com.caimei365.commodity.model.vo.ShopImageVo">
         select
             id, supplierName, image, link, sort, wwwEnabledStatus, crmEnabledStatus,
-            createBy, createDate, updateBy, updateDate, delFlag
+            createBy, createDate, updateBy, updateDate, delFlag,productType
         from
           new_page_quality_supplier
         where

src/main/resources/mapper/SellerMapper.xml

@@ -77,7 +77,8 @@
             p.commodityType,
             p.bigTypeID as bigTypeId,
             p.smallTypeID as smallTypeId,
-            p.tinyTypeID as tinyTypeId
+            p.tinyTypeID as tinyTypeId,
+            p.productType
         from product p
         where p.validFlag = 2 and p.combinationID = #{id}
         order by p.combinationSort!= 0 desc,p.combinationSort asc

src/main/resources/mapper/ShopMapper.xml

@@ -328,7 +328,8 @@
 			p.unit as unit,
 			p.price1TextFlag as priceFlag,
             IFNULL(p.visibility,3) as visibility,
-		    p.price8Text as beautyActFlag
+		    p.price8Text as beautyActFlag,
+            p.productType
 		from product p
         where p.shopID = #{shopId}
         and p.visibility in