1

ydd_mer_java/crmeb-admin/src/main/java/com/zbkj/admin/controller/platform/PcShoppingController.java

@@ -238,4 +238,22 @@ public class PcShoppingController {
         }
         return CommonResult.failed().setMessage("保存失败");
     }
+
+    @PreAuthorize("hasAuthority('platform:pc:shopping:home:banner:get')")
+    @ApiOperation(value = "获取各板块banner配置")
+    @RequestMapping(value = "/home/banner/get/{tag}", method = RequestMethod.GET)
+    public CommonResult<PcHomeBannerListVo> getBanner(@PathVariable("tag") Integer tag) {
+        PcHomeBannerListVo vo = new PcHomeBannerListVo();
+        vo.setBannerList(pcShoppingService.getBanner(tag));
+        return CommonResult.success(vo);
+    }
+    @PreAuthorize("hasAuthority('platform:pc:shopping:home:banner:save')")
+    @ApiOperation(value = "保存各板块banner配置")
+    @RequestMapping(value = "/home/banner/save/{tag}", method = RequestMethod.POST)
+    public CommonResult<Object> saveBanner(@PathVariable("tag") Integer tag,@RequestBody @Validated   PcHomeBannerListVo voRequest) {
+        if (pcShoppingService.saveBanner(voRequest.getBannerList(),tag)) {
+            return CommonResult.success().setMessage("保存成功");
+        }
+        return CommonResult.failed().setMessage("保存失败");
+    }
 }

ydd_mer_java/crmeb-admin/src/main/java/com/zbkj/admin/service/PcShoppingService.java

@@ -143,4 +143,18 @@ public interface PcShoppingService {
      * 保存PC商城首页导航配置
      */
     Boolean saveHomeNavigation(List<PcHomeNavigationVo> voListRequest);
+
+    /**
+     * PC商城首页导航配置
+     * @param tag
+     * @return
+     */
+    List<PcHomeBannerVo> getBanner(Integer tag);
+    /**
+     * 保存PC商城首页导航配置
+     * @param bannerVoList
+     * @param tag
+     * @return
+     */
+    Boolean  saveBanner(List<PcHomeBannerVo> bannerVoList,Integer tag);
 }

ydd_mer_java/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/PcShoppingServiceImpl.java

@@ -633,6 +633,8 @@ public class PcShoppingServiceImpl implements PcShoppingService {
             vo.setLinkUrl(config.getLinkUrl());
             vo.setSort(config.getSort());
             vo.setStatus(config.getStatus());
+            vo.setIsHighLight(config.getIsHighLight());
+            vo.setImageUrl(config.getImageUrl());
             voList.add(vo);
         }
         return voList;
@@ -654,18 +656,56 @@ public class PcShoppingServiceImpl implements PcShoppingService {
 //        if (counted > 6) {
 //            throw new CrmebException("自定义首页导航最多开启6个");
 //        }
-        PcHomeNavigationVo pcHomeNavigationVo = voListRequest.stream().filter(e -> e.getName().length() > 6).findFirst().orElse(null);
+        PcHomeNavigationVo pcHomeNavigationVo = voListRequest.stream().filter(e -> e.getName().length() > 10).findFirst().orElse(null);
         if (ObjectUtil.isNotNull(pcHomeNavigationVo)) {
-            throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "自定义首页导航名称最长为6个字符");
+            throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "自定义首页导航名称最长为10个字符");
         }
         List<GroupConfig> configList = voListRequest.stream().map(vo -> {
             GroupConfig groupConfig = new GroupConfig();
             groupConfig.setTag(GroupConfigConstants.TAG_HOME_NAVIGATION);
+            //groupConfig.setTag(vo.getTag());
             groupConfig.setMerId(0);
             groupConfig.setName(vo.getName());
             groupConfig.setLinkUrl(vo.getLinkUrl());
             groupConfig.setSort(vo.getSort());
             groupConfig.setStatus(vo.getStatus());
+            groupConfig.setIsHighLight(vo.getIsHighLight());
+            groupConfig.setImageUrl(vo.getImageUrl());
+            return groupConfig;
+        }).collect(Collectors.toList());
+        return groupConfigService.saveList(configList);
+
+    }
+
+    @Override
+    public List<PcHomeBannerVo> getBanner(Integer tag) {
+        List<GroupConfig> configList = groupConfigService.findByTag(tag, Constants.SORT_ASC, null);
+        if (CollUtil.isEmpty(configList)) {
+            return new ArrayList<>();
+        }
+        Iterator<GroupConfig> iterator = configList.iterator();
+        List<PcHomeBannerVo> voList = new ArrayList<>();
+        while (iterator.hasNext()) {
+            GroupConfig config = iterator.next();
+            PcHomeBannerVo vo = new PcHomeBannerVo();
+            BeanUtils.copyProperties(config, vo);
+            voList.add(vo);
+        }
+        return voList;
+    }
+    @Override
+    public Boolean  saveBanner(List<PcHomeBannerVo> bannerVoList,Integer tag){
+        if (CollUtil.isEmpty(bannerVoList) || bannerVoList.size() > 10) {
+            throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "banner数量为1~10");
+        }
+        List<GroupConfig> configList = bannerVoList.stream().map(vo -> {
+            GroupConfig groupConfig = new GroupConfig();
+            groupConfig.setTag(tag);
+            groupConfig.setImageUrl(vo.getImageUrl());
+            groupConfig.setName(vo.getName());
+            groupConfig.setLinkUrl(vo.getLinkUrl());
+            groupConfig.setStatus(vo.getStatus());
+            groupConfig.setSort(vo.getSort());
             return groupConfig;
         }).collect(Collectors.toList());
         return groupConfigService.saveList(configList);

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/constants/GroupConfigConstants.java

