bug修复

huanghongfa

2021-09-14 25f1dae273901ac19732103a40d158c241a8eafa

bug修复

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -126,7 +127,7 @@
    private Long evaluateAmount;

    @ApiModelProperty("活动评分星级平均数")
    private Double evaluateLevel;
    private BigDecimal evaluateLevel;

    @ApiModelProperty("当前用户对活动的评分")
    private Integer myRating;

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

@@ -4,6 +4,8 @@
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -177,7 +179,7 @@
        // 结束时间大于当前时间则设置为“进行中”
        Date now = new Date();
        if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()) {
            comActActivityDO.setStatus(4);
            comActActivityDO.setStatus(3);
        }
        boolean b = this.updateById(comActActivityDO);
        if (b) {
@@ -637,7 +639,7 @@
                //总星级
                int starNum = comActActEvaluateDOList.stream().mapToInt(ComActActEvaluateDO::getStarLevel).sum();
                //评分星级=总星级/总评价人数
                vo.setEvaluateLevel(Double.valueOf(starNum/comActActEvaluateDOList.size()));
                vo.setEvaluateLevel(BigDecimal.valueOf(starNum).divide(BigDecimal.valueOf(comActActEvaluateDOList.size()),2, RoundingMode.HALF_UP));
            }
        });
        return R.ok(iPage);