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

Compare commits

base: CY:b74323dfccfb9bb59554c6a6a5771122f1f4088b
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:085e852f198cafff5ec6c2421e535ad7db208974
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. "b74323dfccfb9bb59554c6a6a5771122f1f4088b" and "085e852f198cafff5ec6c2421e535ad7db208974" have entirely different histories.
b74323dfcc ... 085e852f19

6 changed files with 12 additions and 105 deletions
Show Stats Expand all files Collapse all files

20
mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/CommunityController.java
View File

@ -2,7 +2,6 @@ package com.mcwl.web.controller.communityCenter;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.page.PageDomain;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.communityCenter.domain.dto.CommunityListPageRes;
import com.mcwl.communityCenter.domain.dto.CommunityRes;
@ -40,25 +39,6 @@ public class CommunityController {
return communityService.listByPage(communityListPageRes);
}
/**
* 我创建的社区
*/
@ApiOperation(value = "我创建的社区")
@PostMapping("myCreate")
public R<Object> getMyCreateCommunity(@RequestBody @Valid PageDomain pageDomain) {
return R.ok();
}
/**
* 我加入的社区
*/
@ApiOperation(value = "我加入的社区")
@GetMapping("myJoin")
public R<Object> getMyJoinCommunity() {
return R.ok();
}
/**
* 添加社区

7
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityListPageRes.java
View File

@ -20,11 +20,4 @@ public class CommunityListPageRes extends PageDomain {
@ApiModelProperty(value = "社区标签")
private Long communityTag;
/**
* 用户id
*/
@ApiModelProperty(value = "用户id")
private Long userId;
}

12
mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityMapper.java
View File

@ -2,14 +2,11 @@ package com.mcwl.communityCenter.mapper;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mcwl.communityCenter.domain.Community;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Map;
@Mapper
@ -26,18 +23,13 @@ public interface CommunityMapper extends BaseMapper<Community> {
* 查询所有社区加入人数, 以map形式返回，key为社区id，value为加入人数
* @return map
*/
@MapKey("id")
@InterceptorIgnore(tenantLine = "true")
Map<Long, Map<String, Object>> selectCommunityJoinNum();
Map<Long, Integer> selectCommunityJoinNum();
/**
* 查询所有社区发布数量，以map形式返回，key为社区id，value为发布数量
* @return map
*/
@MapKey("id")
@InterceptorIgnore(tenantLine = "true")
Map<Long, Map<String, Object>> selectCommunityPublishNum();
@InterceptorIgnore(tenantLine = "true")
List<Community> selectPageByCommunityTag(@Param("page") Page<Community> page, @Param("communityTag") Long communityTag);
Map<Long, Integer> selectCommunityPublishNum();
}

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

