From e8dd7cfa6bbfd8be4a52f24e03c74f853cc6ac4f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 26 一月 2026 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/WorkbenchServiceImpl.java | 200 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 190 insertions(+), 10 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WorkbenchServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WorkbenchServiceImpl.java
index 1b84f94..0a6262c 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WorkbenchServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WorkbenchServiceImpl.java
@@ -35,6 +35,7 @@
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
@@ -44,6 +45,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -57,33 +59,211 @@
public class WorkbenchServiceImpl implements WorkbenchService {
@Autowired
private GoodsorderMapper goodsorderMapper;
+ @Autowired
+ private GoodsorderDetailMapper goodsorderDetailMapper;
+ @Override
+ public List<BusinessDataCountVO> shopRankList10(CountDataDTO param) {
+ Date startDate = null,endDate = null;
+ if(param.getYear()!=null && param.getMonth()!=null){
+ List<Date> dList = DateUtil.getDatePeriodByYearAndMonth(param.getYear(),param.getMonth()-1);
+ startDate = dList.get(0);
+ endDate = dList.get(1);
+ }else if(param.getYear()!=null && param.getMonth()==null){
+ List<Date> dList = DateUtil.getDatePeriodByYear(param.getYear());
+ startDate = dList.get(0);
+ endDate = dList.get(1);
+ }
+ //缁熻璁㈠崟閿�閲忓拰閿�鍞闆嗗悎
+ List<BusinessDataCountVO> list1 = goodsorderMapper.selectJoinList(BusinessDataCountVO.class,new MPJLambdaWrapper<Goodsorder>()
+ .selectAs(Shop::getName,BusinessDataCountVO::getName)
+ .select("(select count(distinct(t.member_id)) )",BusinessDataCountVO::getNum1)
+ .select("(select count(t.id) )",BusinessDataCountVO::getNum)
+ .select("(select sum(t.total_price) )",BusinessDataCountVO::getPrice)
+ .leftJoin(Shop.class,Shop::getId,Goodsorder::getDistributionShopId)
+ .ge(startDate!=null,Goodsorder::getCreateDate,startDate)
+ .ne(endDate!=null,Goodsorder::getCreateDate,endDate)
+ .eq(Goodsorder::getIsdeleted,Constants.ZERO)
+ .in(Goodsorder::getStatus,Constants.OrderStatus.DONE.getKey(),Constants.OrderStatus.REFUND.getKey())
+ .groupBy(Goodsorder::getDistributionShopId)
+ .orderByDesc(Constants.equalsInteger(param.getType() ,0),"sum(t.total_price) ")
+ .orderByDesc(Constants.equalsInteger(param.getType() ,1),"count(t.id) ")
+ .orderByDesc(Constants.equalsInteger(param.getType() ,2),"count(distinct(t.member_id))")
+ .last("limit 10")) ;
+ return list1;
+ }
+ @Override
+ public List<BusinessDataCountVO> goodsRankList10(CountDataDTO param) {
+ Date startDate = null,endDate = null;
+ if(param.getYear()!=null && param.getMonth()!=null){
+ List<Date> dList = DateUtil.getDatePeriodByYearAndMonth(param.getYear(),param.getMonth()-1);
+ startDate = dList.get(0);
+ endDate = dList.get(1);
+ }else if(param.getYear()!=null && param.getMonth()==null){
+ List<Date> dList = DateUtil.getDatePeriodByYear(param.getYear());
+ startDate = dList.get(0);
+ endDate = dList.get(1);
+ }
+ //缁熻璁㈠崟閿�閲忓拰閿�鍞闆嗗悎
+ List<BusinessDataCountVO> list1 = goodsorderDetailMapper.selectJoinList(BusinessDataCountVO.class,new MPJLambdaWrapper<GoodsorderDetail>()
+ .selectAs(Goods::getName,BusinessDataCountVO::getName)
+ .select("(select sum(t.goods_num) )",BusinessDataCountVO::getNum)
+ .select("(select sum(ifnull(t.price,0) * ifnull(t.goods_num,0)))",BusinessDataCountVO::getPrice)
+ .leftJoin(Goodsorder.class,Goodsorder::getId,GoodsorderDetail::getOrderId)
+ .leftJoin(Goods.class,Goods::getId,GoodsorderDetail::getGoodsId)
+ .ge(startDate!=null,Goodsorder::getCreateDate,startDate)
+ .ne(endDate!=null,Goodsorder::getCreateDate,endDate)
+ .eq(Goodsorder::getIsdeleted,Constants.ZERO)
+ .in(Goodsorder::getStatus,Constants.OrderStatus.DONE.getKey(),Constants.OrderStatus.REFUND.getKey())
+ .groupBy(GoodsorderDetail::getGoodsId)
+ .orderByDesc(Constants.equalsInteger(param.getType() ,1),"sum(ifnull(t.price,0) * ifnull(t.goods_num,0)) ")
+ .orderByDesc(Constants.equalsInteger(param.getType() ,0),"sum(t.goods_num) ")
+ .last("limit 10")) ;
+ return list1;
+ }
@Override
public BusinessDataCountVO businessData(CountDataDTO param) {
BusinessDataCountVO data = new BusinessDataCountVO();
int dataType = param.getDateType();//0浠婃棩 1杩戜竷鏃� 2杩�30鏃� 3杩�1骞�
- int days = 1;
+ String name = "HOUR(t.CREATE_DATE)";
+ List<String> dateList = new ArrayList<>();
+ Date date = Utils.Date.getEnd(new Date());//浠婃棩 23:59:59
+ Date startDate = DateUtil.addDaysToDate(date,-1);
switch (dataType) {
case 1: {
- days = 7;
+ name = "DATE_FORMAT(t.CREATE_DATE, '%Y-%m-%d')";
+ for(int i=1;i<=7;i++){
+ dateList.add(DateUtil.getShortTime(DateUtil.addDaysToDate(date,i-7)));
+ }
+ startDate = DateUtil.addDaysToDate(date,-7);
break;
} case 2: {
- days =30;
+ name = "DATE_FORMAT(t.CREATE_DATE, '%Y-%m-%d')";
+ for(int i=1;i<=30;i++){
+ dateList.add(DateUtil.getShortTime(DateUtil.addDaysToDate(date,i-30)));
+ }
+ startDate = DateUtil.addDaysToDate(date,-30);
break;
} case 3: {
- days = 365;
+ LocalDate now = LocalDate.now();
+ startDate = DateUtil.increaseYear(date,-1);
+ name = "DATE_FORMAT(t.CREATE_DATE, '%Y-%m')";
+ for(int i=1;i<=12;i++){
+ dateList.add(DateUtil.minusMonthToDate(now,12-i));
+ }
break;
} default:{
-
+ for(int i=0;i<=23;i++){
+ dateList.add(i+"");
+ }
+ break;
}
}
- Date startDate = DateUtil.addDaysToDate(Utils.Date.getStart(new Date()),-days);
- CountDataVO r= goodsorderMapper.selectJoinOne(CountDataVO.class,new MPJLambdaWrapper<Goodsorder>()
- .ge(Goodsorder::getCreateDate,startDate)
- .in(Goodsorder::getStatus,Constants.OrderStatus.DONE.getKey(),Constants.OrderStatus.DONE.getKey())
- );
+ data.setDateStrList(dateList);
+ //璁㈠崟閿�閲�
+ CountDataVO r = goodsorderMapper.selectJoinOne(CountDataVO.class,new MPJLambdaWrapper<Goodsorder>()
+ .select("(select count(t.id) )",CountDataVO::getNum)
+ .select("(select sum(t.total_Price) )",CountDataVO::getPrice)
+ .ge(Goodsorder::getCreateDate,startDate)
+ .eq(Goodsorder::getIsdeleted,Constants.ZERO)
+ .in(Goodsorder::getStatus,Constants.OrderStatus.DONE.getKey(),Constants.OrderStatus.REFUND.getKey()) );
+ if (r != null) {
+ data.setNum(Constants.formatLongNum(r.getNum()));//璁㈠崟閲�
+ data.setPrice(Constants.formatBigdecimal(r.getPrice()));//璁㈠崟閲戦
+ }
+ //閫�娆剧粺璁�
+ CountDataVO r1 = goodsorderMapper.selectJoinOne(CountDataVO.class,new MPJLambdaWrapper<Goodsorder>()
+ .select("(select count(t.id) )",CountDataVO::getNum)
+ .select("(select sum(t.refund_money) )",CountDataVO::getPrice)
+ .ge(Goodsorder::getRefundTime,startDate)
+ .eq(Goodsorder::getIsdeleted,Constants.ZERO)
+ .in(Goodsorder::getStatus,Constants.OrderStatus.REFUND.getKey()) );
+
+
+ if (r1 != null) {
+ data.setNum1(Constants.formatLongNum(r1.getNum()));//閫�娆惧崟閲�
+ data.setPrice1(Constants.formatBigdecimal(r1.getPrice()));//閫�娆鹃噾棰�
+ }
+
+ //缁熻璁㈠崟閿�閲忓拰閿�鍞闆嗗悎
+ List<CountDataVO> list1 = goodsorderMapper.selectJoinList(CountDataVO.class,new MPJLambdaWrapper<Goodsorder>()
+ .select("(select "+name+")",CountDataVO::getDateStr)
+ .select("(select count(t.id) )",CountDataVO::getNum)
+ .select("(select sum(t.total_price) )",CountDataVO::getPrice)
+ .ge(Goodsorder::getCreateDate,startDate)
+ .eq(Goodsorder::getIsdeleted,Constants.ZERO)
+ .in(Goodsorder::getStatus,Constants.OrderStatus.DONE.getKey(),Constants.OrderStatus.REFUND.getKey())
+ .groupBy(name) );
+
+ List<Long> datalist1 = new ArrayList<>();
+ List<BigDecimal> datalistPrice = new ArrayList<>();
+ for(String str : dateList){
+ long tnum =0;
+ BigDecimal tprice = new BigDecimal(0);
+ if(list1!=null){
+ for(CountDataVO p : list1){
+ if(StringUtils.equals(p.getDateStr(),str)){
+ tnum =(Constants.formatLongNum(p.getNum()));
+ tprice = (Constants.formatBigdecimal(p.getPrice()));
+ break;
+ }
+ }
+ }
+ datalist1.add( tnum );
+ datalistPrice.add(tprice);
+ }
+ data.setDataList(datalist1 );
+ data.setDataList2(datalistPrice );
+
+ String name1 =name.replace("t.","t3.");
+ //缁熻鍚勭被鍟嗗搧鏁版嵁闆嗗悎
+ List<CountDataVO> list2 = goodsorderDetailMapper.selectJoinList(CountDataVO.class,new MPJLambdaWrapper<GoodsorderDetail>()
+ .select("(select "+name1+")",CountDataVO::getDateStr)
+ .selectAs(Labels::getName,CountDataVO::getName)
+ .select("(select sum(ifnull(t.price,0) * ifnull(t.goods_num,0)) )",CountDataVO::getPrice)
+ .leftJoin(Goods.class,Goods::getId,GoodsorderDetail::getGoodsId)
+ .leftJoin(Labels.class,Labels::getId,Goods::getCategoryId)
+ .leftJoin(Goodsorder.class,Goodsorder::getId,GoodsorderDetail::getOrderId)
+ .ge(Goodsorder::getCreateDate,startDate)
+ .eq(Goodsorder::getIsdeleted,Constants.ZERO)
+ .in(Goodsorder::getStatus,Constants.OrderStatus.DONE.getKey(),Constants.OrderStatus.REFUND.getKey())
+ .groupBy(name1+",t1.category_id"));
+
+ List<CountDataVO> cateList = getCateListFromDataList(list2);
+ if(list2!=null &&list2.size()>0 && cateList!=null && cateList.size()>0){
+ BigDecimal[] temp = new BigDecimal[dateList.size()];
+ for(CountDataVO cate : cateList){
+ for(int i=0;i<dateList.size();i++){
+ temp[i] = new BigDecimal(0);
+ for(CountDataVO model : list2){
+ if(StringUtils.equals(model.getDateStr(),dateList.get(i)) && StringUtils.equals(model.getName(),cate.getName())){
+ temp[i] = Constants.formatBigdecimal(model.getPrice());
+ }
+ }
+ }
+ cate.setData(temp);
+ }
+ }
+ data.setCateList(cateList);
return data;
}
+ private List<CountDataVO> getCateListFromDataList(List<CountDataVO> list2) {
+ List<CountDataVO> list = new ArrayList<>();
+ for(CountDataVO model :list2){
+ boolean isnew = true;
+ for(CountDataVO str :list){
+ if(StringUtils.equals(str.getName(),model.getName())){
+ isnew = false;
+ }
+
+ }
+ if(isnew ){
+ list.add(model);
+ }
+ }
+ return list;
+ }
+
}
--
Gitblit v1.9.3