|
@@ -1,5 +1,14 @@
|
|
package com.chelvc.cloud.vehicle.server.service.impl;
|
|
package com.chelvc.cloud.vehicle.server.service.impl;
|
|
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
|
+import java.math.RoundingMode;
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
|
+import java.util.Date;
|
|
|
|
+import java.util.HashMap;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
+
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.chelvc.cloud.uc.api.dto.UserDTO;
|
|
import com.chelvc.cloud.uc.api.dto.UserDTO;
|
|
@@ -18,8 +27,8 @@ import com.chelvc.cloud.vehicle.server.dao.GoodsAssessMapper;
|
|
import com.chelvc.cloud.vehicle.server.entity.AssessRecover;
|
|
import com.chelvc.cloud.vehicle.server.entity.AssessRecover;
|
|
import com.chelvc.cloud.vehicle.server.entity.AssessScore;
|
|
import com.chelvc.cloud.vehicle.server.entity.AssessScore;
|
|
import com.chelvc.cloud.vehicle.server.entity.GoodsAssess;
|
|
import com.chelvc.cloud.vehicle.server.entity.GoodsAssess;
|
|
|
|
+import com.chelvc.framework.base.context.Session;
|
|
import com.chelvc.framework.base.context.SessionContextHolder;
|
|
import com.chelvc.framework.base.context.SessionContextHolder;
|
|
-import com.chelvc.framework.common.model.Session;
|
|
|
|
import com.chelvc.framework.common.util.AssertUtils;
|
|
import com.chelvc.framework.common.util.AssertUtils;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -27,15 +36,6 @@ import org.apache.dubbo.config.annotation.DubboService;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
|
|
|
|
-import java.math.BigDecimal;
|
|
|
|
-import java.math.RoundingMode;
|
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* @author valley
|
|
* @author valley
|
|
* @date 2024/01/30 00:03
|
|
* @date 2024/01/30 00:03
|
|
@@ -55,7 +55,8 @@ public class AssessServiceImpl extends ServiceImpl<GoodsAssessMapper, GoodsAsses
|
|
@Override
|
|
@Override
|
|
public Long add(AssessModifyParam param) {
|
|
public Long add(AssessModifyParam param) {
|
|
Session user = SessionContextHolder.getSession();
|
|
Session user = SessionContextHolder.getSession();
|
|
- AssertUtils.available(this.getOne(new QueryWrapper<GoodsAssess>().eq("order_id", param.getOrderId()).eq("creator", user.getId())) == null, "该订单已评价");
|
|
|
|
|
|
+ AssertUtils.available(this.getOne(new QueryWrapper<GoodsAssess>().eq("order_id", param.getOrderId()).eq(
|
|
|
|
+ "creator", user.getId())) == null, "该订单已评价");
|
|
|
|
|
|
GoodsAssess goodsAssess = GoodsAssessCopier.INSTANCE.copying(param);
|
|
GoodsAssess goodsAssess = GoodsAssessCopier.INSTANCE.copying(param);
|
|
goodsAssess.setHits(0L);
|
|
goodsAssess.setHits(0L);
|
|
@@ -131,7 +132,8 @@ public class AssessServiceImpl extends ServiceImpl<GoodsAssessMapper, GoodsAsses
|
|
item.setCreatorAvatar(user.getAvatar());
|
|
item.setCreatorAvatar(user.getAvatar());
|
|
item.setCreatorNickName(user.getNickname());
|
|
item.setCreatorNickName(user.getNickname());
|
|
item.setCreatorTimeFormat(SDF.format(item.getCreateTime()));
|
|
item.setCreatorTimeFormat(SDF.format(item.getCreateTime()));
|
|
- AssessRecover assessRecover = assessRecoverMapper.selectOne(new QueryWrapper<AssessRecover>().eq("assess_id", item.getId()));
|
|
|
|
|
|
+ AssessRecover assessRecover = assessRecoverMapper.selectOne(new QueryWrapper<AssessRecover>().eq(
|
|
|
|
+ "assess_id", item.getId()));
|
|
if (assessRecover != null) {
|
|
if (assessRecover != null) {
|
|
AssessRecoverDto assessRecoverDto = AssessRecoverCopier.INSTANCE.copying(assessRecover);
|
|
AssessRecoverDto assessRecoverDto = AssessRecoverCopier.INSTANCE.copying(assessRecover);
|
|
assessRecoverDto.setRecoverTimeFormat(SDF.format(assessRecoverDto.getRecoverTime()));
|
|
assessRecoverDto.setRecoverTimeFormat(SDF.format(assessRecoverDto.getRecoverTime()));
|
|
@@ -149,7 +151,8 @@ public class AssessServiceImpl extends ServiceImpl<GoodsAssessMapper, GoodsAsses
|
|
@Override
|
|
@Override
|
|
public Long addAssessRecover(AssessRecoverModifyParam param) {
|
|
public Long addAssessRecover(AssessRecoverModifyParam param) {
|
|
|
|
|
|
- AssertUtils.available(assessRecoverMapper.selectOne(new QueryWrapper<AssessRecover>().eq("assess_id", param.getAssessId())) == null, "该订单已回复");
|
|
|
|
|
|
+ AssertUtils.available(assessRecoverMapper.selectOne(new QueryWrapper<AssessRecover>().eq("assess_id",
|
|
|
|
+ param.getAssessId())) == null, "该订单已回复");
|
|
AssessRecover assessRecover = AssessRecoverCopier.INSTANCE.copying(param);
|
|
AssessRecover assessRecover = AssessRecoverCopier.INSTANCE.copying(param);
|
|
assessRecover.setRecoverTime(new Date());
|
|
assessRecover.setRecoverTime(new Date());
|
|
assessRecoverMapper.insert(assessRecover);
|
|
assessRecoverMapper.insert(assessRecover);
|
|
@@ -179,7 +182,8 @@ public class AssessServiceImpl extends ServiceImpl<GoodsAssessMapper, GoodsAsses
|
|
this.baseMapper.updateGoodsAvgScore(goodsAvgScore, goodsId);
|
|
this.baseMapper.updateGoodsAvgScore(goodsAvgScore, goodsId);
|
|
|
|
|
|
BigDecimal goodsYearScore = this.baseMapper.getGoodsScore(365, goodsId).setScale(2, RoundingMode.HALF_UP);
|
|
BigDecimal goodsYearScore = this.baseMapper.getGoodsScore(365, goodsId).setScale(2, RoundingMode.HALF_UP);
|
|
- BigDecimal goodsHalfYearScore = this.baseMapper.getGoodsScore(180, goodsId).setScale(2, RoundingMode.HALF_UP);
|
|
|
|
|
|
+ BigDecimal goodsHalfYearScore = this.baseMapper.getGoodsScore(180, goodsId).setScale(2,
|
|
|
|
+ RoundingMode.HALF_UP);
|
|
BigDecimal goodsQuarterScore = this.baseMapper.getGoodsScore(90, goodsId).setScale(2, RoundingMode.HALF_UP);
|
|
BigDecimal goodsQuarterScore = this.baseMapper.getGoodsScore(90, goodsId).setScale(2, RoundingMode.HALF_UP);
|
|
BigDecimal goodsMonthScore = this.baseMapper.getGoodsScore(30, goodsId).setScale(2, RoundingMode.HALF_UP);
|
|
BigDecimal goodsMonthScore = this.baseMapper.getGoodsScore(30, goodsId).setScale(2, RoundingMode.HALF_UP);
|
|
BigDecimal goodsWeekScore = this.baseMapper.getGoodsScore(7, goodsId).setScale(2, RoundingMode.HALF_UP);
|
|
BigDecimal goodsWeekScore = this.baseMapper.getGoodsScore(7, goodsId).setScale(2, RoundingMode.HALF_UP);
|
|
@@ -203,7 +207,8 @@ public class AssessServiceImpl extends ServiceImpl<GoodsAssessMapper, GoodsAsses
|
|
public Map<String, BigDecimal> getGoodsScore(Long goodsId) {
|
|
public Map<String, BigDecimal> getGoodsScore(Long goodsId) {
|
|
Map<String, BigDecimal> data = new HashMap<>();
|
|
Map<String, BigDecimal> data = new HashMap<>();
|
|
data.put("score", this.baseMapper.getGoodsAvgScore(goodsId).setScale(2, RoundingMode.HALF_UP));
|
|
data.put("score", this.baseMapper.getGoodsAvgScore(goodsId).setScale(2, RoundingMode.HALF_UP));
|
|
- AssessScore assessScore = this.assessScoreMapper.selectOne(new QueryWrapper<AssessScore>().eq("goods_id", goodsId));
|
|
|
|
|
|
+ AssessScore assessScore = this.assessScoreMapper.selectOne(new QueryWrapper<AssessScore>().eq("goods_id",
|
|
|
|
+ goodsId));
|
|
data.put("yearScore", assessScore.getYearScore());
|
|
data.put("yearScore", assessScore.getYearScore());
|
|
data.put("halfYearScore", assessScore.getHalfYearScore());
|
|
data.put("halfYearScore", assessScore.getHalfYearScore());
|
|
data.put("quarterScore", assessScore.getQuarterScore());
|
|
data.put("quarterScore", assessScore.getQuarterScore());
|