From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java |   72 ++++++++++++++++++++++++++++++++----
 1 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java
index b592228..2fcb307 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java
@@ -4,10 +4,14 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
 import com.ruoyi.system.domain.dto.MerRecommendCooperationDto;
 import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
+import com.ruoyi.system.domain.dto.MgtAllotRecommendDto;
+import com.ruoyi.system.domain.dto.MgtAllotRecommendPageDto;
 import com.ruoyi.system.domain.pojo.config.RecommendCooperation;
 import com.ruoyi.system.domain.vo.MerShopRecommendPageVo;
+import com.ruoyi.system.domain.vo.MgtAllotRecommendPageVo;
 import com.ruoyi.system.mapper.config.RecommendCooperationMapper;
 import com.ruoyi.system.service.config.RecommendCooperationService;
 import org.springframework.stereotype.Service;
@@ -31,20 +35,25 @@
     private RecommendCooperationMapper recommendCooperationMapper;
 
     /**
-     *
-     * @param page
-     * @param merShopRecommendPageDto
-     * @return
-     */
+    * @description 分页获取商户推荐列表
+    * @param page
+    * @param merShopRecommendPageDto
+    * @return List<MerShopRecommendPageVo>
+    * @author jqs34
+    * @date 2023/6/18 14:27
+    */
     @Override
     public List<MerShopRecommendPageVo> pageMerShopRecommend(Page page, MerShopRecommendPageDto merShopRecommendPageDto){
         return recommendCooperationMapper.pageMerShopRecommend(page,merShopRecommendPageDto);
     }
 
     /**
-     *
-     * @param merRecommendCooperationDto
-     */
+    * @description 推荐合作
+    * @param merRecommendCooperationDto
+    * @return void
+    * @author jqs34
+    * @date 2023/6/18 14:27
+    */
     @Override
     public void recommendCooperation(MerRecommendCooperationDto merRecommendCooperationDto){
         RecommendCooperation recommendCooperation = new RecommendCooperation();
@@ -54,6 +63,53 @@
         recommendCooperation.setShopId(merRecommendCooperationDto.getShopId());
         recommendCooperation.setCorpStatus(1);
         recommendCooperation.setCreateTime(new Date());
+        if(recommendCooperation.getShopId()!=null){
+            recommendCooperation.setRecommendedFrom(2);
+            recommendCooperation.setMemberSource("合作商推荐");
+        }else{
+            recommendCooperation.setRecommendedFrom(1);
+            recommendCooperation.setMemberSource("小程序");
+        }
         this.save(recommendCooperation);
     }
+
+    /**
+     * @description pageAllotRecommend
+     * @param page
+     * @param mgtAllotRecommendPageDto
+     * @return List<MgtAllotRecommendPageVo>
+     * @author jqs34
+     * @date 2023/6/18 14:26
+     */
+    @Override
+    public List<MgtAllotRecommendPageVo> pageAllotRecommend(Page page, MgtAllotRecommendPageDto mgtAllotRecommendPageDto){
+        List<MgtAllotRecommendPageVo> allotRecommendPageVoList = recommendCooperationMapper.pageAllotRecommend(page, mgtAllotRecommendPageDto);
+        return allotRecommendPageVoList;
+    }
+
+    /**
+     * @description 分配推荐
+     * @param mgtAllotRecommendDto
+     * @return void
+     * @author jqs34
+     * @date 2023/6/18 14:39
+     */
+    @Override
+    public void allotRecommend(MgtAllotRecommendDto mgtAllotRecommendDto){
+        recommendCooperationMapper.allotRecommend(mgtAllotRecommendDto);
+    }
+
+
+    /**
+     * @description boardMemberTotal
+     * @param
+     * @return MgtBulletinBoardVo
+     * @author jqs34
+     * @date 2023/6/18 16:47
+     */
+    @Override
+    public MgtBulletinBoardVo boardMemberTotal(List<Long> userIds){
+        MgtBulletinBoardVo mgtBulletinBoardVo = recommendCooperationMapper.customTotal(userIds);
+        return mgtBulletinBoardVo;
+    }
 }

--
Gitblit v1.7.1