@@ -40,4 +40,13 @@ public class GroupConfigConstants {
     public static final Integer TAG_INTEGRAL_INTERVAL = 12;
     /** tag_开屏广告数据 */
     public static final Integer TAG_SPLASH_AD_DATA = 13;
+    /** tag-表白墙banner */
+    public static final Integer TAG_CONFESSION_BANNER = 14;
+    /** tag-游戏搭子banner */
+    public static final Integer TAG_GAME_BANNER = 15;
+    /** tag-二手交易banner */
+    public static final Integer TAG_SECOND_TRAN_BANNER = 16;
+    /** tag-代取快快banner */
+    public static final Integer TAG_PICK_EXP_BANNER = 17;
+
 }

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/model/community/CommunityCategory.java

@@ -10,6 +10,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -60,6 +61,9 @@ public class CommunityCategory implements Serializable {
     @ApiModelProperty("更新时间")
     @TableField("update_time")
     private Date updateTime;
+    @TableField("icon")
+    @ApiModelProperty(value = "图片地址")
+    private String icon;
 
 
 }

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/model/community/CommunityNotes.java

@@ -121,5 +121,9 @@ public class CommunityNotes implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @ApiModelProperty("标签路径")
+    @TableField(exist = false)
+    private String icon;
+
 
 }

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/model/system/GroupConfig.java

@@ -33,7 +33,7 @@ public class GroupConfig implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "标签:1-首页banner,2-首页推荐，3-经营理念，4-友情链接, 5-快捷入口，6-商户PC店铺Banner，7-商户PC店铺商品推荐，8-首页底部二维码，9-首页广告,10-首页导航,11-付费会员权益,12-积分区间,13-开屏广告")
+    @ApiModelProperty(value = "标签:1-首页banner,2-首页推荐，3-经营理念，4-友情链接, 5-快捷入口，6-商户PC店铺Banner，7-商户PC店铺商品推荐，8-首页底部二维码，9-首页广告,10-首页导航,11-付费会员权益,12-积分区间,13-开屏广告，14-表白墙导航")
     private Integer tag;
 
     @ApiModelProperty(value = "商户id,0-平台")
@@ -71,4 +71,6 @@ public class GroupConfig implements Serializable {
 
     @ApiModelProperty(value = "拓展字段")
     private String expand;
+
+    private Boolean isHighLight;
 }

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/request/CommunityCategorySaveRequest.java

@@ -37,6 +37,10 @@ public class CommunityCategorySaveRequest implements Serializable {
     @Length(max = 8, message = "分类名称最多为8个字符")
     private String name;
 
+    @ApiModelProperty(value = "图片地址", required = true)
+    @NotBlank(message = "请选择图片")
+    private String icon;
+
     @ApiModelProperty(value = "是否显示：1-显示，0-不显示", required = true)
     @NotNull(message = "显示状态不能为空")
     @Range(min = 0, max = 1, message = "未知的显示状态")

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/request/CommunityNoteFrontDiscoverRequest.java

@@ -25,4 +25,6 @@ public class CommunityNoteFrontDiscoverRequest extends PageParamRequest {
 
     @ApiModelProperty("社区分类ID")
     private Integer categoryId;
+    @ApiModelProperty(value = "查询选项， 0 = 全部， 1 = 评论， 2 = 点赞， 3 = 有图", allowableValues = "range[0,1,2,3]")
+    private Integer secondType;
 }

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/request/CommunityNoteFrontSearchRequest.java

@@ -39,5 +39,7 @@ public class CommunityNoteFrontSearchRequest extends PageParamRequest {
 
     @ApiModelProperty("排序规则（默认id倒序）:star-星级排序，hot-最热排序")
     private String collation = "id";
+    @ApiModelProperty("社区二级分类 是否有点赞，评论，有图")
+    private Integer secondType;
 
 }

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/response/CommunityNoteFrontPageResponse.java

@@ -61,4 +61,14 @@ public class CommunityNoteFrontPageResponse implements Serializable {
 
     @ApiModelProperty("拒绝理由")
     private String refusal;
+    @ApiModelProperty("笔记正文")
+    private String content;
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("学校")
+    private String school;
+    @ApiModelProperty("类别")
+    private Integer categoryId;
+    @ApiModelProperty("标签图表")
+    private String icon;
 }

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/response/IndexInfoResponse.java

@@ -2,6 +2,8 @@ package com.zbkj.common.response;
 
 import com.zbkj.common.model.article.Article;
 import com.zbkj.common.model.product.ProductCategory;
+import com.zbkj.common.vo.PcHomeBannerVo;
+import com.zbkj.common.vo.PcHomeNavigationVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,13 +35,14 @@ public class IndexInfoResponse implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "首页banner滚动图")
-    private List<HashMap<String, Object>> banner;
+    //private List<HashMap<String, Object>> banner;
+    List<PcHomeBannerVo> banner;
 
     @ApiModelProperty(value = "首页金刚区")
     private List<HashMap<String, Object>> menus;
 
     @ApiModelProperty(value = "新闻简报消息滚动")
