Merge branch 'dev'

101captain

2022-03-14 85cf42314fc04a637f1a44e78c1e476a445bf0f3

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

@@ -7,8 +7,13 @@

import javax.annotation.Resource;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoEvaluateDto;
import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate;
import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
import com.panzhihua.service_community.entity.SysTemplateConfig;
import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -73,6 +78,10 @@
    private ComActActivityDAO comActActivityDAO;
    @Resource
    private SysTemplateConfigDao sysTemplateConfigDao;
    @Resource
    private ComActEasyPhotoHandlerService easyPhotoHandlerService;
    @Resource
    private ComActEasyPhotoEvaluateMapper comActEasyPhotoEvaluateMapper;
    /**
     * 分页查询随手拍
     *
@@ -188,6 +197,10 @@
                comActEasyPhotoVO.setEasyPhotoActivityVO(easyPhotoActivityVO);
            }
        }
        PageComActEasyPhotoEvaluateDto evaluateDto = new PageComActEasyPhotoEvaluateDto();
        evaluateDto.setServiceId(id);
        evaluateDto.setServiceType(ComActEasyPhotoEvaluate.ServiceType.SSP);
        comActEasyPhotoVO.setEvaluateList(comActEasyPhotoEvaluateMapper.queryAllByList(evaluateDto));
        return R.ok(comActEasyPhotoVO);
    }

@@ -312,6 +325,14 @@
                // 审核通过判断随手拍是否有活动并计算用户收益
                comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(), comActEasyPhotoVO.getId(),
                    comActEasyPhotoVO.getUserId(), BigDecimal.ZERO);

                //添加分配人员
                if(comActEasyPhotoVO.getHandleList() != null && comActEasyPhotoVO.getHandleList().size() > 0){
                    comActEasyPhotoVO.getHandleList().forEach(handle -> {
                        easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(),comActEasyPhotoVO.getUserId()
                                ,cmActEasyPhotoDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.SSP);
                    });
                }
                break;
            case 2:
                // if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){