From 25a638e0d5f282d26ff9da47e5b7aa5c9c1603d4 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 23 十月 2024 18:34:20 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0 --- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java index 28e8e38..bd1baca 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java @@ -4,6 +4,7 @@ import com.stylefeng.guns.modular.system.dao.OrderEvaluateMapper; import com.stylefeng.guns.modular.system.model.OrderEvaluate; import com.stylefeng.guns.modular.system.service.IOrderEvaluateService; +import com.stylefeng.guns.modular.system.util.DateUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -32,13 +33,25 @@ * @throws Exception */ @Override - public Map<String, Object> queryEvaluate(Integer pageNum, Integer size, Integer uid) throws Exception { + public Map<String, Object> queryEvaluate(Integer language, Integer pageNum, Integer size, Integer uid) throws Exception { pageNum = (pageNum - 1) * size; Map<String, Object> map = new HashMap<>(); Double aDouble = orderEvaluateMapper.queryCount(uid); List<Map<String, Object>> list = orderEvaluateMapper.queryEvaluate(pageNum, size, uid); + for (Map<String, Object> objectMap : list) { + if(null != objectMap.get("insertTime")){ + String insertTime = objectMap.get("insertTime").toString(); + objectMap.put("insertTime", DateUtil.conversionFormat(language, insertTime)); + } + } map.put("sumScore", null != aDouble ? new BigDecimal(aDouble).setScale(1, BigDecimal.ROUND_HALF_EVEN).doubleValue() : 0); map.put("list", list); return map; } + + + @Override + public Double queryDriverScore(Integer driverId) throws Exception { + return this.baseMapper.queryDriverScore(driverId); + } } -- Gitblit v1.7.1