Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 ecb2d404cd65158a78e1d0c0520ce0d3ab0cfdbd

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

@@ -1,8 +1,11 @@
package com.panzhihua.service_community.service.impl;

import com.panzhihua.common.model.vos.common.ComBatteryActivityTeamVo;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityActivityVo;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderVo;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityVo;
import com.panzhihua.service_community.dao.ComBatteryCommodityMapper;
import com.panzhihua.service_community.dao.ComBatteryCommodityOrderMapper;
import com.panzhihua.service_community.entity.ComBatteryCommodityActivity;
import com.panzhihua.service_community.dao.ComBatteryCommodityActivityMapper;
import com.panzhihua.service_community.service.ComBatteryCommodityActivityService;
@@ -14,6 +17,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;

/**
 * title: 电动车商城-商家活动表表服务实现类
@@ -30,6 +35,8 @@

    @Resource
    private ComBatteryCommodityMapper commodityMapper;
    @Resource
    private ComBatteryCommodityOrderMapper commodityOrderMapper;

    /**
     * description  queryByPage  分页查询
@@ -106,16 +113,33 @@
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @param userId 用户id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-29 13:17:40
     */
    @Override
    public R detailById(Long id) {
    public R detailById(Long id,Long userId) {
        ComBatteryCommodityActivityVo commodityActivityVo = this.baseMapper.queryById(id);
        if(commodityActivityVo != null){
            ComBatteryCommodityVo commodityVo = commodityMapper.queryById(commodityActivityVo.getCommodityId());
            commodityActivityVo.setCommodityVo(commodityVo);
            if(userId != null && userId > 0){
                //查询用户参与拼团活动信息
                ComBatteryActivityTeamVo ptResult = commodityOrderMapper.queryTeamIdByUserId(userId,id);
                if(ptResult != null && ptResult.getTeamId() != null){
                    commodityActivityVo.setIsOpen(2);
                    commodityActivityVo.setTeamId(ptResult.getTeamId());
                    commodityActivityVo.setTeamEndTime(ptResult.getTeamEndTime());
                }
                //查询用户参与砍价活动信息
                ComBatteryActivityTeamVo kjResult =commodityOrderMapper.queryTeamIdByUserIdBargain(userId,id);
                if(kjResult != null && kjResult.getTeamId() != null){
                    commodityActivityVo.setIsBargain(2);
                    commodityActivityVo.setBargainId(kjResult.getTeamId());
                    commodityActivityVo.setBargainEndTime(kjResult.getTeamEndTime());
                }
            }
        }
        return R.ok(commodityActivityVo);
    }
@@ -149,4 +173,5 @@
        }
        return R.fail("修改失败");
    }

}