-    private List<Article> headline;
+    private List<ArticleResponse> headline;
 
     @ApiModelProperty(value = "移动端顶部logo")
     private String logoUrl;
@@ -62,6 +65,10 @@ public class IndexInfoResponse implements Serializable {
 
     @ApiModelProperty(value = "商户对应推荐商品")
     private List<SeckillProductPageResponse> proList;
-    @ApiModelProperty(value = "显示产品大类")
-    private List<ProductCategory>  cateList;
+   // @ApiModelProperty(value = "显示产品大类")
+    //private List<ProductCategory>  cateList;
+    @ApiModelProperty(value = "导航栏")
+    private List<PcHomeNavigationVo> navigatList;
+    @ApiModelProperty(value = "首页默认大类id")
+    private Integer cateId;
 }

ydd_mer_java/crmeb-common/src/main/java/com/zbkj/common/vo/PcHomeNavigationVo.java

@@ -47,4 +47,10 @@ public class PcHomeNavigationVo implements Serializable {
 
     @ApiModelProperty(value = "状态:是否显示")
     private Boolean status;
+    @ApiModelProperty(value = "高亮:是否显示")
+    private Boolean isHighLight;
+    @ApiModelProperty(value = "图片地址")
+    private String imageUrl;
+    @ApiModelProperty(value = "归属模块")
+    private Integer tag;
 }

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/CommunityController.java

@@ -8,6 +8,7 @@ import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.CommunityRecommendAuthorResponse;
 import com.zbkj.common.response.CommunityTopicFrontCountResponse;
 import com.zbkj.common.response.CommunityUserHomePageResponse;
+import com.zbkj.common.response.IndexInfoResponse;
 import com.zbkj.common.result.CommonResult;
 import com.zbkj.front.service.CommunityFrontService;
 import io.swagger.annotations.Api;
