CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: CY:dfa4f4d245424832369affa5a69afee82f817e31
Branches Tags
CY:feature/admin
CY:feature/community-center
CY:preview
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment
..
compare: CY:87f259cd6f9580d0f02dc1806061a0eebb4081f8
Branches Tags
CY:feature/admin
CY:feature/community-center
CY:preview
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment

No commits in common. "dfa4f4d245424832369affa5a69afee82f817e31" and "87f259cd6f9580d0f02dc1806061a0eebb4081f8" have entirely different histories.
dfa4f4d245 ... 87f259cd6f

7 changed files with 12 additions and 43 deletions
Show Stats Expand all files Collapse all files

6
mcwl-communityCenter/pom.xml
View File

@ -31,12 +31,6 @@
<groupId>com.mcwl</groupId>
<artifactId>mcwl-system</artifactId>
</dependency>
<dependency>
<groupId>com.mcwl</groupId>
<artifactId>mcwl-myInvitation</artifactId>
<version>3.8.8</version>
<scope>compile</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/dashscope-sdk-java -->
<!-- <dependency>-->

6
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityVo.java
View File

@ -87,6 +87,12 @@ public class CommunityVo {
@ApiModelProperty(value = "加入人数")
private Integer joinNum;
/**
* 发布数量
*/
@ApiModelProperty(value = "发布数量")
private Integer publishNum;
/**
* 是否加入
*/

30
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java
View File

@ -26,8 +26,6 @@ import com.mcwl.communityCenter.mapper.CommunityMapper;
import com.mcwl.communityCenter.mapper.CommunityUserMapper;
import com.mcwl.communityCenter.service.CommunityService;
import com.mcwl.communityCenter.service.PublishService;
import com.mcwl.myInvitation.domain.Consume;
import com.mcwl.myInvitation.mapper.ConsumeMapper;
import com.mcwl.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@ -56,9 +54,6 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
private final PublishService publishService;
private final ConsumeMapper consumeMapper;
@Override
public TableDataInfo listByPage(CommunityListPageRes communityListPageRes) {
@ -98,7 +93,6 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
.userId(SecurityUtils.getUserId())
.userType(2)
.build());
redisCache.deleteObject("communityJoinNumMap");
} catch (Exception e) {
throw new ServiceException(e.getMessage(), HttpStatus.SHOW_ERROR_MSG);
@ -118,7 +112,7 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
Long communityId = joinCommunityRes.getCommunityId();
Community community = baseMapper.getByTenantIdAndCommunityId(tenantId, communityId);
if (Objects.isNull(community)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG,"社区不存在，请重新加入");
return R.fail("社区不存在，请重新加入");
}
CommunityUser communityUser = communityUserMapper.selectByTenantIdAndCommunityIdAndUserId(tenantId,
@ -126,14 +120,14 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
SecurityUtils.getUserId());
if (Objects.nonNull(communityUser)) {
return R.fail(HttpStatus.SHOW_ERROR_MSG,"您已加入该社区,不能重复加入");
return R.fail("您已加入该社区,不能重复加入");
}
SysUser user = sysUserService.selectUserById(SecurityUtils.getUserId());
SysUser user = SecurityUtils.getLoginUser().getUser();
Double wallet = user.getWallet();
Double price = community.getPrice();
if (wallet < price) {
return R.fail(HttpStatus.SHOW_ERROR_MSG,"钱包余额不足，请充值");
return R.fail("钱包余额不足，请充值");
}
// 扣费
BigDecimal priceBigDecimal = new BigDecimal(price.toString());
@ -173,18 +167,6 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
SecurityUtils.getLoginUser().getUser().getNickName(), community.getCommunityName(), price));
communityAdviceMapper.insert(communityAdvice);
Consume consume = new Consume();
consume.setUserId(SecurityUtils.getUserId());
consume.setAmount(price);
consume.setProductId(communityId);
consume.setType(3);
consume.setWallet(user.getWallet());
consume.setConsumeDate(new Date());
consumeMapper.insert(consume);
redisCache.deleteObject("communityJoinNumMap");
return R.ok("加入成功");
}
@ -231,8 +213,6 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
if (communityJoinNum == 1) {
baseMapper.deleteCommunity(tenantId, communityId);
} else {
redisCache.deleteObject("communityJoinNumMap");
}
return R.ok();
@ -319,7 +299,7 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
communityVo.setNickName(sysUser.getNickName());
communityVo.setCreateDay(daysBetween);
communityVo.setJoinNum(this.getCommunityJoinNum(community.getId()));
// communityVo.setPublishNum(this.getCommunityPublishNum(community.getId()));
communityVo.setPublishNum(this.getCommunityPublishNum(community.getId()));
if (myJoinCommunityMap.get(community.getId()) != null) {
communityVo.setIsJoin(1);
} else {

5
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishServiceImpl.java
View File

@ -12,7 +12,6 @@ import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.domain.entity.SysUser;
import com.mcwl.common.core.page.PageDomain;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.common.core.redis.RedisCache;
import com.mcwl.common.exception.BusinessException;
import com.mcwl.common.exception.ServiceException;
import com.mcwl.common.utils.SecurityUtils;
@ -61,8 +60,6 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
private final PublishReportMapper publishReportMapper;
private final RedisCache redisCache;
@Override
public PublishVo getDetail(PublishDetailRes publishDetailRes) {
@ -114,8 +111,6 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
publish.setPublishTime(new Date());
}
baseMapper.insertPublish(publish);
redisCache.deleteObject("communityPublishNumMap");
return R.ok();
}

3
mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml
View File

@ -104,7 +104,6 @@
and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
and (black_end_time is null or NOW() &gt;= black_end_time)
and del_flag = '0';
</select>
<select id="getAllCommunityUser" resultType="com.mcwl.communityCenter.domain.CommunityUser">
select id,
@ -132,7 +131,6 @@
and user_id = #{userId}
and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
and del_flag = '0';
</select>
<select id="getCommunityUserAvatar" resultType="java.lang.String">
select u.avatar
@ -143,7 +141,6 @@
and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= cu.start_time
AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= cu.end_time) or
(cu.start_time is null and cu.end_time is null))
and cu.del_flag = '0'
order by cu.create_time desc
limit 5
</select>

2
mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java
View File

@ -29,7 +29,7 @@ public class Consume extends BaseEntity {
// 商品id
private Long productId;
// 商品类型 0模型 1工作流 2图片 3社区
// 商品类型 0模型 1工作流 2图片
private Integer type;
// 剩余金币

3
mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/ConsumeServiceImpl.java
View File

@ -81,9 +81,6 @@ public class ConsumeServiceImpl extends ServiceImpl<ConsumeMapper, Consume> impl
case 2:
consumeVo.setProductName("图片");
break;
case 3:
consumeVo.setProductName("社区");
break;
}
consumeVoList.add(consumeVo);