Merge remote-tracking branch 'origin/v2' into v2

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/model/vo/comment/request/MemberTradeCommentSubmitVO.java

@@ -32,7 +32,15 @@ public class MemberTradeCommentSubmitVO implements Serializable {
         return orderId;
     }
 
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
     public List<MemberTradeCommentSubmitDetailVO> getCommentSubmitDetailList() {
         return commentSubmitDetailList;
     }
+
+    public void setCommentSubmitDetailList(List<MemberTradeCommentSubmitDetailVO> commentSubmitDetailList) {
+        this.commentSubmitDetailList = commentSubmitDetailList;
+    }
 }

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/model/vo/comment/request/MemberTradeCommentWriteVO.java

 package com.ssy.lingxi.member.merchant.model.vo.comment.request;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Positive;
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * 订单评价接口参数VO
@@ -18,286 +13,8 @@ public class MemberTradeCommentWriteVO implements Serializable {
     private static final long serialVersionUID = 1577411288889524742L;
 
     /**
-     * 被评价的会员Id(下级会员Id)
-     */
-    @NotNull(message = "被评价的会员Id(下级会员Id)不能为空")
-    @Positive(message = "被评价的会员Id(下级会员Id)要大于0")
-    private Long memberId;
-
-    /**
-     * 被评价的会员的角色Id(下级会员角色Id)
-     */
-    @NotNull(message = "被评价的会员的角色Id(下级会员角色Id)不能为空")
-    @Positive(message = "被评价的会员的角色Id(下级会员角色Id)要大于0")
-    private Long roleId;
-
-    /**
      * 订单id
      */
     @NotNull(message = "订单id不能为空")
     private Long orderId;
-
-    /**
-     * 商城类型ID
-     */
-    @NotNull(message = "商城类型ID不能为空")
-    private Long shopId;
-
-    /**
-     * 备注(订单编号)
-     */
-    @NotBlank(message = "备注(订单编号)不能为空")
-    private String orderNo;
-
-    /**
-     * 订单类型
-     */
-    @NotNull(message = "订单类型不能为空")
-    private Integer orderType;
-
-    /**
-     * 订单详情id
-     */
-    @NotNull(message = "订单详情id不能为空")
-    private Long orderDeatailsId;
-
-    /**
-     * 评价星级（1-5）
-     */
-    @NotNull(message = "评价星级不能为空")
-    @Positive(message = "评价星级要大于0")
-    private Integer star;
-
-    /**
-     * 评价内容
-     */
-    @NotBlank(message = "评价内容不能为空")
-    private String comment;
-
-    /**
-     * 商品信息
-     */
-    @NotBlank(message = "商品信息不能为空")
-    private String product;
-
-    /**
-     * 商品id
-     */
-    @NotNull(message = "商品id不能为空")
-    private Long productId;
-
-    /**
-     * 商品所属会员id
-     */
-    private Long productMemberId;
-    /**
-     * 商品所属会员角色id
-     */
-    private Long productMemberRoleId;
-
-    /**
-     * 商品主图
-     */
-    @NotNull(message = "商品主图不能为空")
-    private String productImgUrl;
-
-    /**
-     * 交易时间
-     */
-    @NotNull(message = "交易时间不能为空")
-    private Long dealTime;
-
-    /**
-     * 交易数量
-     */
-    @NotNull(message = "交易数量不能为空")
-    @Positive(message = "交易数量要大于0")
-    private Double dealCount;
-
-    /**
-     * 数量单位
-     */
-    @NotBlank(message = "数量单位")
-    private String unit;
-
-    /**
-     * 单价
-     */
-    @NotNull(message = "单价不能为空")
-    @Positive(message = "单价要大于0")
-    @Max(value = 1000000000, message = "单价不能超过10的9次方")
-    private BigDecimal price;
-
-    /**
-     * 总价
-     */
-    @NotNull(message = "总价不能为空")
-    @Positive(message = "总价要大于0")
-    @Max(value = 1000000000, message = "总价不能超过10的9次方")
-    private BigDecimal totalPrice;
-
-    /**
-     *  评价图片
-     */
-    private List<String> pics;
-
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public Long getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public Integer getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(Integer orderType) {
-        this.orderType = orderType;
-    }
-
-    public Integer getStar() {
-        return star;
-    }
-
-    public void setStar(Integer star) {
-        this.star = star;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
-
-    public String getProduct() {
-        return product;
-    }
-
-    public void setProduct(String product) {
-        this.product = product;
-    }
-
-    public Long getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Long productId) {
-        this.productId = productId;
-    }
-
-    public String getProductImgUrl() {
-        return productImgUrl;
-    }
-
-    public void setProductImgUrl(String productImgUrl) {
-        this.productImgUrl = productImgUrl;
-    }
-
-    public Long getDealTime() {
-        return dealTime;
-    }
-
-    public void setDealTime(Long dealTime) {
-        this.dealTime = dealTime;
-    }
-
-    public Double getDealCount() {
-        return dealCount;
-    }
-
-    public void setDealCount(Double dealCount) {
-        this.dealCount = dealCount;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public BigDecimal getPrice() {
-        return price;
-    }
-
-    public void setPrice(BigDecimal price) {
-        this.price = price;
-    }
-
-    public BigDecimal getTotalPrice() {
-        return totalPrice;
-    }
-
-    public void setTotalPrice(BigDecimal totalPrice) {
-        this.totalPrice = totalPrice;
-    }
-
-    public List<String> getPics() {
-        return pics;
-    }
-
-    public void setPics(List<String> pics) {
-        this.pics = pics;
-    }
-
-    public Long getOrderDeatailsId() {
-        return orderDeatailsId;
-    }
-
-    public void setOrderDeatailsId(Long orderDeatailsId) {
-        this.orderDeatailsId = orderDeatailsId;
-    }
-
-    public Long getShopId() {
-        return shopId;
-    }
-
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-
-    public Long getProductMemberId() {
-        return productMemberId;
-    }
-
-    public void setProductMemberId(Long productMemberId) {
-        this.productMemberId = productMemberId;
-    }
-
-    public Long getProductMemberRoleId() {
-        return productMemberRoleId;
-    }
-
-    public void setProductMemberRoleId(Long productMemberRoleId) {
-        this.productMemberRoleId = productMemberRoleId;
-    }
 }

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/model/vo/manage/response/MemberSuitableVO.java

@@ -12,6 +12,11 @@ public class MemberSuitableVO implements Serializable {
     private static final long serialVersionUID = 4787483704686435645L;
 
     /**
+     * 数据id，用于前端页面多条数据勾选时的判别条件，不做为其他接口的参数
+     */
+    private Long id;
+
+    /**
      * 会员id
      */
     private Long memberId;
@@ -56,6 +61,14 @@ public class MemberSuitableVO implements Serializable {
      */
     private String becomeTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getMemberId() {
         return memberId;
     }

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/model/vo/manage/response/PlatformMarketingInvitePageVO.java

@@ -12,6 +12,11 @@ public class PlatformMarketingInvitePageVO implements Serializable {
     private static final long serialVersionUID = 2209406874507445457L;
 
     /**
+     * 数据id，用于前端页面多条数据勾选时的判别条件，不做为其他接口的参数
+     */
+    private Long id;
+
+    /**
      * 会员id
      */
     private Long memberId;
@@ -46,6 +51,14 @@ public class PlatformMarketingInvitePageVO implements Serializable {
      */
     private String levelTag;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getMemberId() {
         return memberId;
     }

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/model/vo/mobile/response/MobileTradeCommentPageVO.java

@@ -53,16 +53,6 @@ public class MobileTradeCommentPageVO implements Serializable {
     private Long productId;
 
     /**
-     * 商品所属会员id
-     */
-    private Long productMemberId;
-
-    /**
-     * 商品所属会员角色id
-     */
-    private Long productMemberRoleId;
-
-    /**
      * 售后商品
      */
     private String product;
@@ -111,7 +101,7 @@ public class MobileTradeCommentPageVO implements Serializable {
     /**
      * 交易数量
      */
-    private Double purchaseCount;
+    private BigDecimal purchaseCount;
 
     /**
      * 计量单位
@@ -158,6 +148,22 @@ public class MobileTradeCommentPageVO implements Serializable {
         this.comment = comment;
     }
 
+    public Long getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Long shopId) {
+        this.shopId = shopId;
+    }
+
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
     public String getProduct() {
         return product;
     }
@@ -166,6 +172,22 @@ public class MobileTradeCommentPageVO implements Serializable {
         this.product = product;
     }
 
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
     public String getOrderNo() {
         return orderNo;
     }
@@ -214,11 +236,11 @@ public class MobileTradeCommentPageVO implements Serializable {
         this.productImgUrl = productImgUrl;
     }
 
-    public Double getPurchaseCount() {
+    public BigDecimal getPurchaseCount() {
         return purchaseCount;
     }
 
-    public void setPurchaseCount(Double purchaseCount) {
+    public void setPurchaseCount(BigDecimal purchaseCount) {
         this.purchaseCount = purchaseCount;
     }
 
@@ -229,52 +251,4 @@ public class MobileTradeCommentPageVO implements Serializable {
     public void setUnit(String unit) {
         this.unit = unit;
     }
-
-    public Long getShopId() {
-        return shopId;
-    }
-
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-
-    public Long getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Long productId) {
-        this.productId = productId;
-    }
-
-    public Long getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-
-    public Integer getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(Integer orderType) {
-        this.orderType = orderType;
-    }
-
-    public Long getProductMemberId() {
-        return productMemberId;
-    }
-
-    public void setProductMemberId(Long productMemberId) {
-        this.productMemberId = productMemberId;
-    }
-
-    public Long getProductMemberRoleId() {
-        return productMemberRoleId;
-    }
-
-    public void setProductMemberRoleId(Long productMemberRoleId) {
-        this.productMemberRoleId = productMemberRoleId;
-    }
 }

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/service/web/IMemberCommentService.java

@@ -39,6 +39,15 @@ public interface IMemberCommentService {
     Wrapper<Void> submitMemberTradeComment(UserLoginCacheDTO loginUser, MemberTradeTypeEnum memberTradeTypeEnum, MemberTradeCommentSubmitVO commentSubmitVO);
 
     /**
+     * 系统定时自动评价
+     *
+     * @param memberTradeTypeEnum 评价方角色枚举 1-供应会员，2-采购会员
+     * @param commentSubmitVO 接口参数
+     * @return 查询结果
+     */
+    void submitAutoMemberTradeComment(MemberTradeTypeEnum memberTradeTypeEnum, MemberTradeCommentSubmitVO commentSubmitVO);
+
+    /**
      * 交易能力 - 会员评价管理 - 收到评价分页列表
      *
      * @param loginUser 登录用户信息

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberCommentServiceImpl.java

@@ -21,13 +21,18 @@ import com.ssy.lingxi.member.merchant.model.vo.comment.response.*;
 import com.ssy.lingxi.member.merchant.model.vo.lifecycle.request.CommonIdVO;
 import com.ssy.lingxi.member.merchant.model.vo.maintenance.response.MemberDetailCreditCommentSummaryVO;
 import com.ssy.lingxi.member.merchant.model.vo.maintenance.response.MemberDetailCreditTradeHistoryVO;
-import com.ssy.lingxi.member.merchant.repository.*;
+import com.ssy.lingxi.member.merchant.repository.MemberOrderCommentRepository;
+import com.ssy.lingxi.member.merchant.repository.MemberOrderProductCommentRepository;
+import com.ssy.lingxi.member.merchant.repository.MemberRelationRepository;
+import com.ssy.lingxi.member.merchant.repository.MemberTradeCommentHistoryRepository;
 import com.ssy.lingxi.member.merchant.service.base.IBaseMemberCreditAsyncService;
 import com.ssy.lingxi.member.merchant.service.base.IBaseMemberLevelAsyncService;
 import com.ssy.lingxi.member.merchant.service.feign.IPlatformManageFeignService;
 import com.ssy.lingxi.member.merchant.service.feign.IReportFeignService;
 import com.ssy.lingxi.member.merchant.service.web.IMemberCommentService;
 import com.ssy.lingxi.member.merchant.utils.DateTimeUtil;
+import com.ssy.lingxi.report.api.enums.OperateDataSourceEnum;
+import com.ssy.lingxi.report.api.enums.PurchaseOrderOperateTypeEnum;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.Page;
@@ -176,14 +181,45 @@ public class MemberCommentServiceImpl implements IMemberCommentService {
             }
         }
 
+        return this.baseSubmitMemberTradeComment(memberTradeTypeEnum, memberOrderCommentDO, commentSubmitVO.getCommentSubmitDetailList(), true);
+    }
+
+    /**
+     * 系统定时自动评价
+     *
+     * @param memberTradeTypeEnum 评价方角色枚举 1-供应会员，2-采购会员
+     * @param commentSubmitVO 接口参数
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void submitAutoMemberTradeComment(MemberTradeTypeEnum memberTradeTypeEnum, MemberTradeCommentSubmitVO commentSubmitVO) {
+        // 订单
+        MemberOrderCommentDO memberOrderCommentDO = memberOrderCommentRepository.findById(commentSubmitVO.getOrderId()).orElse(null);
+        if (Objects.isNull(memberOrderCommentDO)) {
+            return;
+        }
+
+        this.baseSubmitMemberTradeComment(memberTradeTypeEnum, memberOrderCommentDO, commentSubmitVO.getCommentSubmitDetailList(), false);
+    }
+
+    /**
+     *
+     * @param memberTradeTypeEnum 评价类型
+     * @param memberOrderCommentDO 待评价订单
+     * @param commentSubmitDetailList 提交的评价数据
+     * @param isSensitiveWord 是否要过滤敏感词 0-否 1-是
+     * @return 返回结果
+     */
+    private Wrapper<Void> baseSubmitMemberTradeComment(MemberTradeTypeEnum memberTradeTypeEnum, MemberOrderCommentDO memberOrderCommentDO, List<MemberTradeCommentSubmitDetailVO> commentSubmitDetailList, boolean isSensitiveWord) {
         // 订单商品
-        List<MemberOrderProductCommentDO> memberOrderProductCommentDOList = memberOrderProductCommentRepository.findAllByOrderId(commentSubmitVO.getOrderId());
+        List<MemberOrderProductCommentDO> memberOrderProductCommentDOList = memberOrderProductCommentRepository.findAllByOrderId(memberOrderCommentDO.getId());
         if (CollectionUtils.isEmpty(memberOrderProductCommentDOList)) {
             return Wrapper.fail(ResponseCode.MC_MS_RECORDS_DON_T_EXIST);
         }
 
+
         // 已评价的订单商品记录
-        List<MemberTradeCommentHistoryDO> memberTradeCommentHistoryDOList = memberTradeCommentHistoryRepository.findAllByOrderIdAndTradeType(commentSubmitVO.getOrderId(), memberTradeTypeEnum.getTypeEnum());
+        List<MemberTradeCommentHistoryDO> memberTradeCommentHistoryDOList = memberTradeCommentHistoryRepository.findAllByOrderIdAndTradeType(memberOrderCommentDO.getId(), memberTradeTypeEnum.getTypeEnum());
         // 没有可评价的订单商品, 直接返回
         if (memberOrderProductCommentDOList.size() == memberTradeCommentHistoryDOList.size()) {
             return Wrapper.success();
@@ -194,17 +230,17 @@ public class MemberCommentServiceImpl implements IMemberCommentService {
                 .filter(orderProduct -> memberTradeCommentHistoryDOList.stream().noneMatch(orderProductComment -> orderProduct.getProductId().equals(orderProductComment.getProductId())))
                 .collect(Collectors.toMap(e -> e.getId(), e -> e, (e1, e2) -> e2));
 
-        // 提交的评价数据
-        List<MemberTradeCommentSubmitDetailVO> commentSubmitDetailList = commentSubmitVO.getCommentSubmitDetailList();
+        List<String> submitComment = commentSubmitDetailList.stream().map(MemberTradeCommentSubmitDetailVO::getComment).collect(Collectors.toList());
+        if (isSensitiveWord) {
+            // 敏感词过滤
+            Wrapper<List<String>> filterResult = platformManageFeignService.filterSensitiveWordList(submitComment);
+            if (filterResult.getCode() != ResponseCode.SUCCESS.getCode()) {
+                return Wrapper.fail(filterResult.getCode(), filterResult.getMessage());
+            }
 
-        // 敏感词过滤
-        Wrapper<List<String>> filterResult = platformManageFeignService.filterSensitiveWordList(commentSubmitDetailList.stream().map(MemberTradeCommentSubmitDetailVO::getComment).collect(Collectors.toList()));
-        if (filterResult.getCode() != ResponseCode.SUCCESS.getCode()) {
-            return Wrapper.fail(filterResult.getCode(), filterResult.getMessage());
+            submitComment = filterResult.getData();
         }
 
-        List<String> filterComments = filterResult.getData();
-
         // 会员数据处理
         Long memberId;
         Long roleId;
@@ -256,7 +292,7 @@ public class MemberCommentServiceImpl implements IMemberCommentService {
             commentHistoryDO.setSubMemberName(subMemberName);
             commentHistoryDO.setStar(submitDetailVO.getStar());
             // 评价内容
-            commentHistoryDO.setComment(CollectionUtils.isEmpty(filterComments) ? submitDetailVO.getComment() : filterComments.get(i));
+            commentHistoryDO.setComment(CollectionUtils.isEmpty(submitComment) ? submitDetailVO.getComment() : submitComment.get(i));
             commentHistoryDO.setProduct(memberOrderProductCommentDO.getName());
             commentHistoryDO.setOrderNo(memberOrderCommentDO.getOrderNo());
             commentHistoryDO.setStatus(TradeCommentHistoryStatusEnum.SHOW.getCode());
@@ -299,10 +335,20 @@ public class MemberCommentServiceImpl implements IMemberCommentService {
             memberCreditAsyncService.calculateMemberTradeCommentCredit(memberId, roleId, subMemberId, subRoleId, avgStar);
         }
 
-        // 首页统计
-        reportFeignService.memberOrderCommentReport(memberTradeTypeEnum.getTypeEnum(), loginUser.getMemberId(), loginUser.getMemberRoleId());
+        if (MemberTradeTypeEnum.BUYER.equals(memberTradeTypeEnum)) {
+            // 首页统计
+            reportFeignService.reduceReport(OperateDataSourceEnum.TRADE_PURCHASE_ORDER.getCode(),
+                    memberOrderCommentDO.getBuyerMemberId(), memberOrderCommentDO.getBuyerRoleId(),
+                    PurchaseOrderOperateTypeEnum.TO_BE_EVALUATE.getCode());
+        } else {
+            // 首页统计
+            reportFeignService.reduceReport(OperateDataSourceEnum.TRADE_SALE_ORDER.getCode(),
+                    memberOrderCommentDO.getVendorMemberId(), memberOrderCommentDO.getVendorRoleId(),
+                    PurchaseOrderOperateTypeEnum.TO_BE_EVALUATE.getCode());
+        }
 
         return Wrapper.success();
+
     }
 
     /**

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberManageServiceImpl.java

@@ -1499,6 +1499,7 @@ public class MemberManageServiceImpl implements IMemberManageService {
 
         List<MemberSuitableVO> resultList = pageList.stream().map(relationDO -> {
             MemberSuitableVO queryVO = new MemberSuitableVO();
+            queryVO.setId(relationDO.getId());
             queryVO.setMemberId(relationDO.getSubMemberId());
             queryVO.setRoleId(relationDO.getSubRoleId());
             queryVO.setName(relationDO.getMember().getName());
@@ -1594,6 +1595,7 @@ public class MemberManageServiceImpl implements IMemberManageService {
 
         List<MemberSuitableVO> resultList = pageList.stream().map(relationDO -> {
             MemberSuitableVO queryVO = new MemberSuitableVO();
+            queryVO.setId(relationDO.getId());
             queryVO.setMemberId(relationDO.getSubMemberId());
             queryVO.setRoleId(relationDO.getSubRoleId());
             queryVO.setName(relationDO.getMember().getName());
@@ -1687,6 +1689,7 @@ public class MemberManageServiceImpl implements IMemberManageService {
 
         List<MemberSuitableVO> resultList = relationDOList.stream().map(relationDO -> {
             MemberSuitableVO queryVO = new MemberSuitableVO();
+            queryVO.setId(relationDO.getId());
             queryVO.setMemberId(relationDO.getSubMemberId());
             queryVO.setRoleId(relationDO.getSubRoleId());
             queryVO.setName(relationDO.getMember().getName());
@@ -1780,6 +1783,7 @@ public class MemberManageServiceImpl implements IMemberManageService {
 
         List<MemberSuitableVO> resultList = relationDOList.stream().map(relationDO -> {
             MemberSuitableVO queryVO = new MemberSuitableVO();
+            queryVO.setId(relationDO.getId());
             queryVO.setMemberId(relationDO.getSubMemberId());
             queryVO.setRoleId(relationDO.getSubRoleId());
             queryVO.setName(relationDO.getMember().getName());
@@ -1889,8 +1893,9 @@ public class MemberManageServiceImpl implements IMemberManageService {
 
         List<PlatformMarketingInvitePageVO> resultList = pageList.stream().map(relation -> {
             PlatformMarketingInvitePageVO invitePageVO = new PlatformMarketingInvitePageVO();
-            invitePageVO.setMemberId(relation.getMemberId());
-            invitePageVO.setRoleId(relation.getRoleId());
+            invitePageVO.setId(relation.getId());
+            invitePageVO.setMemberId(relation.getSubMemberId());
+            invitePageVO.setRoleId(relation.getSubRoleId());
             invitePageVO.setName(relation.getSubMember().getName());
             invitePageVO.setRoleName(relation.getSubRoleName());
             invitePageVO.setMemberTypeName(relation.getSubRole().getMemberType().getTypeName());

platform-template-service/src/main/java/com/ssy/lingxi/platform/template/service/controller/web/ActivityPageWebController.java

+package com.ssy.lingxi.platform.template.service.controller.web;
+
+import com.ssy.lingxi.common.controller.BaseController;
+import com.ssy.lingxi.common.response.PageData;
+import com.ssy.lingxi.common.response.Wrapper;
+import com.ssy.lingxi.platform.template.service.entity.adorn.ActivityPage;
+import com.ssy.lingxi.platform.template.service.model.dto.common.IdDTO;
+import com.ssy.lingxi.platform.template.service.model.dto.web.SaveActivityPageDTO;
+import com.ssy.lingxi.platform.template.service.model.qo.ActivityPageQO;
+import com.ssy.lingxi.platform.template.service.service.web.ActivityPageWebService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+/**
+ * @menu web - 活动页
+ * @author fhj
+ * @version 2.0.0
+ * @date 2021/04/15
+ */
+@Api(tags = "web - SEO")
+@RestController
+@RequestMapping("/template/web/activityPage")
+public class ActivityPageWebController extends BaseController {
+
+    @Resource
+    private ActivityPageWebService activityPageWebService;
+
+    @ApiOperation(value = "列表")
+    @GetMapping("/page")
+    public Wrapper<PageData<ActivityPage>> page(@Valid ActivityPageQO qo) {
+        return activityPageWebService.page(qo);
+    }
+
+    @ApiOperation(value = "详情")
+    @GetMapping(value = "/get")
+    public Wrapper<ActivityPage> get(@Valid IdDTO dto) {
+        return activityPageWebService.get(dto);
+    }
+
+    @ApiOperation(value = "新增")
+    @PostMapping(value = "/add")
+    public Wrapper<Void> add(@RequestBody @Validated({SaveActivityPageDTO.Add.class}) SaveActivityPageDTO dto) {
+        return activityPageWebService.add(dto, getSysUser());
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping(value = "/update")
+    public Wrapper<Void> update(@RequestBody @Validated({SaveActivityPageDTO.Update.class}) SaveActivityPageDTO dto) {
+        return activityPageWebService.update(dto, getSysUser());
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping(value = "/delete")
+    public Wrapper<Void> delete(@RequestBody @Valid IdDTO dto) {
+        return activityPageWebService.delete(dto, getSysUser());
+    }
+}

platform-template-service/src/main/java/com/ssy/lingxi/platform/template/service/entity/adorn/ActivityPage.java

+package com.ssy.lingxi.platform.template.service.entity.adorn;
+
+import com.ssy.lingxi.platform.template.service.handler.convert.JpaJsonToJsonObjectConverter;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Map;
+
+/**
+ * 活动页 - DO
+ * @author fhj
+ * @date 2021/08/05
+ * @version 2.0.0
+ */
+@Data
+@Entity
+@Table(schema = "public", name = "pt_activity_page")
+public class ActivityPage {
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.SEQUENCE, generator="activity_page_seq")
+    @SequenceGenerator(sequenceName="pt_activity_page_seq", name="activity_page_seq", allocationSize = 1)
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    @Column(columnDefinition = "varchar(64)")
+    @ApiModelProperty(value = "活动页名称")
+    private String name;
+
+    @Column(columnDefinition = "int8")
+    @ApiModelProperty(value = "开始时间")
+    private Long startTime;
+
+    @Column(columnDefinition = "int8")
+    @ApiModelProperty(value = "结束时间")
+    private Long endTime;
+
+    @Column(columnDefinition = "int2")
+    @ApiModelProperty(value = "适用环境: 1.WEB 2.H5 3.小程序 4.APP")
+    private Integer environment;
+
+    @Column(columnDefinition = "int8")
+    @ApiModelProperty(value = "活动模板ID")
+    private Long templateId;
+
+    @Column(columnDefinition = "varchar(20)")
+    @ApiModelProperty(value = "活动模板名称")
+    private String templateName;
+
+    @Column(columnDefinition = "int8")
+    @ApiModelProperty(value = "商城ID")
+    private Long shopId;
+
+    @Column(columnDefinition = "varchar(20)")
+    @ApiModelProperty(value = "商城名称")
+    private String shopName;
+
+    @Column(columnDefinition = "int2")
+    @ApiModelProperty(value = "状态: 1.待上线 2.已上线 3.进行中 4.已下线 5.已结束")
+    private Integer status;
+
+    @Convert(converter = JpaJsonToJsonObjectConverter.class)
+    @Column(columnDefinition="jsonb")
+    @ApiModelProperty(value = "装修内容")
+    private Map<String, Object> adornContent;
+
+    @Column(columnDefinition = "int8")
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime = System.currentTimeMillis();
+}

platform-template-service/src/main/java/com/ssy/lingxi/platform/template/service/model/dto/web/SaveActivityPageDTO.java

+package com.ssy.lingxi.platform.template.service.model.dto.web;
+
+public class SaveActivityPageDTO {
+
+    public interface Add {
+    }
+
+    public interface Update {
+    }
+}

platform-template-service/src/main/java/com/ssy/lingxi/platform/template/service/model/qo/ActivityPageQO.java

+package com.ssy.lingxi.platform.template.service.model.qo;
+
+public class ActivityPageQO {
+}

platform-template-service/src/main/java/com/ssy/lingxi/platform/template/service/repository/ActivityPageRepository.java

+package com.ssy.lingxi.platform.template.service.repository;
+
+import com.ssy.lingxi.platform.template.service.entity.adorn.ActivityPage;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public interface ActivityPageRepository extends JpaRepository<ActivityPage, Long> {
+
+}

platform-template-service/src/main/java/com/ssy/lingxi/platform/template/service/service/web/ActivityPageWebService.java

+package com.ssy.lingxi.platform.template.service.service.web;
+
+import com.ssy.lingxi.common.model.dto.UserLoginCacheDTO;
+import com.ssy.lingxi.common.response.PageData;
+import com.ssy.lingxi.common.response.Wrapper;
+import com.ssy.lingxi.platform.template.service.entity.adorn.ActivityPage;
+import com.ssy.lingxi.platform.template.service.model.dto.common.IdDTO;
+import com.ssy.lingxi.platform.template.service.model.dto.web.SaveActivityPageDTO;
+import com.ssy.lingxi.platform.template.service.model.qo.ActivityPageQO;
+
+public interface ActivityPageWebService {
+    Wrapper<PageData<ActivityPage>> page(ActivityPageQO qo);
+
+    Wrapper<ActivityPage> get(IdDTO dto);
+
+    Wrapper<Void> add(SaveActivityPageDTO dto, UserLoginCacheDTO sysUser);
+
+    Wrapper<Void> update(SaveActivityPageDTO dto, UserLoginCacheDTO sysUser);
+
+    Wrapper<Void> delete(IdDTO dto, UserLoginCacheDTO sysUser);
+}

search-service/src/main/java/com/ssy/lingxi/search/controller/CommodityCollectChannelController.java

@@ -5,6 +5,7 @@ import com.ssy.lingxi.common.constant.manage.ShopTypeEnum;
 import com.ssy.lingxi.common.controller.BaseController;
 import com.ssy.lingxi.common.model.dto.UserLoginCacheDTO;
 import com.ssy.lingxi.common.response.Wrapper;
+import com.ssy.lingxi.product.api.model.request.SimpleIdRequest;
 import com.ssy.lingxi.search.entity.CommodityCollectChannel;
 import com.ssy.lingxi.search.entity.channelCommodity.ChannelCommodityMember;
 import com.ssy.lingxi.search.entity.commodity.Commodity;
@@ -139,4 +140,16 @@ public class CommodityCollectChannelController extends BaseController {
         return Wrapper.success(commodityCollectChannelService.deleteCommodityCollectChannel(sysUser, shopId, commodityCollectChannelRequest));
     }
 
+    /**
+     * 删除商品收藏通过id
+     * @param simpleIdRequest
+     * @return
+     */
+    @RequestMapping(value = "deleteCommodityCollectById", method = RequestMethod.POST)
+    public Wrapper<String> deleteCommodityCollectById(@RequestBody SimpleIdRequest simpleIdRequest){
+        UserLoginCacheDTO sysUser = this.getSysUser();
+        Long id = simpleIdRequest.getId();
+        return Wrapper.success(commodityCollectChannelService.deleteCommodityCollectChannelById(sysUser, id));
+    }
+
 }

search-service/src/main/java/com/ssy/lingxi/search/controller/CommodityCollectController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.ssy.lingxi.common.controller.BaseController;
 import com.ssy.lingxi.common.model.dto.UserLoginCacheDTO;
 import com.ssy.lingxi.common.response.Wrapper;
+import com.ssy.lingxi.product.api.model.request.SimpleIdRequest;
 import com.ssy.lingxi.search.entity.CommodityCollect;
 import com.ssy.lingxi.search.entity.commodity.Commodity;
 import com.ssy.lingxi.search.entity.commodity.CommodityShop;
@@ -104,15 +105,39 @@ public class CommodityCollectController extends BaseController {
     }
 
     /**
+     * 批量新增商品收藏
+     * @param commodityCollectRequestList 商品收藏实体
+     * @return
+     */
+    @RequestMapping(value = "/saveCommodityCollectBatch", method = RequestMethod.POST)
+    public Wrapper<Boolean> saveCommodityCollectBatch(@RequestBody List<CommodityCollectRequest> commodityCollectRequestList){
+        UserLoginCacheDTO sysUser = this.getSysUser();
+        Long shopId = Long.parseLong(request.getHeader("shopId"));
+        return Wrapper.success(commodityCollectService.saveBatchCommodityCollect(sysUser, shopId, commodityCollectRequestList));
+    }
+
+    /**
      * 删除商品收藏
      * @param commodityCollectRequest
      * @return
      */
-    @RequestMapping(value = "deleteCommodityCollect", method = RequestMethod.POST)
+    @RequestMapping(value = "/deleteCommodityCollect", method = RequestMethod.POST)
     public Wrapper<String> deleteCommodityCollect(@RequestBody CommodityCollectRequest commodityCollectRequest){
         UserLoginCacheDTO sysUser = this.getSysUser();
         Long shopId = Long.parseLong(request.getHeader("shopId"));
         return Wrapper.success(commodityCollectService.deleteCommodityCollect(sysUser, shopId, commodityCollectRequest));
     }
 
+    /**
+     * 删除商品收藏通过id
+     * @param simpleIdRequest 商品收藏id
+     * @return
+     */
+    @RequestMapping(value = "/deleteCommodityCollectById", method = RequestMethod.POST)
+    public Wrapper<String> deleteCommodityCollectById(@RequestBody SimpleIdRequest simpleIdRequest){
+        UserLoginCacheDTO sysUser = this.getSysUser();
+        Long id = simpleIdRequest.getId();
+        return Wrapper.success(commodityCollectService.deleteCommodityCollectById(sysUser, id));
+    }
+
 }

search-service/src/main/java/com/ssy/lingxi/search/model/request/CommodityCollectBatchRequest.java

+package com.ssy.lingxi.search.model.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 商城的商品收藏
+ * @author jw.chen
+ * @version 2.0.0
+ * @date 2020/9/25
+ */
+@Getter
+@Setter
+public class CommodityCollectBatchRequest implements Serializable {
+    private static final long serialVersionUID = -7209358219603948888L;
+
+    /**
+     * 商品id
+     */
+    private List<Long> commodityIdList;
+}

search-service/src/main/java/com/ssy/lingxi/search/service/ICommodityCollectChannelService.java

@@ -50,4 +50,10 @@ public interface ICommodityCollectChannelService {
      */
     String deleteCommodityCollectChannel(UserLoginCacheDTO sysUser, Long shopId, CommodityCollectChannelRequest commodityCollectChannelRequest);
 
+    /**
+     * 删除商品收藏通过id
+     * @param id
+     * @return
+     */
+    String deleteCommodityCollectChannelById(UserLoginCacheDTO sysUser, Long id);
 }

search-service/src/main/java/com/ssy/lingxi/search/service/ICommodityCollectService.java

@@ -57,4 +57,11 @@ public interface ICommodityCollectService {
      */
     String deleteCommodityCollect(UserLoginCacheDTO sysUser, Long shopId, CommodityCollectRequest commodityCollectRequest);
 
+    /**
+     * 删除商品收藏通过id
+     * @param id
+     * @return
+     */
+    String deleteCommodityCollectById(UserLoginCacheDTO sysUser, Long id);
+
 }

search-service/src/main/java/com/ssy/lingxi/search/serviceImpl/CommodityCollectChannelServiceImpl.java

@@ -196,5 +196,24 @@ public class CommodityCollectChannelServiceImpl implements ICommodityCollectChan
         }
     }
 
+    /**
+     * 删除商品收藏通过id
+     * @param id
+     * @return
+     */
+    @Override
+    public String deleteCommodityCollectChannelById(UserLoginCacheDTO sysUser, Long id) {
+        Long userId = sysUser.getUserId();
+        CommodityCollectChannel commodityCollectChannel = commodityCollectChannelRepository.findById(id).orElse(null);
+        if(commodityCollectChannel != null){
+            Long commodityCollectChannelUserId = commodityCollectChannel.getUserId();
+            if(commodityCollectChannelUserId.longValue() == userId.longValue()){
+                commodityCollectChannelRepository.deleteById(id);
+                return "删除成功";
+            }
+        }
+        throw new BusinessException(ResponseCode.PRODUCT_COMMODITY_COLLECT_NOT_EXIST);
+    }
+
 }
 

search-service/src/main/java/com/ssy/lingxi/search/serviceImpl/CommodityCollectServiceImpl.java

@@ -203,5 +203,24 @@ public class CommodityCollectServiceImpl implements ICommodityCollectService {
         }
     }
 
+    /**
+     * 删除商品收藏通过id
+     * @param id
+     * @return
+     */
+    @Override
+    public String deleteCommodityCollectById(UserLoginCacheDTO sysUser, Long id) {
+        Long userId = sysUser.getUserId();
+        CommodityCollect commodityCollect = commodityCollectRepository.findById(id).orElse(null);
+        if(commodityCollect != null){
+            Long commodityCollectUserId = commodityCollect.getUserId();
+            if(commodityCollectUserId.longValue() == userId.longValue()){
+                commodityCollectRepository.deleteById(id);
+                return "删除成功";
+            }
+        }
+        throw new BusinessException(ResponseCode.PRODUCT_COMMODITY_COLLECT_NOT_EXIST);
+    }
+
 }