1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/ICarouselManagementService.java

@@ -27,6 +27,7 @@ public interface ICarouselManagementService{
 	public Page<CarouselManagement> list(
 								@HttpParam(name = "title", type = HttpParamType.COMMON, description = "标题") String title,
 							@HttpParam(name = "url", type = HttpParamType.COMMON, description = "轮播图片") String url,
+								@HttpParam(name = "classify", type = HttpParamType.COMMON, description = "分类") String classify,
 							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
 							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
 							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/impl/ArticleManagementServiceImpl.java

@@ -34,6 +34,7 @@ public class ArticleManagementServiceImpl implements IArticleManagementService {
 		Date now = new Date();
 		articleManagement.setGmtCreate(now);
 		articleManagement.setGmtUpdate(now);
+		articleManagement.setStatus("待发布");
 		return articleManagementMapper.insert(articleManagement)>0;
 	}
 
@@ -41,7 +42,7 @@ public class ArticleManagementServiceImpl implements IArticleManagementService {
 	public Page<ArticleManagement> list(String articleTitle,String articleIntroduction,String coverImage,String classification,String articleTemplate,String searchKeywords,String language,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<ArticleManagement> wrapper = new EntityWrapper<ArticleManagement>();
 														if (!StringUtils.isEmpty(articleTitle)) {
-					wrapper.eq("article_title", articleTitle);
+					wrapper.like("article_title", articleTitle);
 				}
 												if (!StringUtils.isEmpty(articleIntroduction)) {
 					wrapper.eq("article_introduction", articleIntroduction);

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/impl/CarouselManagementServiceImpl.java

@@ -38,7 +38,7 @@ public class CarouselManagementServiceImpl implements ICarouselManagementService
 	}
 
 	@Override
-	public Page<CarouselManagement> list(String title,String url,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+	public Page<CarouselManagement> list(String title,String url,String classify,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<CarouselManagement> wrapper = new EntityWrapper<CarouselManagement>();
 														if (!StringUtils.isEmpty(title)) {
 					wrapper.eq("title", title);
@@ -46,6 +46,9 @@ public class CarouselManagementServiceImpl implements ICarouselManagementService
 												if (!StringUtils.isEmpty(url)) {
 					wrapper.eq("url", url);
 				}
+		if (!StringUtils.isEmpty(classify)) {
+			wrapper.eq("classify", classify);
+		}
 												if (!StringUtils.isEmpty(status)) {
 					wrapper.eq("status", status);
 				}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/cloud/impl/ProductManagementServiceImpl.java

@@ -34,6 +34,7 @@ public class ProductManagementServiceImpl implements IProductManagementService {
 		Date now = new Date();
 		productManagement.setGmtCreate(now);
 		productManagement.setGmtUpdate(now);
+		productManagement.setStatus("待发布");
 		return productManagementMapper.insert(productManagement)>0;
 	}
 
@@ -41,7 +42,7 @@ public class ProductManagementServiceImpl implements IProductManagementService {
 	public Page<ProductManagement> list(String productTitle, String productIntroduction, String coverImage, String classification, String productTemplate,String searchKeywords,String language, String status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<ProductManagement> wrapper = new EntityWrapper<ProductManagement>();
 														if (!StringUtils.isEmpty(productTitle)) {
-					wrapper.eq("product_title", productTitle);
+					wrapper.like("product_title", productTitle);
 				}
 												if (!StringUtils.isEmpty(productIntroduction)) {
 					wrapper.eq("product_introduction", productIntroduction);

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CarouselManagement.java

@@ -32,11 +32,21 @@ public class CarouselManagement extends SuperDO{
     @TableField("title")
     private String title;
 
+    /** 副标题 */
+    @Excel(name = "副标题")
+    @TableField("deputy_title")
+    private String deputyTitle;
+
     /** 轮播图片 */
     @Excel(name = "轮播图片")
     @TableField("url")
     private String url;
 
+    /** 分类 */
+    @Excel(name = "分类")
+    @TableField("classify")
+    private String classify;
+
     /** 状态 */
     @Excel(name = "状态")
     @TableField("status")

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CloudClassifyInfo.java

@@ -37,6 +37,26 @@ public class CloudClassifyInfo extends SuperDO{
     @TableField("classify_name")
     private String classifyName;
 
+    /** 分类图标 */
+    @Excel(name = "分类图标")
+    @TableField("classify_icon")
+    private String classifyIcon;
+
+    /** 分类封面图 */
+    @Excel(name = "分类封面图")
+    @TableField("classify_image")
+    private String classifyImage;
+
+    /** 分类描述 */
+    @Excel(name = "分类描述")
+    @TableField("classify_describe")
+    private String classifyDescribe;
+
+    /** 分类标题 */
+    @Excel(name = "分类标题")
+    @TableField("classify_title")
+    private String classifyTitle;
+
     /** 语言 */
     @Excel(name = "语言")
     @TableField("language")

unimall-data/src/main/java/com/iotechn/unimall/data/domain/ProductManagement.java

@@ -52,6 +52,11 @@ public class ProductManagement extends SuperDO{
     @TableField("product_template")
     private String productTemplate;
 
+    /** 产品描述 */
+    @Excel(name = "产品描述")
+    @TableField("product_describe")
+    private String productDescribe;
+
     /** 搜索关键字 */
     @Excel(name = "搜索关键字")
     @TableField("search_keywords")