From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 a590b14..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
@@ -65,8 +65,10 @@
recommendCooperation.setCreateTime(new Date());
if(recommendCooperation.getShopId()!=null){
recommendCooperation.setRecommendedFrom(2);
+ recommendCooperation.setMemberSource("合作商推荐");
}else{
recommendCooperation.setRecommendedFrom(1);
+ recommendCooperation.setMemberSource("小程序");
}
this.save(recommendCooperation);
}
@@ -106,10 +108,8 @@
* @date 2023/6/18 16:47
*/
@Override
- public MgtBulletinBoardVo boardMemberTotal(){
- MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
- mgtBulletinBoardVo.setCustomToday(recommendCooperationMapper.customToday());
- mgtBulletinBoardVo.setCustomTotal(recommendCooperationMapper.customTotal());
+ public MgtBulletinBoardVo boardMemberTotal(List<Long> userIds){
+ MgtBulletinBoardVo mgtBulletinBoardVo = recommendCooperationMapper.customTotal(userIds);
return mgtBulletinBoardVo;
}
}
--
Gitblit v1.7.1