From 8cebec2c7b5e56552c3d58a4571129ddecfb4436 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Aug 2023 15:18:07 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/mapper/MallNewsInfoMapper.java | 17
src/main/java/cc/mrbird/febs/dapp/service/IMallNewsInfoService.java | 46 +
src/main/java/cc/mrbird/febs/dapp/entity/MallNewsInfo.java | 33 +
src/main/resources/templates/febs/views/goods/newsInfoUpdate.html | 233 +++++++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 2
src/main/resources/mapper/dapp/MallNewsCategoryMapper.xml | 8
src/main/java/cc/mrbird/febs/dapp/mapper/MallNewsCategoryMapper.java | 12
src/main/resources/mapper/dapp/MallNewsInfoMapper.xml | 30 +
src/main/java/cc/mrbird/febs/dapp/vo/NewsListVo.java | 23
src/main/resources/templates/febs/views/goods/newsCategory.html | 137 +++++
src/main/resources/templates/febs/views/goods/newsInfoList.html | 169 ++++++
src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java | 38 +
src/main/java/cc/mrbird/febs/dapp/dto/MallNewsInfoDto.java | 28 +
src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java | 69 ++
src/main/java/cc/mrbird/febs/dapp/vo/AdminMallNewsInfoVo.java | 36 +
src/main/java/cc/mrbird/febs/dapp/controller/AdminMallGoodsController.java | 99 +++
src/main/resources/templates/febs/views/goods/newsInfoAdd.html | 173 ++++++
src/main/java/cc/mrbird/febs/dapp/dto/NewsListDto.java | 23
src/main/java/cc/mrbird/febs/dapp/service/impl/MallNewsInfoServiceImpl.java | 190 +++++++
src/main/java/cc/mrbird/febs/dapp/entity/MallNewsCategory.java | 16
src/main/resources/templates/febs/views/goods/newsCategoryAdd.html | 68 ++
21 files changed, 1,438 insertions(+), 12 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/AdminMallGoodsController.java b/src/main/java/cc/mrbird/febs/dapp/controller/AdminMallGoodsController.java
index 60ef26d..158ae20 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/AdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/AdminMallGoodsController.java
@@ -6,16 +6,11 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.utils.OssUtils;
-import cc.mrbird.febs.dapp.dto.AddMallGoodsDto;
-import cc.mrbird.febs.dapp.dto.HlmBasicPerkDto;
-import cc.mrbird.febs.dapp.dto.MallGoodsUpdateDto;
-import cc.mrbird.febs.dapp.dto.MallOrderInfoDto;
-import cc.mrbird.febs.dapp.entity.MallGoods;
-import cc.mrbird.febs.dapp.entity.MallGoodsCategory;
-import cc.mrbird.febs.dapp.entity.MallOrderInfo;
-import cc.mrbird.febs.dapp.entity.PlatformBanner;
+import cc.mrbird.febs.dapp.dto.*;
+import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.service.IAdminMallGoodsService;
+import cc.mrbird.febs.dapp.service.IMallNewsInfoService;
import cc.mrbird.febs.dapp.vo.AdminMallGoodsCategoryTreeVo;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
@@ -285,6 +280,94 @@
return new FebsResponse().success();
}
+ private final IMallNewsInfoService mallNewsInfoService;
+
+ /**
+ * 新闻中心-列表
+ * @param mallNewsInfo
+ * @param request
+ * @return
+ */
+ @GetMapping("getNewInfoList")
+ public FebsResponse getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallNewsInfoService.getNewInfoList(mallNewsInfo, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 新闻中心-新增
+ */
+ @PostMapping("addNewsInfo")
+ @ControllerEndpoint(operation = " 新闻中心-新增", exceptionMessage = "操作失败")
+ public FebsResponse addNewsInfo(@Valid MallNewsInfoDto mallNewsInfoDto) {
+ return mallNewsInfoService.addNewsInfo(mallNewsInfoDto);
+ }
+
+ /**
+ * 新闻中心-删除
+ */
+ @GetMapping("delNewsInfo/{id}")
+ @ControllerEndpoint(operation = " 新闻中心-删除", exceptionMessage = "操作失败")
+ public FebsResponse delNewsInfo(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallNewsInfoService.delNewsInfo(id);
+ }
+
+ /**
+ * 新闻中心-更新
+ */
+ @PostMapping("updateNewsInfo")
+ @ControllerEndpoint(operation = "新闻中心-更新", exceptionMessage = "操作失败")
+ public FebsResponse updateNewsInfo(@Valid MallNewsInfoDto mallNewsInfoDto) {
+ return mallNewsInfoService.updateNewsInfo(mallNewsInfoDto);
+ }
+
+
+ @GetMapping("findNewsCategoryList")
+ @ControllerEndpoint(operation = "新闻分类列表", exceptionMessage = "获取失败")
+ public FebsResponse findNewsCategoryList(MallNewsCategory mallNewsCategory, QueryRequest request) {
+ return new FebsResponse().success().data(getDataTable(mallNewsInfoService.findNewsCategoryInPage(mallNewsCategory, request)));
+ }
+
+ @PostMapping("addOrModifyNewsCategory")
+ @ControllerEndpoint(operation = "新闻分类", exceptionMessage = "新增失败")
+ public FebsResponse addOrModifyNewsCategory(MallNewsCategory mallNewsCategory) {
+ mallNewsInfoService.addOrModifyNewsCategory(mallNewsCategory);
+ return new FebsResponse().success().message("新增成功");
+ }
+
+ /**
+ * 新闻分类-删除
+ */
+ @GetMapping("delNewsCategoryInfo/{id}")
+ @ControllerEndpoint(operation = "新闻分类-删除", exceptionMessage = "操作失败")
+ public FebsResponse delNewsCategoryInfo(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallNewsInfoService.delNewsCategoryInfo(id);
+ }
+
+ @GetMapping(value = "findAllCategoryList")
+ public FebsResponse findAllCategoryList() {
+ List<MallNewsCategory> categories = mallNewsInfoService.findAllCategory();
+ return new FebsResponse().success().data(categories);
+ }
+
+ @PostMapping(value = "/topNews/{id}")
+ public FebsResponse topNews(@PathVariable Long id) {
+ MallNewsInfo mallNewsInfo = new MallNewsInfo();
+ mallNewsInfo.setIsTop(1);
+ mallNewsInfo.setId(id);
+ mallNewsInfoService.updateById(mallNewsInfo);
+ return new FebsResponse().success();
+ }
+
+ @PostMapping(value = "/unTopNews/{id}")
+ public FebsResponse unTopNews(@PathVariable Long id) {
+ MallNewsInfo mallNewsInfo = new MallNewsInfo();
+ mallNewsInfo.setIsTop(2);
+ mallNewsInfo.setId(id);
+ mallNewsInfoService.updateById(mallNewsInfo);
+ return new FebsResponse().success();
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
index 0465724..c0e389e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
@@ -5,10 +5,13 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
+import cc.mrbird.febs.dapp.entity.MallNewsInfo;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.service.DappSimulateDataService;
import cc.mrbird.febs.dapp.service.DappSystemService;
+import cc.mrbird.febs.dapp.service.IMallNewsInfoService;
import cc.mrbird.febs.dapp.vo.MallGoodsListVo;
+import cc.mrbird.febs.dapp.vo.NewsListVo;
import cc.mrbird.febs.dapp.vo.SimulateDataVo;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import io.swagger.annotations.Api;
@@ -34,6 +37,7 @@
public class ApiCommonController {
private final DappMemberService dappMemberService;
+ private final IMallNewsInfoService newsService;
@ApiOperation(value = "地址是否存在", notes = "地址是否存在")
@GetMapping(value = "/exist/{address}")
@@ -75,6 +79,40 @@
return new FebsResponse().success().data(dappMemberService.findGoodsDetailsById(id));
}
+ @ApiOperation(value = "新闻分类", notes = "新闻分类")
+ @GetMapping(value = "/findNewsInfoCategory")
+ public FebsResponse findNewsInfoCategory() {
+ return new FebsResponse().success().data(newsService.findNewsCategoryList());
+ }
+
+ @ApiOperation(value ="获取新闻列表-分页", notes = "获取新闻列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = NewsListVo.class)
+ })
+ @PostMapping(value = "/findNewsInPage")
+ public FebsResponse findNewsInPage(@RequestBody NewsListDto newsListDto) {
+ return new FebsResponse().success().data(newsService.findNewsInPage(newsListDto));
+ }
+
+ @ApiOperation(value = "新闻列表", notes = "新闻列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = NewsListVo.class)
+ })
+ @GetMapping(value = "/findNews")
+ public FebsResponse findNews() {
+ return new FebsResponse().success().data(newsService.findTopNews());
+ }
+
+ @ApiOperation(value = "新闻详情", notes = "新闻详情")
+ @GetMapping(value = "/newsDetails/{id}")
+ public FebsResponse newsDetails(@PathVariable("id") Long id) {
+ MallNewsInfo news = newsService.getById(id);
+ if (news == null) {
+ return new FebsResponse().fail().message("新闻不存在");
+ }
+ return new FebsResponse().success().data(news);
+ }
+
// @ApiOperation(value = "头部数据", notes = "头部数据")
// @GetMapping(value = "/totalIncome")
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java
index a03b508..2191422 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java
@@ -4,12 +4,11 @@
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.dapp.dto.HlmBasicPerkDto;
-import cc.mrbird.febs.dapp.entity.DataDictionaryCustom;
-import cc.mrbird.febs.dapp.entity.MallGoods;
-import cc.mrbird.febs.dapp.entity.PlatformBanner;
+import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.dapp.service.IAdminMallGoodsService;
+import cc.mrbird.febs.dapp.service.IMallNewsInfoService;
import cc.mrbird.febs.dapp.vo.AdminMallGoodsCategoryVo;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
@@ -245,4 +244,68 @@
public String platformBannerAdd() {
return FebsUtil.view("goods/platformBannerAdd");
}
+
+
+
+ private final IMallNewsInfoService mallNewsInfoService;
+
+ /**
+ * 新闻中心-列表
+ * @return
+ */
+ @GetMapping("newsInfoList")
+ @RequiresPermissions("newsInfoList:view")
+ public String newsInfoList() {
+ return FebsUtil.view("goods/newsInfoList");
+ }
+
+ /**
+ * 新闻中心-新增
+ * @return
+ */
+ @GetMapping("newsInfoAdd")
+ @RequiresPermissions("newsInfoAdd:add")
+ public String newsInfoAdd() {
+ return FebsUtil.view("goods/newsInfoAdd");
+ }
+
+ /**
+ * 新闻中心-详情
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("newsInfoUpdate/{id}")
+ @RequiresPermissions("newsInfoUpdate:update")
+ public String newsInfoUpdate(@PathVariable long id, Model model) {
+ MallNewsInfo data = mallNewsInfoService.getNewsInfoById(id);
+ model.addAttribute("newsInfo", data);
+ return FebsUtil.view("goods/newsInfoUpdate");
+ }
+
+ @GetMapping("newsCategory")
+ @RequiresPermissions("news:category:view")
+ public String newsCategory() {
+ return FebsUtil.view("goods/newsCategory");
+ }
+
+ @GetMapping("addCategory")
+ @RequiresPermissions("news:category:add")
+ public String addCategory(Long id, Model model) {
+ if (id != null) {
+ MallNewsCategory obj = mallNewsInfoService.findNewsCategoryById(id);
+ model.addAttribute("obj", obj);
+ }
+ return FebsUtil.view("goods/newsCategoryAdd");
+ }
+
+ @GetMapping("updateCategory/{id}")
+ @RequiresPermissions("news:category:update")
+ public String updateCategory(@PathVariable Long id, Model model) {
+ if (id != null) {
+ MallNewsCategory obj = mallNewsInfoService.findNewsCategoryById(id);
+ model.addAttribute("obj", obj);
+ }
+ return FebsUtil.view("goods/newsCategoryAdd");
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/MallNewsInfoDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/MallNewsInfoDto.java
new file mode 100644
index 0000000..08f71a5
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/MallNewsInfoDto.java
@@ -0,0 +1,28 @@
+package cc.mrbird.febs.dapp.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "MallNewsInfoDto", description = "参数接收类")
+public class MallNewsInfoDto {
+
+ private Long id;
+
+ private String title;
+
+ private String content;
+
+ private Long goodsId;
+ /**
+ * 1-文章2-跳转到产品
+ */
+ private Integer type;
+
+ private String videoUrl;
+
+ private String thumb;
+
+ private String categoryId;
+
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/NewsListDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/NewsListDto.java
new file mode 100644
index 0000000..e9e6d14
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/NewsListDto.java
@@ -0,0 +1,23 @@
+package cc.mrbird.febs.dapp.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wzy
+ * @date 2022-05-16
+ **/
+@Data
+@ApiModel(value = "NewsListDto", description = "新闻列表接口接收参数类")
+public class NewsListDto {
+
+ @ApiModelProperty("每页数量")
+ private int pageSize = 10;
+
+ @ApiModelProperty("页码")
+ private int pageNum = 1;
+
+ @ApiModelProperty("分类ID")
+ private Long categoryId;
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/MallNewsCategory.java b/src/main/java/cc/mrbird/febs/dapp/entity/MallNewsCategory.java
new file mode 100644
index 0000000..c1b3c8e
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/MallNewsCategory.java
@@ -0,0 +1,16 @@
+package cc.mrbird.febs.dapp.entity;
+
+import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author wzy
+ * @date 2022-05-13
+ **/
+@Data
+@TableName("mall_news_category")
+public class MallNewsCategory extends BaseEntity {
+
+ private String title;
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/MallNewsInfo.java b/src/main/java/cc/mrbird/febs/dapp/entity/MallNewsInfo.java
new file mode 100644
index 0000000..58eb016
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/MallNewsInfo.java
@@ -0,0 +1,33 @@
+package cc.mrbird.febs.dapp.entity;
+
+import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author wzy
+ * @date 2021-09-28
+ **/
+@Data
+@TableName("mall_news_info")
+public class MallNewsInfo extends BaseEntity {
+
+ private String title;
+
+ private String content;
+
+ private Long targetId;
+
+ /**
+ * 1-文章2-跳转到产品
+ */
+ private Integer type;
+
+ private String videoUrl;
+
+ private String thumb;
+
+ private Long categoryId;
+
+ private Integer isTop;
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/MallNewsCategoryMapper.java b/src/main/java/cc/mrbird/febs/dapp/mapper/MallNewsCategoryMapper.java
new file mode 100644
index 0000000..b3373de
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/MallNewsCategoryMapper.java
@@ -0,0 +1,12 @@
+package cc.mrbird.febs.dapp.mapper;
+
+import cc.mrbird.febs.dapp.entity.MallNewsCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+public interface MallNewsCategoryMapper extends BaseMapper<MallNewsCategory> {
+
+ IPage<MallNewsCategory> selectInPage(@Param("record") MallNewsCategory mallNewsCategory, Page<MallNewsCategory> page);
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/MallNewsInfoMapper.java b/src/main/java/cc/mrbird/febs/dapp/mapper/MallNewsInfoMapper.java
new file mode 100644
index 0000000..d2a2bb1
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/MallNewsInfoMapper.java
@@ -0,0 +1,17 @@
+package cc.mrbird.febs.dapp.mapper;
+
+import cc.mrbird.febs.dapp.entity.MallNewsInfo;
+import cc.mrbird.febs.dapp.vo.AdminMallNewsInfoVo;
+import cc.mrbird.febs.dapp.vo.NewsListVo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+public interface MallNewsInfoMapper extends BaseMapper<MallNewsInfo> {
+
+ IPage<AdminMallNewsInfoVo> getNewInfoListInPage(Page<AdminMallNewsInfoVo> page, MallNewsInfo mallNewsInfo);
+
+ IPage<NewsListVo> selectNewsVoInPage(Page<NewsListVo> page, @Param("record") MallNewsInfo mallNewsInfo);
+
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/IMallNewsInfoService.java b/src/main/java/cc/mrbird/febs/dapp/service/IMallNewsInfoService.java
new file mode 100644
index 0000000..cd2cb48
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/service/IMallNewsInfoService.java
@@ -0,0 +1,46 @@
+package cc.mrbird.febs.dapp.service;
+
+import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.dapp.dto.MallNewsInfoDto;
+import cc.mrbird.febs.dapp.dto.NewsListDto;
+import cc.mrbird.febs.dapp.entity.MallNewsCategory;
+import cc.mrbird.febs.dapp.entity.MallNewsInfo;
+import cc.mrbird.febs.dapp.vo.AdminMallNewsInfoVo;
+import cc.mrbird.febs.dapp.vo.NewsListVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+public interface IMallNewsInfoService extends IService<MallNewsInfo> {
+
+ IPage<AdminMallNewsInfoVo> getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request);
+
+ FebsResponse addNewsInfo(MallNewsInfoDto mallNewsInfoDto);
+
+ FebsResponse delNewsInfo(Long id);
+
+ FebsResponse updateNewsInfo(MallNewsInfoDto mallNewsInfoDto);
+
+ MallNewsInfo getNewsInfoById(long id);
+
+ IPage<MallNewsCategory> findNewsCategoryInPage(MallNewsCategory mallNewsCategory, QueryRequest request);
+
+ void addOrModifyNewsCategory(MallNewsCategory mallNewsCategory);
+
+ MallNewsCategory findNewsCategoryById(Long id);
+
+ List<MallNewsCategory> findAllCategory();
+
+ FebsResponse delNewsCategoryInfo(Long id);
+
+
+ List<MallNewsCategory> findNewsCategoryList();
+
+ IPage<NewsListVo> findNewsInPage(NewsListDto newsListDto);
+
+ List<NewsListVo> findTopNews();
+
+ FebsResponse findAllBanner();
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index d118597..061076b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -803,7 +803,7 @@
DataDictionaryEnum.PACKAGE_SCORE_PRICE.getType(),
DataDictionaryEnum.PACKAGE_SCORE_PRICE.getCode()
);
- BigDecimal packageScorePrice = new BigDecimal(ObjectUtil.isEmpty(packageScorePriceDic) ? "0" : packageScorePriceDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal packageScorePrice = new BigDecimal(ObjectUtil.isEmpty(packageScorePriceDic) ? "0" : packageScorePriceDic.getValue()).setScale(8, BigDecimal.ROUND_DOWN);
packageInfoVo.setPackageScorePrice(packageScorePrice);
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/MallNewsInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/MallNewsInfoServiceImpl.java
new file mode 100644
index 0000000..2f92082
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/MallNewsInfoServiceImpl.java
@@ -0,0 +1,190 @@
+package cc.mrbird.febs.dapp.service.impl;
+
+import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.dapp.dto.MallNewsInfoDto;
+import cc.mrbird.febs.dapp.dto.NewsListDto;
+import cc.mrbird.febs.dapp.entity.MallNewsCategory;
+import cc.mrbird.febs.dapp.entity.MallNewsInfo;
+import cc.mrbird.febs.dapp.entity.PlatformBanner;
+import cc.mrbird.febs.dapp.mapper.MallNewsCategoryMapper;
+import cc.mrbird.febs.dapp.mapper.MallNewsInfoMapper;
+import cc.mrbird.febs.dapp.mapper.PlatformBannerMapper;
+import cc.mrbird.febs.dapp.service.IMallNewsInfoService;
+import cc.mrbird.febs.dapp.vo.AdminMallNewsInfoVo;
+import cc.mrbird.febs.dapp.vo.NewsListVo;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wzy
+ * @date 2022-05-13
+ **/
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MallNewsInfoServiceImpl extends ServiceImpl<MallNewsInfoMapper, MallNewsInfo> implements IMallNewsInfoService {
+
+ private final MallNewsCategoryMapper mallNewsCategoryMapper;
+ private final PlatformBannerMapper platformBannerMapper;
+
+ @Override
+ public IPage<AdminMallNewsInfoVo> getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request) {
+ Page<AdminMallNewsInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminMallNewsInfoVo> adminMallNewsInfoVos = this.baseMapper.getNewInfoListInPage(page, mallNewsInfo);
+ return adminMallNewsInfoVos;
+ }
+
+ @Override
+ public FebsResponse addNewsInfo(MallNewsInfoDto mallNewsInfoDto) {
+// Integer type = mallNewsInfoDto.getType();
+// if(type == 2){
+// Long goodsId = mallNewsInfoDto.getGoodsId()==null?0L:mallNewsInfoDto.getGoodsId();
+// if(goodsId == 0L){
+// return new FebsResponse().fail().message("请选择跳转的产品");
+// }
+// }
+// MallNewsInfo mallNewsInfo = new MallNewsInfo();
+// mallNewsInfo.setTitle(mallNewsInfoDto.getTitle());
+// mallNewsInfo.setContent(mallNewsInfoDto.getContent());
+// mallNewsInfo.setType(mallNewsInfoDto.getType());
+// if(mallNewsInfoDto.getType() == 2){
+// mallNewsInfo.setTargetId(mallNewsInfoDto.getGoodsId());
+// }
+ String content = mallNewsInfoDto.getContent();
+ if(StrUtil.isNotBlank(content)){
+ //正文图片样式居中
+ mallNewsInfoDto.setContent(content+"<style>img{max-width:100%!important;}</style>");
+ }
+ MallNewsInfo mallNewsInfo = new MallNewsInfo();
+ BeanUtil.copyProperties(mallNewsInfoDto, mallNewsInfo);
+ this.baseMapper.insert(mallNewsInfo);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse delNewsInfo(Long id) {
+ MallNewsInfo mallNewsInfo = this.baseMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallNewsInfo)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
+ }
+ this.baseMapper.deleteById(id);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse updateNewsInfo(MallNewsInfoDto mallNewsInfoDto) {
+ MallNewsInfo mallNewsInfoBefore = this.baseMapper.selectById(mallNewsInfoDto.getId());
+ if(ObjectUtil.isEmpty(mallNewsInfoBefore)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
+ }
+// Integer type = mallNewsInfoDto.getType();
+// if(type == 2){
+// Long goodsId = mallNewsInfoDto.getGoodsId()==null?0L:mallNewsInfoDto.getGoodsId();
+// if(goodsId == 0L){
+// return new FebsResponse().fail().message("请选择跳转的产品");
+// }
+// }
+// MallNewsInfo mallNewsInfo = new MallNewsInfo();
+// mallNewsInfo.setTitle(mallNewsInfoDto.getTitle());
+// mallNewsInfo.setContent(mallNewsInfoDto.getContent());
+// mallNewsInfo.setType(mallNewsInfoDto.getType());
+// if(mallNewsInfoDto.getType() == 2){
+// mallNewsInfo.setTargetId(mallNewsInfoDto.getGoodsId());
+// }
+// this.baseMapper.insert(mallNewsInfo);
+// this.baseMapper.deleteById(mallNewsInfoDto.getId());
+
+ String content = mallNewsInfoDto.getContent();
+ if(StrUtil.isNotBlank(content)){
+ //正文图片样式居中
+ mallNewsInfoDto.setContent(content+"<style>img{max-width:100%!important;}</style>");
+ }
+ MallNewsInfo mallNewsInfo = new MallNewsInfo();
+ BeanUtil.copyProperties(mallNewsInfoDto, mallNewsInfo);
+ this.baseMapper.updateById(mallNewsInfo);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public MallNewsInfo getNewsInfoById(long id) {
+ return this.baseMapper.selectById(id);
+ }
+
+ @Override
+ public IPage<MallNewsCategory> findNewsCategoryInPage(MallNewsCategory mallNewsCategory, QueryRequest request) {
+ Page<MallNewsCategory> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return mallNewsCategoryMapper.selectInPage(mallNewsCategory, page);
+ }
+
+ @Override
+ public void addOrModifyNewsCategory(MallNewsCategory mallNewsCategory) {
+ if (mallNewsCategory.getId() != null) {
+ mallNewsCategoryMapper.updateById(mallNewsCategory);
+ return;
+ }
+ mallNewsCategoryMapper.insert(mallNewsCategory);
+ }
+
+ @Override
+ public MallNewsCategory findNewsCategoryById(Long id) {
+ return mallNewsCategoryMapper.selectById(id);
+ }
+
+ @Override
+ public List<MallNewsCategory> findAllCategory() {
+ return mallNewsCategoryMapper.selectList(null);
+ }
+
+ @Override
+ public FebsResponse delNewsCategoryInfo(Long id) {
+ MallNewsCategory mallNewsCategory = mallNewsCategoryMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallNewsCategory)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
+ }
+ mallNewsCategoryMapper.deleteById(id);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public List<MallNewsCategory> findNewsCategoryList() {
+ return mallNewsCategoryMapper.selectList(null);
+ }
+
+ @Override
+ public IPage<NewsListVo> findNewsInPage(NewsListDto newsListDto) {
+ Page<NewsListVo> page = new Page<>(newsListDto.getPageNum(), newsListDto.getPageSize());
+
+ MallNewsInfo mallNewsInfo = new MallNewsInfo();
+ mallNewsInfo.setCategoryId(newsListDto.getCategoryId());
+ return this.baseMapper.selectNewsVoInPage(page, mallNewsInfo);
+ }
+
+ @Override
+ public List<NewsListVo> findTopNews() {
+ Page<NewsListVo> page = new Page<>(1, 999);
+ MallNewsInfo mallNewsInfo = new MallNewsInfo();
+ mallNewsInfo.setIsTop(1);
+
+ IPage<NewsListVo> pageList = this.baseMapper.selectNewsVoInPage(page, mallNewsInfo);
+ return pageList.getRecords();
+ }
+
+ @Override
+ public FebsResponse findAllBanner() {
+ QueryWrapper<PlatformBanner> queryWrapper = new QueryWrapper<>();
+ queryWrapper.orderByAsc("is_top");
+ List<PlatformBanner> paymentMethodList = platformBannerMapper.selectList(queryWrapper);
+ return new FebsResponse().success().data(paymentMethodList);
+ }
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/AdminMallNewsInfoVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/AdminMallNewsInfoVo.java
new file mode 100644
index 0000000..cf5b697
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/AdminMallNewsInfoVo.java
@@ -0,0 +1,36 @@
+package cc.mrbird.febs.dapp.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "AdminMallNewsInfoVo", description = "信息返回类")
+public class AdminMallNewsInfoVo {
+
+ private Long id;
+
+ private String title;
+
+ private String content;
+
+ private String thumb;
+
+ private Long targetId;
+
+ private String targetName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 1-文章2-跳转到产品
+ */
+ private Integer type;
+
+ private String categoryName;
+
+ private Integer isTop;
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/NewsListVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/NewsListVo.java
new file mode 100644
index 0000000..146fe46
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/NewsListVo.java
@@ -0,0 +1,23 @@
+package cc.mrbird.febs.dapp.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wzy
+ * @date 2022-05-16
+ **/
+@Data
+@ApiModel(value = "NewsListVo")
+public class NewsListVo {
+
+ private Long id;
+
+ private String title;
+
+ private String thumb;
+
+ private Date createTime;
+}
diff --git a/src/main/resources/mapper/dapp/MallNewsCategoryMapper.xml b/src/main/resources/mapper/dapp/MallNewsCategoryMapper.xml
new file mode 100644
index 0000000..03b0407
--- /dev/null
+++ b/src/main/resources/mapper/dapp/MallNewsCategoryMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.mrbird.febs.dapp.mapper.MallNewsCategoryMapper">
+
+ <select id="selectInPage" resultType="cc.mrbird.febs.dapp.entity.MallNewsCategory">
+ select * from mall_news_category
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/dapp/MallNewsInfoMapper.xml b/src/main/resources/mapper/dapp/MallNewsInfoMapper.xml
new file mode 100644
index 0000000..8758085
--- /dev/null
+++ b/src/main/resources/mapper/dapp/MallNewsInfoMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.mrbird.febs.dapp.mapper.MallNewsInfoMapper">
+
+ <select id="getNewInfoListInPage" resultType="cc.mrbird.febs.dapp.vo.AdminMallNewsInfoVo">
+ SELECT
+ a.*,
+ c.title categoryName,
+ b.goods_name targetName
+ FROM mall_news_info a
+ left join mall_goods b on a.target_id = b.id
+ left join mall_news_category c on a.category_id=c.id
+ group by a.id
+ order by a.CREATE_TIME desc
+ </select>
+
+ <select id="selectNewsVoInPage" resultType="cc.mrbird.febs.dapp.vo.NewsListVo">
+ select * from mall_news_info
+ <where>
+ 1=1
+ <if test="record.categoryId != null">
+ and category_id=#{record.categoryId}
+ </if>
+ <if test="record.isTop != null">
+ and is_top=#{record.isTop}
+ </if>
+ </where>
+ order by CREATE_TIME desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/goods/newsCategory.html b/src/main/resources/templates/febs/views/goods/newsCategory.html
new file mode 100644
index 0000000..7c09ad8
--- /dev/null
+++ b/src/main/resources/templates/febs/views/goods/newsCategory.html
@@ -0,0 +1,137 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-new-category" lay-title="新闻分类">
+ <div class="layui-row febs-container">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body febs-table-full">
+ <form class="layui-form layui-table-form" lay-filter="news-category-table-form">
+ <div class="layui-row">
+ <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add">
+ 新增
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
+ <i class="layui-icon"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
+ <i class="layui-icon"></i>
+ </div>
+ </div>
+ </div>
+ </form>
+ <table lay-filter="newCategoryTable" lay-data="{id: 'newCategoryTable'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<!-- 表格操作栏 start -->
+<script type="text/html" id="user-option">
+ <span shiro:lacksPermission="user:view,user:update,user:delete">
+ <span class="layui-badge-dot febs-bg-orange"></span> 无权限
+ </span>
+ <a lay-event="edit" shiro:hasPermission="user:update"><i
+ class="layui-icon febs-edit-area febs-blue"></i></a>
+</script>
+<!-- 表格操作栏 end -->
+<script data-th-inline="none" type="text/javascript">
+ // 引入组件并初始化
+ layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+ var $ = layui.jquery,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ $view = $('#febs-new-category'),
+ $query = $view.find('#query'),
+ $add = $view.find('#add'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'phone', type: null},
+ tableIns;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 初始化表格操作栏各个按钮功能
+ table.on('tool(newCategoryTable)', function (obj) {
+ var data = obj.data,
+ layEvent = obj.event;
+ if (layEvent === 'newsInfoUpdate') {
+ console.log(data);
+ febs.modal.open('编辑', 'goodsView/updateCategory/'+data.id, {
+ btn: ['提交', '取消'],
+ area:['50%'],
+ yes: function (index, layero) {
+ $('#newsCategory-add').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+ if (layEvent === 'delNewsInfo') {
+ febs.modal.confirm('删除', '确认删除？', function () {
+ delNewsInfo(data.id);
+ });
+ }
+ });
+
+ function delNewsInfo(id) {
+ febs.get(ctx + 'admin/goods/delNewsCategoryInfo/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
+
+ // 查询按钮
+ $query.on('click', function () {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ tableIns.reload({where: params, page: {curr: 1}});
+ });
+
+ // 刷新按钮
+ $reset.on('click', function () {
+ $searchForm[0].reset();
+ sortObject.type = 'null';
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ $add.on('click', function () {
+ febs.modal.open('新增', 'goodsView/addCategory/', {
+ btn: ['提交', '取消'],
+ area:['50%'],
+ yes: function (index, layero) {
+ $('#newsCategory-add').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'newCategoryTable',
+ url: ctx + 'admin/goods/findNewsCategoryList',
+ cols: [[
+ {field: 'title', title: '标题', minWidth: 120,align:'center'},
+ {field: 'createdTime', title: '创建时间', minWidth: 120,align:'center'},
+ {title: '操作',
+ templet: function (d) {
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="newsInfoUpdate" shiro:hasPermission="news:category:update">编辑</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="delNewsInfo" shiro:hasPermission="news:category:update">删除</button>'
+ },minWidth: 300,align:'center'}
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ return {
+ };
+ }
+
+ })
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/goods/newsCategoryAdd.html b/src/main/resources/templates/febs/views/goods/newsCategoryAdd.html
new file mode 100644
index 0000000..818f9fb
--- /dev/null
+++ b/src/main/resources/templates/febs/views/goods/newsCategoryAdd.html
@@ -0,0 +1,68 @@
+<style>
+ #newsCategory-add {
+ padding: 20px 25px 25px 0;
+ }
+
+ #newsCategory-add .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #newsCategory-add #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #newsCategory-add .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+ #newsCategory-add img{
+ max-width:100px
+ }
+
+</style>
+<div class="layui-fluid" id="newsCategory-add">
+ <form class="layui-form" action="" lay-filter="newsCategory-add-form">
+ <div class="layui-form-item febs-hide">
+ <label class="layui-form-label">标题：</label>
+ <div class="layui-input-block">
+ <input type="text" name="id" autocomplete="off" data-th-value="${obj == null ? '':obj.id}" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">标题：</label>
+ <div class="layui-input-block">
+ <input type="text" name="title" lay-verify="required" autocomplete="off" data-th-value="${obj == null ? '':obj.title}" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-form-item febs-hide">
+ <button class="layui-btn" lay-submit="" lay-filter="newsCategory-add-form-submit" id="submit"></button>
+ </div>
+ </form>
+</div>
+
+<script data-th-inline="javascript">
+ layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'laydate'], function () {
+ var $ = layui.$,
+ febs = layui.febs,
+ layer = layui.layer,
+ formSelects = layui.formSelects,
+ treeSelect = layui.treeSelect,
+ form = layui.form,
+ laydate = layui.laydate,
+ eleTree = layui.eleTree,
+ $view = $('#newsCategory-add'),
+ validate = layui.validate;
+
+
+ form.render();
+
+ form.on('submit(newsCategory-add-form-submit)', function (data) {
+ febs.post(ctx + 'admin/goods/addOrModifyNewsCategory', data.field, function () {
+ layer.closeAll();
+ febs.alert.success('操作成功');
+ $('#febs-new-category').find('#query').click();
+ });
+ return false;
+ });
+ });
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/goods/newsInfoAdd.html b/src/main/resources/templates/febs/views/goods/newsInfoAdd.html
new file mode 100644
index 0000000..f434ec4
--- /dev/null
+++ b/src/main/resources/templates/febs/views/goods/newsInfoAdd.html
@@ -0,0 +1,173 @@
+<style>
+ #newsInfo-add {
+ padding: 20px 25px 25px 0;
+ }
+
+ #newsInfo-add .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #newsInfo-add #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #newsInfo-add .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+ #newsInfo-add img{
+ max-width:100px
+ }
+
+</style>
+<div class="layui-fluid" id="newsInfo-add">
+ <form class="layui-form" action="" lay-filter="newsInfo-add-form">
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">标题：</label>
+ <div class="layui-input-block">
+ <input type="text" name="title" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">分类：</label>
+ <div class="layui-input-block">
+ <select name="categoryId" class="news-category" id="news-category" >
+ <option value="">请选择</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">视频：</label>
+ <div class="layui-input-block">
+ <button type="button" class="layui-btn upload" id="upload" style="background-color: #009688; margin-bottom: 2px">上传文件</button>
+ <input type="text" name="videoUrl" autocomplete="off" value="" id="videoUrl" class="layui-input" readonly>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">缩略图：</label>
+ <div class="layui-input-block">
+ <button type="button" class="layui-btn" id="imageUpload" style="background-color: #009688; margin-bottom: 2px">图片上传</button>
+ <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
+ <div class=" layui-upload-list view-images" id="thumbImage">
+ </div>
+ </blockquote>
+ <div class="febs-hide">
+ <input type="text" id="thumb" name="thumb" autocomplete="off" class="layui-input" readonly>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">内容：</label>
+ <div class="layui-input-block">
+ <textarea id="lay_edit" name = "content" lay-verify="content" class="layui-textarea"></textarea>
+ </div>
+ </div>
+ <div class="layui-form-item febs-hide">
+ <button class="layui-btn" lay-submit="" lay-filter="newsInfo-add-form-submit" id="submit"></button>
+ </div>
+ </form>
+</div>
+
+<script data-th-inline="javascript">
+ layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree','layedit', 'laydate', 'upload'], function () {
+ var $ = layui.$,
+ febs = layui.febs,
+ layer = layui.layer,
+ upload = layui.upload,
+ formSelects = layui.formSelects,
+ form = layui.form,
+ laydate = layui.laydate,
+ layedit = layui.layedit,
+ $view = $('#newsInfo-add'),
+ validate = layui.validate;
+
+ //(下拉框)
+ $.get(ctx + 'admin/goods/findAllCategoryList', function (data) {
+ var arr = data.data;
+ for (let i = 0; i < arr.length; i++) {
+ $(".news-category").append("<option value='" + arr[i].id + "'>" + arr[i].title + "</option>");
+ }
+ layui.use('form', function () {
+ var form = layui.form;
+ form.render();
+ });
+ });
+
+ form.render();
+ laydate.render({
+ elem: '#febs-form-group-date'
+ });
+
+ layedit.set({ //设置图片接口
+ uploadImage: {
+ url: 'admin/goods/uploadFileBase64', //接口url
+ type: 'post',
+ }
+ });
+ //创建一个编辑器
+ var index = layedit.build('lay_edit',{
+ height: 300
+ });
+ form.verify({
+ //content富文本域中的lay-verify值
+ content: function(value) {
+ return layedit.sync(index);
+ }
+ });
+
+ formSelects.render();
+ form.on('submit(newsInfo-add-form-submit)', function (data) {
+ febs.post(ctx + 'admin/goods/addNewsInfo', data.field, function () {
+ layer.closeAll();
+ febs.alert.success('操作成功');
+ $('#febs-newInfo').find('#reset').click();
+ });
+ return false;
+ });
+
+ upload.render({
+ elem: '#imageUpload'
+ ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+ ,multiple: false
+ ,before: function(obj){
+ //预读本地文件示例，不支持ie8
+ obj.preview(function(index, file, result){
+ $('#thumbImage').html('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img" style="width: 100px">')
+ });
+ }
+ ,done: function(res){
+ $("#thumb").val(res.data.src);
+ }
+ });
+
+
+ bindUpload();
+ function bindUpload() {
+ upload.render({
+ elem: '.upload'
+ ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+ ,accept: 'file'
+ ,before: function(obj){
+ layer.msg('上传中', {icon: 16, time: 0});
+ }
+ ,done: function(res){
+ var item = this.item;
+ //如果上传失败
+ if(res.code !== 0){
+ return layer.msg('上传失败');
+ }
+
+ // $(item).parent().prev().find('input').val(res.data[0]);
+ $("#videoUrl").val(res.data.src);
+ layer.msg('上传完毕', {icon: 1});
+ }
+ ,error: function(err){
+ return layer.msg('上传失败');
+ }
+ });
+ }
+ });
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/goods/newsInfoList.html b/src/main/resources/templates/febs/views/goods/newsInfoList.html
new file mode 100644
index 0000000..26b613a
--- /dev/null
+++ b/src/main/resources/templates/febs/views/goods/newsInfoList.html
@@ -0,0 +1,169 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-newInfo" lay-title="新闻中心">
+ <div class="layui-row febs-container">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body febs-table-full">
+ <form class="layui-form layui-table-form" lay-filter="user-table-form">
+ <div class="layui-row">
+ <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add">
+ 新增
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
+ <i class="layui-icon"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
+ <i class="layui-icon"></i>
+ </div>
+ </div>
+ </div>
+ </form>
+ <table lay-filter="newInfoTable" lay-data="{id: 'newInfoTable'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<style>
+ .layui-table-cell {
+ height: auto;
+ }
+ .layui-form-onswitch {
+ background-color: #5FB878 !important;
+ }
+</style>
+<script type="text/html" id="isTopSwitch">
+ {{# if(d.isTop === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="isTopSwitch">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="isTopSwitch">
+ {{# } }}
+</script>
+<!-- 表格操作栏 start -->
+<script type="text/html" id="user-option">
+ <span shiro:lacksPermission="user:view,user:update,user:delete">
+ <span class="layui-badge-dot febs-bg-orange"></span> 无权限
+ </span>
+ <a lay-event="edit" shiro:hasPermission="user:update"><i
+ class="layui-icon febs-edit-area febs-blue"></i></a>
+</script>
+<!-- 表格操作栏 end -->
+<script data-th-inline="none" type="text/javascript">
+ // 引入组件并初始化
+ layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+ var $ = layui.jquery,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ $view = $('#febs-newInfo'),
+ $query = $view.find('#query'),
+ $add = $view.find('#add'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'phone', type: null},
+ tableIns;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 初始化表格操作栏各个按钮功能
+ table.on('tool(newInfoTable)', function (obj) {
+ var data = obj.data,
+ layEvent = obj.event;
+ if (layEvent === 'newsInfoUpdate') {
+ febs.modal.open('编辑', 'goodsView/newsInfoUpdate/' + data.id, {
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#newsInfo-update').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+ if (layEvent === 'delNewsInfo') {
+ febs.modal.confirm('删除', '确认删除？', function () {
+ delNewsInfo(data.id);
+ });
+ }
+ });
+
+ function delNewsInfo(id) {
+ febs.get(ctx + 'admin/goods/delNewsInfo/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
+
+ // 查询按钮
+ $query.on('click', function () {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ tableIns.reload({where: params, page: {curr: 1}});
+ });
+
+ // 刷新按钮
+ $reset.on('click', function () {
+ $searchForm[0].reset();
+ sortObject.type = 'null';
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ $add.on('click', function () {
+ febs.modal.open('新增', 'goodsView/newsInfoAdd/', {
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#newsInfo-add').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'newInfoTable',
+ url: ctx + 'admin/goods/getNewInfoList',
+ cols: [[
+ {field: 'title', title: '标题', minWidth: 120,align:'center'},
+ {field: 'categoryName', title: '分类', minWidth: 120,align:'center'},
+ {field: 'thumb', title: '缩略图',
+ templet: function (d) {
+ return '<a lay-event="seeImgThumb"><img id="seeImgThumb'+d.id+'" src="'+d.thumb+'" alt=""></a>';
+ }, minWidth: 150,align:'center'},
+ {templet: '#isTopSwitch', title: '是否首页显示', minWidth: 120,align:'center'},
+ {field: 'createTime', title: '创建时间', minWidth: 120,align:'center'},
+ {title: '操作',
+ templet: function (d) {
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="newsInfoUpdate" shiro:hasPermission="user:update">编辑</button>'
+ +'<button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delNewsInfo" shiro:hasPermission="user:update">删除</button>'
+ },minWidth: 300,align:'center'}
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ return {
+ };
+ }
+
+ form.on('switch(isTopSwitch)', function (data) {
+ console.log(data.value);
+ if (data.elem.checked) {
+ febs.post(ctx + 'admin/goods/topNews/' + data.value, null, function () {
+ febs.alert.success('设置成功');
+ $query.click();
+ });
+ } else {
+ febs.post(ctx + 'admin/goods/unTopNews/' + data.value, null, function () {
+ febs.alert.success('设置成功');
+ $query.click();
+ });
+ }
+ })
+ })
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/goods/newsInfoUpdate.html b/src/main/resources/templates/febs/views/goods/newsInfoUpdate.html
new file mode 100644
index 0000000..c32a1ca
--- /dev/null
+++ b/src/main/resources/templates/febs/views/goods/newsInfoUpdate.html
@@ -0,0 +1,233 @@
+<style>
+ #newsInfo-update {
+ padding: 20px 25px 25px 0;
+ }
+
+ #newsInfo-update .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #newsInfo-update #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #newsInfo-update .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+ #newsInfo-update img{
+ max-width:100px
+ }
+
+</style>
+<div class="layui-fluid" id="newsInfo-update">
+ <form class="layui-form" action="" lay-filter="newsInfo-update-form">
+ <div class="layui-form-item febs-hide">
+ <label class="layui-form-label febs-form-item-require">id：</label>
+ <div class="layui-input-block">
+ <input type="text" name="id" data-th-value="${newsInfo.id}">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">标题：</label>
+ <div class="layui-input-block">
+ <input type="text" name="title" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">分类：</label>
+ <div class="layui-input-block">
+ <select name="categoryId" class="news-category" id="news-category" >
+ <option value="">请选择</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">视频：</label>
+ <div class="layui-input-block">
+ <button type="button" class="layui-btn upload" id="upload" style="background-color: #009688; margin-bottom: 2px">上传文件</button>
+ <button type="button" class="layui-btn layui-btn-danger" id="uploadDel" style="margin-bottom: 2px">删除</button>
+ <input type="text" name="videoUrl" autocomplete="off" value="" id="videoUrl" class="layui-input" readonly>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">缩略图：</label>
+ <div class="layui-input-block">
+ <button type="button" class="layui-btn" id="imageUpload" style="background-color: #009688; margin-bottom: 2px">图片上传</button>
+ <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
+ <div class="layui-upload-list" id="thumbImage"></div>
+ </blockquote>
+ <div class="layui-word-aux">双击图片删除</div>
+ <div class="febs-hide">
+ <input type="text" id="thumb" name="thumb" autocomplete="off" class="layui-input" readonly>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">内容：</label>
+ <div class="layui-input-block">
+ <textarea id="lay_edit" name = "content" lay-verify="content" class="layui-textarea"></textarea>
+ </div>
+ </div>
+ <div class="layui-form-item febs-hide">
+ <button class="layui-btn" lay-submit="" lay-filter="newsInfo-update-form-submit" id="submit"></button>
+ </div>
+ </form>
+</div>
+
+<script data-th-inline="javascript">
+ layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree','layedit', 'laydate', 'upload'], function () {
+ var $ = layui.$,
+ febs = layui.febs,
+ layer = layui.layer,
+ upload = layui.upload,
+ formSelects = layui.formSelects,
+ form = layui.form,
+ laydate = layui.laydate,
+ layedit = layui.layedit,
+ newsInfo = [[${newsInfo}]],
+ $view = $('#newsInfo-update'),
+ $uploadDel = $view.find('#uploadDel'),
+ validate = layui.validate;
+
+ //(下拉框)
+ $.get(ctx + 'admin/goods/findAllCategoryList', function (data) {
+ var arr = data.data;
+ for (let i = 0; i < arr.length; i++) {
+ $(".news-category").append("<option value='" + arr[i].id + "'>" + arr[i].title + "</option>");
+ }
+ layui.use('form', function () {
+ var form = layui.form;
+ form.render();
+ });
+
+ initUserValue();
+ });
+
+ form.render();
+ laydate.render({
+ elem: '#febs-form-group-date'
+ });
+
+
+ layedit.set({ //设置图片接口
+ uploadImage: {
+ url: 'admin/goods/uploadFileBase64', //接口url
+ type: 'post',
+ }
+ });
+
+ //创建一个编辑器
+ var index = layedit.build('lay_edit',{
+ height: 300
+ });
+ form.verify({
+ //content富文本域中的lay-verify值
+ content: function(value) {
+ return layedit.sync(index);
+ }
+ });
+
+ formSelects.render();
+ form.on('submit(newsInfo-update-form-submit)', function (data) {
+ febs.post(ctx + 'admin/goods/updateNewsInfo', data.field, function () {
+ layer.closeAll();
+ febs.alert.success('操作成功');
+ $('#febs-newInfo').find('#reset').click();
+ });
+ return false;
+ });
+
+ upload.render({
+ elem: '#imageUpload'
+ ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+ ,multiple: false
+ ,before: function(obj){
+ //预读本地文件示例，不支持ie8
+ obj.preview(function(index, file, result){
+ if ($("#thumb").val()) {
+ $('#thumbImage').html('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img new-image" style="width: 130px">')
+ } else {
+ $('#thumbImage').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img new-image" style="width: 130px">')
+ }
+ // $('#thumbImage').html('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img new-image" style="width: 100px">')
+ });
+ }
+ ,done: function(res){
+ $("#thumb").val(res.data.src);
+
+ imgUnBind(".new-image");
+ imgSingleBind();
+ }
+ });
+
+ function imgUnBind(className) {
+ $(className).each(function() {
+ $(this).unbind('dblclick');
+ })
+ }
+
+ function imgSingleBind() {
+ $(".new-image").each(function(index, element) {
+ $(this).on("dblclick", function() {
+ var imgThumb = $(".new-image")[index];
+ $(imgThumb).remove();
+ $("#thumb").val("");
+
+ imgUnBind(".new-image");
+ imgSingleBind();
+ });
+ })
+ }
+
+ $uploadDel.on('click', function () {
+ $("#videoUrl").val('');
+ });
+
+
+ bindUpload();
+ function bindUpload() {
+ upload.render({
+ elem: '.upload'
+ ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+ ,accept: 'file'
+ ,before: function(obj){
+ layer.msg('上传中', {icon: 16, time: 0});
+ }
+ ,done: function(res){
+ var item = this.item;
+ //如果上传失败
+ if(res.code !== 0){
+ return layer.msg('上传失败');
+ }
+
+ // $(item).parent().prev().find('input').val(res.data[0]);
+ $("#videoUrl").val(res.data.src);
+ layer.msg('上传完毕', {icon: 1});
+ }
+ ,error: function(err){
+ return layer.msg('上传失败');
+ }
+ });
+ }
+
+ function initUserValue() {
+ var thumb = newsInfo.thumb;
+ $('#thumbImage').html('<img src="' + thumb + '" alt="" class="layui-upload-img new-image" style="width: 100px">')
+ form.val("newsInfo-update-form", {
+ "id": newsInfo.id,
+ "categoryId": newsInfo.categoryId,
+ "title": newsInfo.title,
+ "videoUrl": newsInfo.videoUrl,
+ "thumb": newsInfo.thumb,
+ "content": newsInfo.content,
+ });
+ imgSingleBind();
+
+ layedit.setContent(index, newsInfo.content, false);
+ }
+ });
+</script>
\ No newline at end of file
--
Gitblit v1.9.1