From cd657f34271f387edb8d72befbcdad37f7bed77a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 15:47:13 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 79 insertions(+), 12 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index f7dafef..f2bdae2 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
@@ -9,13 +9,17 @@
import com.xzx.gc.common.utils.StringUtils;
import com.xzx.gc.entity.JhyOrder;
import com.xzx.gc.entity.JhyOrderItems;
+import com.xzx.gc.entity.ScoreOrder;
import com.xzx.gc.entity.ScoreOrderDetails;
import com.xzx.gc.shop.dto.CancelJhyOrderDto;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
import com.xzx.gc.shop.mapper.JhyOrderItemsMapper;
import com.xzx.gc.shop.mapper.JhyOrderMapper;
+import com.xzx.gc.shop.mapper.OrderInfoMapper;
+import com.xzx.gc.shop.mapper.ScoreOrderMapper;
import com.xzx.gc.shop.vo.*;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example;
@@ -37,6 +41,12 @@
@Resource
JhyOrderItemsMapper jhyOrderItemsMapper;
+ @Autowired
+ private OrderInfoMapper orderInfoMapper;
+
+ @Autowired
+ private ScoreOrderMapper scoreOrderMapper;
+
public Map<String, Object> queryOrderList(QueryJhyOrderListDto model) {
PageHelper.startPage(model.getPage(), model.getLimit());
String accountPhone = model.getAccount();
@@ -45,6 +55,13 @@
model.setAccount(name);
model.setAccountPhone(accountPhone);
List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
+ if(CollUtil.isNotEmpty(maps)){
+ for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
+ Long id = queryJhyOrderListVo.getId();
+ List<JhyOrderItemsVo> jhyOrderItemsVos = jhyOrderItemsMapper.selectByOrderId(id);
+ queryJhyOrderListVo.setJhyOrderItemsVos(jhyOrderItemsVos);
+ }
+ }
// if(CollUtil.isNotEmpty(maps)){
// for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
// String decode = StringUtils.decode(queryJhyOrderListVo.getName());
@@ -67,24 +84,15 @@
String decode = StringUtils.decode(viewJhyOrderVo.getNickName());
viewJhyOrderVo.setNickName(decode);
- Example exampleItems = new Example(JhyOrderItems.class);
- Example.Criteria criteriaItems = exampleItems.createCriteria();
- criteriaItems.andEqualTo("orderId",id);
- ArrayList<JhyOrderItemsVo> jhyOrderItemsVolist = new ArrayList<>();
- List<JhyOrderItems> jhyOrderItemsList = jhyOrderItemsMapper.selectByExample(exampleItems);
+ List<JhyOrderItemsVo> jhyOrderItemsList = jhyOrderItemsMapper.selectJhyOrderItemListByOrderId(id);
if(CollUtil.isNotEmpty(jhyOrderItemsList)){
- for(JhyOrderItems jhyOrderItems : jhyOrderItemsList){
- JhyOrderItemsVo jhyOrderItemsVo = BeanUtil.copyProperties(jhyOrderItems, JhyOrderItemsVo.class);
+ for(JhyOrderItemsVo jhyOrderItemsVo : jhyOrderItemsList){
BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(40));
-// BigDecimal multiplyScore = jhyOrderItemsVo.getPrice()
-// .multiply(jhyOrderItemsVo.getWeight()==null?BigDecimal.ZERO :jhyOrderItemsVo.getWeight())
-// .multiply(new BigDecimal(40));
jhyOrderItemsVo.setPrice(multiply);
jhyOrderItemsVo.setAllPrice(new BigDecimal(StrUtil.isEmpty(jhyOrderItemsVo.getScore())?"0":jhyOrderItemsVo.getScore()).setScale( 2, BigDecimal.ROUND_DOWN ));
- jhyOrderItemsVolist.add(jhyOrderItemsVo);
}
}
- viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsVolist);
+ viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsList);
return viewJhyOrderVo;
}
@@ -95,4 +103,63 @@
jhyOrder.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
jhyOrderMapper.updateByPrimaryKey(jhyOrder);
}
+
+ public StatisticsVo orderStatistics(String userId) {
+ // 骑手订单
+ List<Map<String, Object>> qsAllData = orderInfoMapper.selectOrderTitleStatistics(null);
+ List<Map<String, Object>> qsUserData = orderInfoMapper.selectOrderTitleStatistics(userId);
+
+ // 集物员订单
+ List<Map<String, Object>> jhyAllData = jhyOrderMapper.selectJhyOrderTitleStatistics(null);
+ List<Map<String, Object>> jhyUserData = jhyOrderMapper.selectJhyOrderTitleStatistics(userId);
+
+ BigDecimal allCarbon = totalData(qsAllData).add(totalData(jhyAllData));
+ BigDecimal userCarbon = totalData(qsUserData).add(totalData(jhyUserData));
+
+ Integer qsAllCnt = orderInfoMapper.selectOrderCnt(null);
+ Integer qsUserCnt = orderInfoMapper.selectOrderCnt(userId);
+
+ Integer jhyAllCnt = jhyOrderMapper.selectJhyOrderCnt(null);
+ Integer jhyUserCnt = jhyOrderMapper.selectJhyOrderCnt(userId);
+
+ Integer allCnt = scoreOrderMapper.selectScoreOrderCnt(null);
+ BigDecimal score = jhyOrderMapper.selectTotalScoreHasGet(userId);
+
+ StatisticsVo result = new StatisticsVo();
+ result.setTotalReduceCarbon(allCarbon.divide(BigDecimal.valueOf(1000), 2, BigDecimal.ROUND_DOWN));
+ result.setReduceCarbon(userCarbon.setScale(2, BigDecimal.ROUND_DOWN));
+
+ result.setOrderCnt(qsUserCnt + jhyUserCnt);
+ result.setTotalOrderCnt(qsAllCnt + jhyAllCnt);
+
+ result.setTotalBuyCnt(allCnt);
+ result.setScore(score);
+ return result;
+ }
+
+ private BigDecimal totalData(List<Map<String, Object>> data) {
+ Map<String, BigDecimal> type = new HashMap<>();
+ type.put("金属", BigDecimal.valueOf(0.02));
+ type.put("纸类", BigDecimal.valueOf(1.5));
+ type.put("塑料", BigDecimal.valueOf(0.61));
+ type.put("衣服", BigDecimal.valueOf(1.63));
+
+ if (CollUtil.isEmpty(data)) {
+ return BigDecimal.ZERO;
+ }
+
+ BigDecimal total = BigDecimal.ZERO;
+ for (Map<String, Object> map : data) {
+ String title = (String) map.get("title");
+ BigDecimal value = type.get(title);
+ if (value == null) {
+ continue;
+ }
+
+ BigDecimal weight = new BigDecimal(map.get("weight").toString());
+ total = total.add(weight.multiply(value));
+ }
+
+ return total;
+ }
}
--
Gitblit v1.9.1