Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

huanghongfa

2022-04-19 d89d4a28653657528dc0718f1aa55e1c84ad1e6f

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderCollageTeamServiceImpl.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.constants.PayCpmstant;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderCollageTeamPeopleVo;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderCollageTeamVo;
@@ -81,7 +82,24 @@
     */
    @Override
    public R queryByPage(PageComBatteryCommodityOrderCollageTeamDto comBatteryCommodityOrderCollageTeam) {
        return R.ok(this.baseMapper.queryAllByLimit(comBatteryCommodityOrderCollageTeam, new Page(comBatteryCommodityOrderCollageTeam.getPageNum(), comBatteryCommodityOrderCollageTeam.getPageSize())));
        IPage<ComBatteryCommodityOrderCollageTeamVo> orderCollageTeamVoIPage = this.baseMapper.queryAllByLimit(comBatteryCommodityOrderCollageTeam
                , new Page(comBatteryCommodityOrderCollageTeam.getPageNum(), comBatteryCommodityOrderCollageTeam.getPageSize()));
        //判断该用户是否参与了以下拼团
        if(comBatteryCommodityOrderCollageTeam.getUserId() != null && comBatteryCommodityOrderCollageTeam.getUserId() != 0L){
            Long userId = comBatteryCommodityOrderCollageTeam.getUserId();
            orderCollageTeamVoIPage.getRecords().forEach(orderCollageTeam -> {
                Map<String,Object> resultMap = this.baseMapper.getUserCollageDetail(orderCollageTeam.getId(),userId);
                if(resultMap != null){
                    if(Integer.parseInt(resultMap.get("ktCount").toString()) > 0){
                        orderCollageTeam.setIsPartake(2);
                    }
                    if(Integer.parseInt(resultMap.get("ptCount").toString()) > 0){
                        orderCollageTeam.setIsPartake(2);
                    }
                }
            });
        }
        return R.ok(orderCollageTeamVoIPage);
    }

    /**
@@ -148,11 +166,24 @@
     * @date 2022-03-29 16:06:58
     */
    @Override
    public R detailById(Long id) {
    public R detailById(Long id,Long userId) {
        ComBatteryCommodityOrderCollageTeamVo orderCollageTeamVo = this.baseMapper.queryById(id);
        if(orderCollageTeamVo != null){
            List<ComBatteryCommodityOrderCollageTeamPeopleVo> collageTeamPeopleList = orderCollageTeamPeopleMapper.queryAllByTeamId(id);
            orderCollageTeamVo.setOrderCollageTeamPeopleList(collageTeamPeopleList);
            //判断该用户是否参与了以下拼团
            if(userId != null && userId != 0L){
                Map<String,Object> resultMap = this.baseMapper.getUserCollageDetail(orderCollageTeamVo.getId(),userId);
                if(resultMap != null){
                    if(Integer.parseInt(resultMap.get("ktCount").toString()) > 0){
                        orderCollageTeamVo.setIsPartake(2);
                    }
                    if(Integer.parseInt(resultMap.get("ptCount").toString()) > 0){
                        orderCollageTeamVo.setIsPartake(2);
                    }
                }
            }

        }
        return R.ok(orderCollageTeamVo);
    }
@@ -188,9 +219,6 @@
        if(commodityActivity.getEndTime().getTime() - System.currentTimeMillis() <= 0
                || commodityActivity.getStatus().equals(ComBatteryCommodityActivity.Status.YJS)){
            return R.fail("该活动已结束");
        }
        if(commodityActivity.getCommodityNum() <= commodityActivity.getCommoditySaleNum()){
            return R.fail("活动商品已售空");
        }
        if(orderDto.getType().equals(StartFightOrderDto.Type.PT)){
            //判断该团队人数是否已满