From f747c717505ae19d0875d51abc8d5a889a01123b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 22 十一月 2022 09:08:07 +0800
Subject: [PATCH] #feat 联调问题修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
index 758fbd9..c94f429 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -4,6 +4,7 @@
import static java.util.Objects.nonNull;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -12,7 +13,9 @@
import javax.annotation.Resource;
+import cn.hutool.core.util.NumberUtil;
import com.panzhihua.common.utlis.Snowflake;
+import com.panzhihua.service_community.dao.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -42,12 +45,6 @@
import com.panzhihua.common.model.vos.community.convenient.ConvenientViewStatisticsVO;
import com.panzhihua.common.model.vos.community.convenient.ExportMerchantVO;
import com.panzhihua.common.service.user.UserService;
-import com.panzhihua.service_community.dao.ComActDAO;
-import com.panzhihua.service_community.dao.ConvenientConsultationStatisticsDAO;
-import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
-import com.panzhihua.service_community.dao.ConvenientProductDAO;
-import com.panzhihua.service_community.dao.ConvenientServiceCategoryDAO;
-import com.panzhihua.service_community.dao.ConvenientViewStatisticsDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ConvenientConsultationStatisticsDO;
import com.panzhihua.service_community.model.dos.ConvenientMerchantDO;
@@ -80,6 +77,8 @@
private ConvenientConsultationStatisticsDAO convenientConsultationStatisticsDAO;
@Resource
private ConvenientViewStatisticsDAO convenientViewStatisticsDAO;
+ @Resource
+ private ComShopFlowerEvaluateDAO comShopFlowerEvaluateDAO;
private static final String DQ="510402";
private static final String RHQ="510411";
@@ -477,6 +476,8 @@
List<Long> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(convenientMerchantVO.getId());
convenientMerchantVO.setServiceIds(serviceIds);
}
+ BigDecimal score = comShopFlowerEvaluateDAO.statisticsScore(convenientMerchantVO.getId());
+ convenientMerchantVO.setScore(null==score ?BigDecimal.ZERO: NumberUtil.round(score, 1));
return R.ok(convenientMerchantVO);
}
}
--
Gitblit v1.7.1