From 871efa21e6c95520e9825ae1f2338c9a919fdd5d Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期日, 15 十月 2023 17:57:48 +0800
Subject: [PATCH] 用户端代码
---
src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
index 6c078d7..e15c706 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -99,7 +99,13 @@
sTime=time.split(" - ")[0]+" 00:00:00";
eTime=time.split(" - ")[1]+" 23:59:59";
}
- return this.baseMapper.getReceivable(receivableVoPage,sTime,eTime,id,state,userId);
+ List<ReceivableVo> receivable = this.baseMapper.getReceivable(receivableVoPage, sTime, eTime, id, state, userId);
+ for (ReceivableVo receivableVo : receivable) {
+ List<TPrice> prices = priceMapper.selectList(new EntityWrapper<TPrice>().eq("order_id", receivableVo.getId()));
+ BigDecimal reduce = prices.stream().map(TPrice::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ receivableVo.setTotal(reduce.doubleValue());
+ }
+ return receivable;
}
@Override
@@ -327,8 +333,10 @@
// 还柜码头
TTransportation tTransportation = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", id).eq("type", 4));
Integer portId = tTransportation.getPortId();
- TPort tPort = portService.selectById(portId);
- info.setEPortName(tPort.getAddress());
+ if(portId!=null){
+ TPort tPort = portService.selectById(portId);
+ info.setEPortName(tPort.getAddress());
+ }
}
if(!"0".equals(tOrder.getWarehouse())){
TWarehouse code = warehouseService.selectList(new EntityWrapper<TWarehouse>().eq("code", tOrder.getWarehouse())).get(0);
@@ -503,10 +511,8 @@
orderInfo.setDriverLat(value);
ArrayList<Map<String,String>> maps = new ArrayList<>();
TTransportation tTransportations = tTransportationService.selectOne(new EntityWrapper<TTransportation>().eq("order_id", orderId).eq("type",1));
- if(tTransportations!=null) {
TPort tPort1 = portMapper.selectById(tOrder.getPort());
maps.add(getLat(tPort1.getAddress()));
- }
if(tOrder.getExamSite()!=null){
Integer examSite = tOrder.getExamSite();
@@ -528,12 +534,6 @@
if(tOrder.geteAddress()!=null){
maps.add(getLat(tOrder.geteAddress()));
}
-
-
-
-
-
-
@@ -648,26 +648,35 @@
@Override
public List<IndexMonth> index(int userId) {
ArrayList<IndexMonth> list = new ArrayList<>();
- List<TOrder> orders = this.baseMapper.selectList(new EntityWrapper<TOrder>().eq("user_id", userId).isNotNull("company_id"));
+ List<TOrder> orders = this.baseMapper.selectList(new EntityWrapper<TOrder>().eq("user_id", userId).isNotNull("company_id").ne("status",17));
for (TOrder order : orders) {
IndexMonth indexMonth = new IndexMonth();
indexMonth.setTime(order.getPayTime());
indexMonth.setOrderNumber(order.getId());
- indexMonth.setAmount(order.getAllTotal());
+ BigDecimal order_id = priceMapper.selectList(new EntityWrapper<TPrice>().eq("order_id", order.getId())).stream().map(TPrice::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ indexMonth.setAmount(order_id);
list.add(indexMonth);
}
return list;
}
+ public static void main(String[] args) throws ParseException {
+ Calendar instance = Calendar.getInstance();
+ instance.add(Calendar.DATE,1);
+ System.out.println(instance.getTime());
+ }
+
@Override
public List<IndexMonth> indexYear(int i,int userId) {
ArrayList<IndexMonth> list = new ArrayList<>();
- List<TOrder> orders = this.baseMapper.selectList(new EntityWrapper<TOrder>().eq("user_id", userId).isNotNull("company_id").like("pay_time",String.valueOf(i)));
+ List<TOrder> orders = this.baseMapper.selectList(new EntityWrapper<TOrder>().eq("user_id", userId).isNotNull("company_id").like("pay_time",String.valueOf(i)).ne("status",17));
for (TOrder order : orders) {
IndexMonth indexMonth = new IndexMonth();
indexMonth.setTime(order.getPayTime());
indexMonth.setOrderNumber(order.getId());
- indexMonth.setAmount(order.getAllTotal());
+ BigDecimal order_id = priceMapper.selectList(new EntityWrapper<TPrice>().eq("order_id", order.getId())).stream().map(TPrice::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ indexMonth.setAmount(order_id);
list.add(indexMonth);
}
return list;
@@ -676,12 +685,13 @@
@Override
public List<IndexMonth> indexTime(String sTime, String eTime,int userId) {
ArrayList<IndexMonth> list = new ArrayList<>();
- List<TOrder> orders = this.baseMapper.selectList(new EntityWrapper<TOrder>().eq("user_id", userId).isNotNull("company_id").between("pay_time",sTime,eTime));
+ List<TOrder> orders = this.baseMapper.selectList(new EntityWrapper<TOrder>().eq("user_id", userId).isNotNull("company_id").between("pay_time",sTime,eTime).ne("status",17));
for (TOrder order : orders) {
IndexMonth indexMonth = new IndexMonth();
indexMonth.setTime(order.getPayTime());
indexMonth.setOrderNumber(order.getId());
- indexMonth.setAmount(order.getAllTotal());
+ BigDecimal order_id = priceMapper.selectList(new EntityWrapper<TPrice>().eq("order_id", order.getId())).stream().map(TPrice::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+ indexMonth.setAmount(order_id);
list.add(indexMonth);
}
return list;
--
Gitblit v1.7.1