From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 13:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 757ef1a..703ee14 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
@@ -63,6 +63,11 @@
recommendCooperation.setShopId(merRecommendCooperationDto.getShopId());
recommendCooperation.setCorpStatus(1);
recommendCooperation.setCreateTime(new Date());
+ if(recommendCooperation.getShopId()!=null){
+ recommendCooperation.setRecommendedFrom(2);
+ }else{
+ recommendCooperation.setRecommendedFrom(1);
+ }
this.save(recommendCooperation);
}
@@ -102,9 +107,7 @@
*/
@Override
public MgtBulletinBoardVo boardMemberTotal(){
- MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
- mgtBulletinBoardVo.setCustomToday(recommendCooperationMapper.customToday());
- mgtBulletinBoardVo.setCustomTotal(recommendCooperationMapper.customTotal());
+ MgtBulletinBoardVo mgtBulletinBoardVo = recommendCooperationMapper.customTotal();
return mgtBulletinBoardVo;
}
}
--
Gitblit v1.7.1