|
|
@@ -47,6 +47,8 @@ import shop.alien.util.common.constant.OrderStatusEnum;
|
|
|
import javax.annotation.Resource;
|
|
|
import java.io.File;
|
|
|
import java.io.IOException;
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.math.RoundingMode;
|
|
|
import java.net.URLEncoder;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.time.*;
|
|
|
@@ -1187,7 +1189,9 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
List<StoreBusinessInfo> storeBusinessInfos = storeBusinessInfoMapper.selectList(new LambdaQueryWrapper<StoreBusinessInfo>().eq(StoreBusinessInfo::getStoreId, storeId).eq(StoreBusinessInfo::getDeleteFlag, 0));
|
|
|
if (ObjectUtils.isNotEmpty(storeBusinessInfos)) {
|
|
|
result.setStoreBusinessInfo(storeBusinessInfos.get(0));
|
|
|
- StoreBusinessInfo storeBusinessInfo = result.getStoreBusinessInfo();
|
|
|
+ result.setStoreBusinessInfos(storeBusinessInfos);
|
|
|
+ //StoreBusinessInfo storeBusinessInfo = result.getStoreBusinessInfo();
|
|
|
+ StoreBusinessInfo storeBusinessInfo = result.getStoreBusinessInfos().stream().filter(item -> item.getBusinessType() == 1).findFirst().orElse(null) ;
|
|
|
if (ObjectUtils.isNotEmpty(storeBusinessInfo)) {
|
|
|
|
|
|
Calendar calendar = Calendar.getInstance(); // 获取Calendar实例
|
|
|
@@ -1631,7 +1635,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
storeMap.put("storeId", store.getId());
|
|
|
// 如果存在评分数据,则添加评分、平均消费及评价总数
|
|
|
if (avgScoreMap.containsKey(String.valueOf(store.getId()))) {
|
|
|
- store.setAvgScore(avgScoreMap.get(String.valueOf(store.getId())).get(0).get("avg_score").toString());
|
|
|
+ store.setAvgScore(new BigDecimal(avgScoreMap.get(String.valueOf(store.getId())).get(0).get("avg_score").toString()).setScale(1, RoundingMode.HALF_UP).toString());
|
|
|
store.setTotalNum(avgScoreMap.get(String.valueOf(store.getId())).get(0).get("total_num").toString());
|
|
|
/*storeMap.put("avgScore", avgScoreMap.get(String.valueOf(store.getId())).get(0).get("avg_score"));
|
|
|
storeMap.put("avgPrice", avgPriceMap.get(String.valueOf(store.getId())).get(0).get("avg_price"));
|