@ -43,22 +43,10 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
public TableDataInfo listByPage(CommunityListPageRes communityListPageRes) {
// 查询社区加入人数，以map形式返回，key为社区id，value为加入人数
Map<Long, Integer> communityJoinNumMap = new HashMap<>();
Map<Long, Map<String, Object>> joinMap = baseMapper.selectCommunityJoinNum();
if (joinMap != null && !joinMap.isEmpty()) {
joinMap.forEach((key, value) -> {
communityJoinNumMap.put(key, Integer.valueOf(value.get("joinNum").toString()));
});
}
Map<Long, Integer> communityJoinNumMap = baseMapper.selectCommunityJoinNum();
// 查询社区发布数，以map形式返回，key为社区id，value为发布数
Map<Long, Integer> communityPublishNumMap = new HashMap<>();
Map<Long, Map<String, Object>> publishMap = baseMapper.selectCommunityPublishNum();
if (publishMap != null && !publishMap.isEmpty()) {
publishMap.forEach((key, value) -> {
communityPublishNumMap.put(key, Integer.valueOf(value.get("publishNum").toString()));
});
}
Map<Long, Integer> communityPublishNumMap = baseMapper.selectCommunityPublishNum();
Page<Community> page = new Page<>(communityListPageRes.getPageNum(), communityListPageRes.getPageSize());
@ -71,14 +59,10 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
OrderItem orderItem = new OrderItem(communityListPageRes.getOrderByColumn(), isAsc);
page.addOrder(orderItem);
List<Community> communityList;
if (Objects.isNull(communityListPageRes.getUserId())) {
communityList = baseMapper.selectPageByCommunityTag(page, communityListPageRes.getCommunityTag());
} else {
baseMapper.selectPage(page, null);
communityList = page.getRecords();
}
baseMapper.selectPage(page, new LambdaQueryWrapper<Community>()
.eq(communityListPageRes.getCommunityTag() != null, Community::getCommunityTag, communityListPageRes.getCommunityTag()));
List<Community> communityList = page.getRecords();
List<CommunityVo> communityVoList = new ArrayList<>();
LocalDate currentLocalDate = LocalDate.now(ZoneId.systemDefault());

43
mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityMapper.xml
View File

@ -4,16 +4,6 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.communityCenter.mapper.CommunityMapper">
<resultMap id="CommunityJoinNumMap" type="java.util.HashMap">
<id property="id" column="id" javaType="java.lang.Long" /> <!-- 键字段 -->
<result property="joinNum" column="join_num" javaType="java.lang.Integer" /> <!-- 值字段 -->
</resultMap>
<resultMap id="CommunityPublishNumMap" type="java.util.HashMap">
<id property="id" column="id" javaType="java.lang.Long" /> <!-- 键字段 -->
<result property="publishNum" column="publish_num" javaType="java.lang.Integer" /> <!-- 值字段 -->
</resultMap>
<select id="getByTenantIdAndCommunityId" resultType="com.mcwl.communityCenter.domain.Community">
select id,
tenant_id,
@ -27,19 +17,16 @@
and del_flag = '0';
</select>
<select id="selectCommunityJoinNum" resultMap="CommunityJoinNumMap">
select c.id as id, COALESCE(count(*), 0) as join_num
<select id="selectCommunityJoinNum" resultType="java.util.Map">
select c.id, COALESCE(count(*), 0)
from cc_community c
join cc_invite i on c.id = i.community_id
where c.del_flag = '0'
and i.del_flag = '0'
group by i.community_id
</select>
<select id="selectCommunityPublishNum" resultMap="CommunityPublishNumMap">
select c.id as id, COALESCE(count(*), 0) as publish_num
<select id="selectCommunityPublishNum" resultType="java.util.Map">
select c.id, COALESCE(count(*), 0)
from cc_community c
join cc_publish p on c.id = p.community_id
join cc_question q on c.id = q.community_id
@ -48,26 +35,4 @@
and q.del_flag = '0'
group by p.community_id
</select>
<select id="selectPageByCommunityTag" resultType="com.mcwl.communityCenter.domain.Community">
select
id,
tenant_id,
image_url,
community_name,
description,
community_tag,
type,
price,
validity_type,
create_by,
create_time,
update_by,
update_time
from cc_community
<where>
<if test="communityTag != null">
and c.community_tag = #{communityTag}
</if>
</where>
</select>
</mapper>

9
mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
View File

@ -123,12 +123,6 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
SysUser sysUser = sysUserService.selectUserById(SecurityUtils.getUserId());
// 获取邀请人id
Long inviterUserId = sysUser.getInviterUserId();
if (Objects.equals(productUserId, sysUser.getUserId())) {
throw new ServiceException("不能购买自己的商品", HttpStatus.SHOW_ERROR_MSG);
}
// 邀请者获取的提成
Map<String, Double> map = new HashMap<>();
if (productType == 0) {
@ -140,7 +134,7 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
}
if (map.isEmpty()) {
throw new ServiceException("商品不存在", HttpStatus.SHOW_ERROR_MSG);
throw new RuntimeException("商品不存在");
}
// 邀请人提成
@ -710,7 +704,6 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
.subtract(priceBigDecimal)
.setScale(2, RoundingMode.HALF_UP)
.doubleValue());
sysUserService.updateUser(sysUser);
// 更新商家钱包金额
SysUser merchants = sysUserService.selectUserById(productUserId);
merchants.setWallet(new BigDecimal(merchants.getWallet().toString())