@@ -36,7 +37,11 @@ public class CommunityController {
 
     @Autowired
     private CommunityFrontService communityFrontService;
-
+    @ApiOperation(value = "首页数据")
+    @RequestMapping(value = "/info", method = RequestMethod.GET)
+    public CommonResult<IndexInfoResponse> getIndexInfo() {
+        return CommonResult.success(communityFrontService.getIndexInfo());
+    }
     @ApiOperation(value = "社区分类列表")
     @RequestMapping(value = "/category/list", method = RequestMethod.GET)
     public List<CommunityCategory> getAllCategory() {

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/ExpressController.java

@@ -1,20 +1,30 @@
 package com.zbkj.front.controller;
 
+import cn.hutool.core.collection.CollUtil;
+import com.zbkj.common.constants.Constants;
+import com.zbkj.common.constants.GroupConfigConstants;
 import com.zbkj.common.model.express.Express;
 import com.zbkj.common.model.express.ExpressSpce;
 import com.zbkj.common.model.express.ExpressTip;
+import com.zbkj.common.model.system.GroupConfig;
+import com.zbkj.common.response.IndexInfoResponse;
 import com.zbkj.common.result.CommonResult;
+import com.zbkj.common.vo.PcHomeBannerVo;
 import com.zbkj.service.service.ExpressService;
 import com.zbkj.service.service.ExpressSpceService;
 import com.zbkj.service.service.ExpressTipService;
+import com.zbkj.service.service.GroupConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -37,6 +47,9 @@ public class ExpressController {
     @Autowired
     private ExpressTipService expressTipService;
 
+    @Autowired
+    private GroupConfigService groupConfigService;
+
     @ApiOperation(value = "获取物流公司列表")
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     public CommonResult<List<Express>> getAllList() {
@@ -47,6 +60,25 @@ public class ExpressController {
     public CommonResult<List<ExpressSpce>> getSpceAllList() {
         return CommonResult.success(expressSpceService.findAll());
     }
+    @ApiOperation(value = "首页数据")
+    @RequestMapping(value = "/info", method = RequestMethod.GET)
+    public CommonResult<IndexInfoResponse> getIndexInfo() {
+        List<GroupConfig> configList = groupConfigService.findByTag(GroupConfigConstants.TAG_PICK_EXP_BANNER, Constants.SORT_ASC, null);
+        if (CollUtil.isEmpty(configList)) {
+            return CommonResult.success();
+        }
+        Iterator<GroupConfig> iterator = configList.iterator();
+        List<PcHomeBannerVo> voList = new ArrayList<>();
+        while (iterator.hasNext()) {
+            GroupConfig config = iterator.next();
+            PcHomeBannerVo vo = new PcHomeBannerVo();
+            BeanUtils.copyProperties(config, vo);
+            voList.add(vo);
+        }
+        IndexInfoResponse response=new IndexInfoResponse();
+        response.setBanner(voList);
+        return CommonResult.success(response);
+    }
     @ApiOperation(value = "获取小费列表")
     @RequestMapping(value = "/tip", method = RequestMethod.GET)
     public CommonResult<List<ExpressTip>> getTipAllList() {

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/ExpressOrderController.java

@@ -74,4 +74,21 @@ public class ExpressOrderController {
     public CommonResult<ExpressOrderFrontDetailResponse> orderDetail(@PathVariable String orderNo) {
         return CommonResult.success(expressOrderService.frontDetail(orderNo));
     }
+    @ApiOperation(value = "订单取消")
+    @RequestMapping(value = "/cancel/{orderNo}", method = RequestMethod.POST)
+    public CommonResult<Boolean> cancel(@PathVariable(value = "orderNo") String orderNo) {
+        if (expressOrderService.cancel(orderNo)) {
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+
+    @ApiOperation(value = "删除订单")
+    @RequestMapping(value = "/delete/{orderNo}", method = RequestMethod.POST)
+    public CommonResult<Boolean> delete(@PathVariable(value = "orderNo") String orderNo) {
+        if (expressOrderService.delete(orderNo)) {
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
 }

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/service/CommunityFrontService.java

@@ -16,6 +16,11 @@ import java.util.List;
  * @Version 1.0
  */
 public interface CommunityFrontService {
+    /**
+     * 首页信息
+     * @return IndexInfoResponse
+     */
+    IndexInfoResponse getIndexInfo();
 
     /**
      * 获取所有社区分类

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/service/FrontExpressOrderService.java

@@ -76,6 +76,19 @@ public interface FrontExpressOrderService {
      * @return OrderFrontDetailResponse
      */
     ExpressOrderFrontDetailResponse frontDetail(String orderNo);
+    /**
+     * 取消订单
+     *
+     * @param orderNo 订单编号
+     */
+    Boolean cancel(String orderNo);
+
+    /**
+     * 删除订单
+     * @param orderNo 订单号
+     * @return Boolean
+     */
+    Boolean delete(String orderNo);
 
 
 }

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/CommunityFrontServiceImpl.java

@@ -1,14 +1,18 @@
 package com.zbkj.front.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.zbkj.common.constants.CommunityConstants;
 import com.zbkj.common.constants.Constants;
+import com.zbkj.common.constants.GroupConfigConstants;
 import com.zbkj.common.constants.UserLevelConstants;
 import com.zbkj.common.exception.CrmebException;
+import com.zbkj.common.model.article.ArticleCategory;
 import com.zbkj.common.model.community.*;
+import com.zbkj.common.model.system.GroupConfig;
 import com.zbkj.common.model.system.SystemUserLevel;
 import com.zbkj.common.model.user.User;
 import com.zbkj.common.page.CommonPage;
@@ -19,16 +23,14 @@ import com.zbkj.common.result.CommunityResultCode;
 import com.zbkj.common.result.MarketingResultCode;
 import com.zbkj.common.result.UserResultCode;
 import com.zbkj.common.utils.CrmebUtil;
+import com.zbkj.common.vo.PcHomeBannerVo;
 import com.zbkj.front.service.CommunityFrontService;
 import com.zbkj.service.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -65,6 +67,20 @@ public class CommunityFrontServiceImpl implements CommunityFrontService {
     private CommunityReplyLikeService communityReplyLikeService;
     @Autowired
     private AsyncService asyncService;
+    @Autowired
+    private GroupConfigService groupConfigService;
+
+    @Autowired
+    private ArticleService articleService;
+    @Autowired
+    private ArticleCategoryService articleCategoryService;
+    @Override
+    public IndexInfoResponse getIndexInfo() {
+        IndexInfoResponse indexInfoResponse = new IndexInfoResponse();
+        indexInfoResponse.setBanner(getBanner());
+        indexInfoResponse.setHeadline(getHeadLine());
+        return indexInfoResponse;
+    }
 
     /**
      * 获取所有社区分类
@@ -743,6 +759,10 @@ public class CommunityFrontServiceImpl implements CommunityFrontService {
             response.setAuthorName(userMap.get(note.getUid()).getNickname());
             response.setAuthorAvatar(userMap.get(note.getUid()).getAvatar());
             response.setLikeNum(note.getLikeNum());
+            response.setContent(note.getContent());
+            response.setCreateTime(note.getCreateTime());
+            response.setCategoryId(note.getCategoryId());
+            response.setIcon(note.getIcon());
             if (ObjectUtil.isNotNull(userId) && userId > 0) {
                 response.setUserIsLike(communityNotesRelationService.isLikeByUid(note.getId(), userId));
             }
@@ -756,4 +776,34 @@ public class CommunityFrontServiceImpl implements CommunityFrontService {
             return response;
         }).collect(Collectors.toList());
     }
+    /**
+     * 获取Banner
+     * @return
+     */
+    private List<PcHomeBannerVo> getBanner(){
+        List<GroupConfig> configList = groupConfigService.findByTag(GroupConfigConstants.TAG_CONFESSION_BANNER, Constants.SORT_ASC, null);
+        if (CollUtil.isEmpty(configList)) {
+            return new ArrayList<>();
+        }
+        Iterator<GroupConfig> iterator = configList.iterator();
+        List<PcHomeBannerVo> voList = new ArrayList<>();
+        while (iterator.hasNext()) {
+            GroupConfig config = iterator.next();
+            PcHomeBannerVo vo = new PcHomeBannerVo();
+            BeanUtils.copyProperties(config, vo);
+            voList.add(vo);
+        }
+        return voList;
+    }
+    /**
+     * 获取Banner
+     * @return
+     */
+    private List<ArticleResponse>  getHeadLine(){
+        ArticleCategory articleCategory=articleCategoryService.getByNameException("表白");
+        if(ObjectUtil.isNotNull(articleCategory)){
+            return articleService.getArticleByCateId(articleCategory.getId());
+        }
+        return CollectionUtil.newArrayList();
+    }
 }

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontExpressOrderServiceImpl.java

@@ -502,4 +502,44 @@ public class FrontExpressOrderServiceImpl implements FrontExpressOrderService {
         }
         return response;
     }
+
+    @Override
+    public Boolean cancel(String orderNo) {
+        Integer uid = userService.getUserIdException();
+        ExpressOrder order = orderService.getByOrderNo(orderNo);
+        if (!order.getUid().equals(uid)) {
+            throw new CrmebException(OrderResultCode.ORDER_NOT_EXIST);
+        }
+        if (order.getPaid()) {
+            throw new CrmebException(OrderResultCode.ORDER_PAID);
+        }
+        if (order.getStatus().equals(OrderConstants.ORDER_STATUS_CANCEL)) {
+            throw new CrmebException(OrderResultCode.ORDER_CANCEL);
+        }
+        Boolean cancel = orderService.cancel(orderNo, true);
+        if (cancel) {
+            redisUtil.lPush(TaskConstants.ORDER_TASK_REDIS_KEY_AFTER_CANCEL_BY_USER, order.getOrderNo());
+        }
+        return cancel;
+    }
+
+    @Override
+    public Boolean delete(String orderNo) {
+        Integer userId = userService.getUserIdException();
+        ExpressOrder order = orderService.getByOrderNo(orderNo);
+        if (!order.getUid().equals(userId)) {
+            throw new CrmebException(OrderResultCode.ORDER_NOT_EXIST);
+        }
+        if (!(order.getStatus().equals(OrderConstants.ORDER_STATUS_TAKE_DELIVERY) ||order.getStatus().equals(OrderConstants.ORDER_STATUS_COMPLETE) || order.getStatus().equals(OrderConstants.ORDER_STATUS_CANCEL))) {
+            throw new CrmebException(OrderResultCode.ORDER_STATUS_ABNORMAL, "未完成订单无法删除");
+        }
+        if (order.getIsUserDel()) {
+            throw new CrmebException(OrderResultCode.ORDER_DELETE);
+        }
+        order.setIsUserDel(true);
+        return transactionTemplate.execute(e -> {
+            orderService.updateById(order);
+            return Boolean.TRUE;
+        });
+    }
 }

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/IndexServiceImpl.java

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.zbkj.common.constants.*;
 import com.zbkj.common.model.merchant.Merchant;
 import com.zbkj.common.model.product.Product;
+import com.zbkj.common.model.product.ProductCategory;
 import com.zbkj.common.model.seckill.SeckillProduct;
 import com.zbkj.common.model.system.GroupConfig;
 import com.zbkj.common.model.system.SystemConfig;
@@ -15,10 +16,9 @@ import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.request.SiteSearchRequest;
 import com.zbkj.common.response.*;
 import com.zbkj.common.utils.CrmebUtil;
-import com.zbkj.common.vo.MyRecord;
-import com.zbkj.common.vo.SplashAdConfigVo;
-import com.zbkj.common.vo.SplashAdDataVo;
+import com.zbkj.common.vo.*;
 import com.zbkj.front.service.IndexService;
+import com.zbkj.front.service.PcShoppingService;
 import com.zbkj.front.service.SeckillService;
 import com.zbkj.service.service.*;
 import org.springframework.beans.BeanUtils;
@@ -71,6 +71,8 @@ public class IndexServiceImpl implements IndexService {
     private GroupConfigService groupConfigService;
     @Autowired
     private ProductCategoryService productCategoryService;
+    @Autowired
+    private PcShoppingService shoppingService;
 
     /**
      * 首页数据
@@ -84,10 +86,16 @@ public class IndexServiceImpl implements IndexService {
     @Override
     public IndexInfoResponse getIndexInfo(Double latitude, Double longitude,Integer cateId) {
         IndexInfoResponse indexInfoResponse = new IndexInfoResponse();
-        indexInfoResponse.setBanner(systemGroupDataService.getListMapByGid(GroupDataConstants.GROUP_DATA_ID_INDEX_BANNER)); //首页banner滚动图
-        indexInfoResponse.setMenus(systemGroupDataService.getListMapByGid(GroupDataConstants.GROUP_DATA_ID_INDEX_MENU)); //首页金刚区
-        indexInfoResponse.setCateList(productCategoryService.getFrontShowList());//首页导航区
-        indexInfoResponse.setProList(merchantService.findProIndexList(latitude,longitude,indexInfoResponse.getCateList().size()>0?indexInfoResponse.getCateList().get(0).getId():null,2));//首页活动精选区
+        //indexInfoResponse.setBanner(systemGroupDataService.getListMapByGid(GroupDataConstants.GROUP_DATA_ID_INDEX_BANNER)); //首页banner滚动图
+        indexInfoResponse.setBanner(shoppingService.getHomeBanner()); //首页banner滚动图
+        //indexInfoResponse.setMenus(systemGroupDataService.getListMapByGid(GroupDataConstants.GROUP_DATA_ID_INDEX_MENU)); //首页金刚区
+        //indexInfoResponse.setCateList(productCategoryService.getFrontShowList());//首页导航区
+        indexInfoResponse.setNavigatList(getNavigation());
+        List<ProductCategory> categoryList=productCategoryService.getFrontShowList();
+        if(categoryList!=null && categoryList.size()>0) {
+            indexInfoResponse.setProList(merchantService.findProIndexList(latitude, longitude, categoryList.size() > 0 ? categoryList.get(0).getId() : null, 2));//首页活动精选区
+            indexInfoResponse.setCateId(categoryList.get(0).getId());
+        }
         indexInfoResponse.setLogoUrl(systemAttachmentService.getCdnUrl());// 移动端顶部logo 1.3版本 DIY 已经替代
         indexInfoResponse.setWechatBrowserVisit(systemConfigService.getValueByKey(SysConfigConstants.CONFIG_WECHAT_BROWSER_VISIT));// 是否开启微信公众号授权登录
         // 客服部分
@@ -99,7 +107,7 @@ public class IndexServiceImpl implements IndexService {
                 indexInfoResponse.setConsumerHotline(systemConfigService.getValueByKey(SysConfigConstants.CONFIG_CONSUMER_HOTLINE));
         }
         // 新闻头条
-        indexInfoResponse.setHeadline(articleService.getIndexHeadline());
+        indexInfoResponse.setHeadline(articleService.getHotList());
 
         // 店铺街开关
         indexInfoResponse.setShopStreetSwitch(systemConfigService.getValueByKey(SysConfigConstants.CONFIG_KEY_SHOP_STREET_SWITCH));
@@ -367,5 +375,24 @@ public class IndexServiceImpl implements IndexService {
         }
         return configVo;
     }
+    /**
+     * 获取Banner
+     * @return
+     */
+    private List<PcHomeNavigationVo> getNavigation(){
+        List<GroupConfig> configList = groupConfigService.findByTag(GroupConfigConstants.TAG_HOME_NAVIGATION, Constants.SORT_ASC, null);
+        if (CollUtil.isEmpty(configList)) {
+            return new ArrayList<>();
+        }
+        Iterator<GroupConfig> iterator = configList.iterator();
+        List<PcHomeNavigationVo> voList = new ArrayList<>();
+        while (iterator.hasNext()) {
+            GroupConfig config = iterator.next();
+            PcHomeNavigationVo vo = new PcHomeNavigationVo();
+            BeanUtils.copyProperties(config, vo);
+            voList.add(vo);
+        }
+        return voList;
+    }
 }
 

ydd_mer_java/crmeb-service/src/main/java/com/zbkj/service/ExpressOrderService.java

@@ -42,4 +42,12 @@ public interface ExpressOrderService extends IService<ExpressOrder> {
      * @param outTradeNo 商户系统内部的订单号
      */
     ExpressOrder getByOutTradeNo(String outTradeNo);
+    /**
+     * 取消订单
+     *
+     * @param orderNo 订单编号
+     * @param isUser  是否用户取消
+     * @return Boolean
+     */
+    Boolean cancel(String orderNo, Boolean isUser);
 }

ydd_mer_java/crmeb-service/src/main/java/com/zbkj/service/service/ArticleCategoryService.java

@@ -60,4 +60,12 @@ public interface ArticleCategoryService extends IService<ArticleCategory> {
      * 获取移动端文章分类列表
      */
     List<ArticleCategoryResponse> getFrontList();
+
+    /**
+     * 模糊查询
+     * @param name
+     * @return
+     */
+
+    ArticleCategory getByNameException(String name);
 }

ydd_mer_java/crmeb-service/src/main/java/com/zbkj/service/service/ArticleService.java

@@ -107,7 +107,7 @@ public interface ArticleService extends IService<Article> {
     /**
      * 获取首页新闻头条
      */
-    List<Article> getIndexHeadline();
+    List<ArticleResponse> getArticleByCateId(Integer categoryId);
 
     /**
      * 文章开关

ydd_mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/ArticleCategoryServiceImpl.java

@@ -168,5 +168,16 @@ public class ArticleCategoryServiceImpl extends ServiceImpl<ArticleCategoryDao,
         }
         return responseList;
     }
+    @Override
+    public ArticleCategory getByNameException(String name) {
+        LambdaQueryWrapper<ArticleCategory> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ArticleCategory::getIsDel, false);
+        lqw.eq(ArticleCategory::getStatus, true);
+        lqw.select(ArticleCategory::getId, ArticleCategory::getName);
+        lqw.and(c -> c.like(ArticleCategory::getName, name)
+                );
+        lqw.last(" limit 1");
+        return dao.selectOne(lqw);
+    }
 }
 

ydd_mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/ArticleServiceImpl.java

@@ -308,15 +308,27 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleDao, Article> impleme
      * 获取首页新闻头条
      */
     @Override
-    public List<Article> getIndexHeadline() {
+    public List<ArticleResponse> getArticleByCateId(Integer categoryId) {
+
+
         LambdaQueryWrapper<Article> lqw = Wrappers.lambdaQuery();
-        lqw.select(Article::getId, Article::getTitle);
-        lqw.eq(Article::getIsHot, true);
+//        lqw.select(Article::getId, Article::getTitle);
+//        lqw.and(c -> c.like(Merchant::getMallName, info.getKeyword())
+//                .or().like(Merchant::getOwnerId, info.getKeyword())
+//                .or().like(Merchant::getOwnerName, info.getKeyword()));
+        lqw.eq(Article::getCid, categoryId);
         lqw.eq(Article::getStatus, true);
         lqw.eq(Article::getIsDel, false);
         lqw.orderByDesc(Article::getSort);
         lqw.last(" limit 10");
-        return dao.selectList(lqw);
+        List<Article> articleList =dao.selectList(lqw);
+        return articleList.stream().map(e -> {
+            ArticleResponse articleResponse = new ArticleResponse();
+            BeanUtils.copyProperties(e, articleResponse);
+            return articleResponse;
+        }).collect(Collectors.toList());
+
+
     }
 
     /**

ydd_mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/CommunityCategoryServiceImpl.java

@@ -21,6 +21,7 @@ import com.zbkj.common.result.CommunityResultCode;
 import com.zbkj.service.dao.community.CommunityCategoryDao;
 import com.zbkj.service.service.CommunityCategoryService;
 import com.zbkj.service.service.CommunityNotesService;
+import com.zbkj.service.service.SystemAttachmentService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,6 +51,9 @@ public class CommunityCategoryServiceImpl extends ServiceImpl<CommunityCategoryD
     @Autowired
     private CommunityNotesService notesService;
 
+    @Autowired
+    private SystemAttachmentService systemAttachmentService;
+
     /**
      * 社区分类分页列表
      *
@@ -61,7 +65,7 @@ public class CommunityCategoryServiceImpl extends ServiceImpl<CommunityCategoryD
         Page<CommunityCategory> page = PageHelper.startPage(request.getPage(), request.getLimit());
         LambdaQueryWrapper<CommunityCategory> lqw = Wrappers.lambdaQuery();
         lqw.select(CommunityCategory::getId, CommunityCategory::getName, CommunityCategory::getSort,
-                CommunityCategory::getIsShow, CommunityCategory::getCreateTime);
+                CommunityCategory::getIsShow, CommunityCategory::getCreateTime,CommunityCategory::getIcon);
         if (StrUtil.isNotBlank(request.getName())) {
             lqw.like(CommunityCategory::getName, URLUtil.decode(request.getName()));
         }
@@ -71,6 +75,9 @@ public class CommunityCategoryServiceImpl extends ServiceImpl<CommunityCategoryD
         lqw.eq(CommunityCategory::getIsDel, Constants.COMMON_IS_FILED_ZERO);
         lqw.orderByDesc(CommunityCategory::getSort, CommunityCategory::getId);
         List<CommunityCategory> list = dao.selectList(lqw);
+//        list.stream().forEach(communityCategory->{
+//            communityCategory.setIcon(systemAttachmentService.clearPrefix(communityCategory.getIcon()));
+//        });
         return CommonPage.copyPageInfo(page, list);
     }
 
@@ -86,6 +93,7 @@ public class CommunityCategoryServiceImpl extends ServiceImpl<CommunityCategoryD
         }
         CommunityCategory category = new CommunityCategory();
         BeanUtils.copyProperties(request, category, "id");
+        category.setIcon(systemAttachmentService.clearPrefix(request.getIcon()));
         boolean save = save(category);
         if (!save) {
             throw new CrmebException("添加社区分类失败");
@@ -108,6 +116,7 @@ public class CommunityCategoryServiceImpl extends ServiceImpl<CommunityCategoryD
             throw new CrmebException(CommunityResultCode.COMMUNITY_CATEGORY_EXIST);
         }
         BeanUtils.copyProperties(request, category);
+        category.setIcon(systemAttachmentService.clearPrefix(request.getIcon()));
         boolean update = updateById(category);
         if (!update) {
             throw new CrmebException(CommonResultCode.ERROR.setMessage("编辑社区分类失败"));
@@ -171,7 +180,7 @@ public class CommunityCategoryServiceImpl extends ServiceImpl<CommunityCategoryD
     @Override
     public List<CommunityCategory> findListByShow(Integer isShow) {
         LambdaQueryWrapper<CommunityCategory> lqw = Wrappers.lambdaQuery();
-        lqw.select(CommunityCategory::getId, CommunityCategory::getName);
+        lqw.select(CommunityCategory::getId, CommunityCategory::getName,CommunityCategory::getIcon);
         if (ObjectUtil.isNotNull(isShow)) {
             lqw.eq(CommunityCategory::getIsShow, isShow);
         }

ydd_mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/CommunityNotesServiceImpl.java

@@ -17,6 +17,7 @@ import com.zbkj.common.constants.Constants;
 import com.zbkj.common.constants.UserConstants;
 import com.zbkj.common.dto.CommunityNotePageDateDto;
 import com.zbkj.common.exception.CrmebException;
+import com.zbkj.common.model.community.CommunityCategory;
 import com.zbkj.common.model.community.CommunityNotes;
 import com.zbkj.common.model.community.CommunityNotesProduct;
 import com.zbkj.common.model.user.User;
@@ -329,7 +330,7 @@ public class CommunityNotesServiceImpl extends ServiceImpl<CommunityNotesDao, Co
         Page<CommunityNotes> page = PageHelper.startPage(request.getPage(), request.getLimit());
         LambdaQueryWrapper<CommunityNotes> lqw = Wrappers.lambdaQuery();
         lqw.select(CommunityNotes::getId, CommunityNotes::getTitle, CommunityNotes::getCover, CommunityNotes::getUid,
-                CommunityNotes::getType, CommunityNotes::getLikeNum, CommunityNotes::getAuditStatus);
+                CommunityNotes::getType, CommunityNotes::getLikeNum, CommunityNotes::getAuditStatus,CommunityNotes::getCategoryId,CommunityNotes::getContent,CommunityNotes::getCreateTime);
         if (ObjectUtil.isNotNull(request.getCategoryId())) {
             lqw.eq(CommunityNotes::getCategoryId, request.getCategoryId());
         }
@@ -346,6 +347,17 @@ public class CommunityNotesServiceImpl extends ServiceImpl<CommunityNotesDao, Co
         if (ObjectUtil.isNotNull(request.getTopicId())) {
             lqw.apply("FIND_IN_SET({0}, topic_ids)", request.getTopicId());
         }
+        if (ObjectUtil.isNotNull(request.getSecondType())) {
+             if(request.getSecondType()==1){// 有评论
+                 lqw.lt(CommunityNotes::getReplyNum,0);
+             }
+            if(request.getSecondType()==2){// 有点赞
+                lqw.lt(CommunityNotes::getLikeNum,0);
+            }
+            if(request.getSecondType()==3){// 有图
+                lqw.isNotNull(CommunityNotes::getImage).or().isNotNull(CommunityNotes::getVideo);
+            }
+        }
         switch (request.getCollation()) {
             case "star":
                 lqw.orderByDesc(CommunityNotes::getStar, CommunityNotes::getId);
@@ -356,8 +368,13 @@ public class CommunityNotesServiceImpl extends ServiceImpl<CommunityNotesDao, Co
             default:
                 lqw.orderByDesc(CommunityNotes::getId);
         }
-
         List<CommunityNotes> list = dao.selectList(lqw);
+        list.stream().forEach(communityNote->{
+            CommunityCategory communityCategory=  categoryService.getById(communityNote.getCategoryId());
+            if(ObjectUtil.isNotNull(communityCategory)) {
+                communityNote.setIcon(communityCategory.getIcon());
+            }
+        });
         return CommonPage.copyPageInfo(page, list);
     }
 
@@ -369,12 +386,15 @@ public class CommunityNotesServiceImpl extends ServiceImpl<CommunityNotesDao, Co
     @Override
     public PageInfo<CommunityNotes> findDiscoverNoteList(CommunityNoteFrontDiscoverRequest request) {
         CommunityNoteFrontSearchRequest searchRequest = new CommunityNoteFrontSearchRequest();
-        if (ObjectUtil.isNotNull(request.getCategoryId())) {
+        if (ObjectUtil.isNotNull(request.getCategoryId())&& request.getCategoryId()>0) {
             searchRequest.setCategoryId(request.getCategoryId());
         }
         if (StrUtil.isNotBlank(request.getTitle())) {
             searchRequest.setTitle(URLUtil.decode(request.getTitle()));
         }
+        if(ObjectUtil.isNotNull(request.getSecondType())){
+            searchRequest.setSecondType(request.getSecondType());
+        }
         searchRequest.setAuditStatus(CommunityConstants.COMMUNITY_NOTE_AUDIT_SUCCESS);
         searchRequest.setCollation("star");
         searchRequest.setPage(request.getPage());
@@ -725,11 +745,15 @@ public class CommunityNotesServiceImpl extends ServiceImpl<CommunityNotesDao, Co
     public Map<Integer, CommunityNotes> getMapByIdList(List<Integer> noteIdList) {
         LambdaQueryWrapper<CommunityNotes> lqw = Wrappers.lambdaQuery();
         lqw.select(CommunityNotes::getId, CommunityNotes::getTitle, CommunityNotes::getCover, CommunityNotes::getUid,
-                CommunityNotes::getType, CommunityNotes::getLikeNum);
+                CommunityNotes::getType, CommunityNotes::getLikeNum, CommunityNotes::getContent, CommunityNotes::getCreateTime, CommunityNotes::getCategoryId);
         lqw.in(CommunityNotes::getId, noteIdList);
         List<CommunityNotes> list = dao.selectList(lqw);
         Map<Integer, CommunityNotes> map = new HashMap<>();
         list.forEach(e -> {
+            CommunityCategory communityCategory=  categoryService.getById(e.getCategoryId());
+            if(ObjectUtil.isNotNull(communityCategory)) {
+                e.setIcon(communityCategory.getIcon());
+            }
             map.put(e.getId(), e);
         });
         return map;

ydd_mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExpressOrderServiceImpl.java

@@ -113,4 +113,15 @@ public class ExpressOrderServiceImpl extends ServiceImpl<ExpressOrderDao, Expres
         }
         return order;
     }
+
+    @Override
+    public Boolean cancel(String orderNo, Boolean isUser) {
+        LambdaUpdateWrapper<ExpressOrder> wrapper = Wrappers.lambdaUpdate();
+        wrapper.set(ExpressOrder::getCancelStatus, isUser ? OrderConstants.ORDER_CANCEL_STATUS_USER : OrderConstants.ORDER_CANCEL_STATUS_SYSTEM);
+        wrapper.set(ExpressOrder::getStatus, OrderConstants.ORDER_STATUS_CANCEL);
+        wrapper.eq(ExpressOrder::getOrderNo, orderNo);
+        wrapper.eq(ExpressOrder::getPaid, false);
+        wrapper.eq(ExpressOrder::getStatus, OrderConstants.ORDER_STATUS_WAIT_PAY);
+        return update(wrapper);
+    }
 }

ydd_mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/PageLayoutServiceImpl.java

@@ -67,7 +67,7 @@ public class PageLayoutServiceImpl implements PageLayoutService {
         List<SystemGroupData> menuList = systemGroupDataService.findListByGid(GroupDataConstants.GROUP_DATA_ID_INDEX_MENU);
         response.setIndexMenu(convertData(menuList));
         // 首页新闻
-        response.setIndexNews(articleService.getIndexHeadline());
+       // response.setIndexNews(articleService.getIndexHeadline());
         // 个人中心页服务
         List<SystemGroupData> userMenuList = systemGroupDataService.findListByGid(GroupDataConstants.GROUP_DATA_ID_USER_CENTER_MENU);
         response.setUserMenu(convertData(userMenuList));