From 2ce235da28440d0aa47ebcf3c5a5c51a23705b38 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 14:30:17 +0800
Subject: [PATCH] modify
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index 022caf0..862975d 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -61,7 +61,7 @@
private IdUtils idUtils;
public Map<String, Object> queryOrderList(QueryOrderListDto model) {
- String name = model.getName();
+ String name = StrUtil.isEmpty(model.getName())?model.getName():StringUtils.encode(model.getName());
String orderNo = model.getOrderNo();
Integer status = model.getStatus() == null ? 0 : model.getStatus();
Date createdTimeStart = model.getCreatedTimeStart();
@@ -174,6 +174,10 @@
if (new Date().after(goods.getQgEndTime())) {
throw new RestException(-3, "抢购已结束");
}
+ }
+
+ if (addGoodsOrderDto.getCnt() > sku.getStock()) {
+ throw new RestException(-3, "库存不足");
}
AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(addGoodsOrderDto.getUserId());
@@ -378,4 +382,23 @@
}
}
}
+
+ public StatisticsVo orderStatistics(String userId) {
+ BigDecimal score = scoreDetailsMapper.selectTotalScoreByUserId(userId, ScoreDetails.SCORE_TYPE_EXCHANGE);
+
+ Map<String, Object> userData = scoreOrderMapper.selectOrderStastics(userId);
+ Map<String, Object> allData = scoreOrderMapper.selectOrderStastics(null);
+
+ StatisticsVo statisticsVo = new StatisticsVo();
+ statisticsVo.setScore(score);
+ BigDecimal userPrice = (BigDecimal) userData.get("totalPrice");
+ statisticsVo.setReduceCarbon(userPrice.divide(BigDecimal.TEN, 2, BigDecimal.ROUND_DOWN));
+ statisticsVo.setOrderCnt(Integer.parseInt(userData.get("totalOrder").toString()));
+
+ BigDecimal totalPrice = (BigDecimal) allData.get("totalPrice");
+ statisticsVo.setTotalReduceCarbon(totalPrice.divide(BigDecimal.TEN, 2, BigDecimal.ROUND_DOWN));
+ statisticsVo.setTotalOrderCnt(Integer.parseInt(allData.get("totalOrder").toString()));
+ statisticsVo.setTotalBuyCnt(Integer.parseInt(allData.get("totalBuy").toString()));
+ return statisticsVo;
+ }
}
--
Gitblit v1.9.1