diff --git a/bweb/src/main/java/com/bweb/config/AuthConfig.java b/bweb/src/main/java/com/bweb/config/AuthConfig.java index a4e67a2..9a4edc7 100644 --- a/bweb/src/main/java/com/bweb/config/AuthConfig.java +++ b/bweb/src/main/java/com/bweb/config/AuthConfig.java @@ -93,6 +93,7 @@ public class AuthConfig implements WebMvcConfigurer { .excludePathPatterns("/login/logout") .excludePathPatterns("/common/*") .excludePathPatterns("/sms/*") + .excludePathPatterns("/tradeCount/*") .excludePathPatterns("/coupon/getGuizhouSinopec") .excludePathPatterns("/cmsContent/get*") .excludePathPatterns("/highGoldRec/*") diff --git a/bweb/src/main/java/com/bweb/controller/BsTradeCountController.java b/bweb/src/main/java/com/bweb/controller/BsTradeCountController.java new file mode 100644 index 0000000..737a0c5 --- /dev/null +++ b/bweb/src/main/java/com/bweb/controller/BsTradeCountController.java @@ -0,0 +1,105 @@ +package com.bweb.controller; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hfkj.common.utils.DateUtil; +import com.hfkj.common.utils.ResponseMsgUtil; +import com.hfkj.entity.BsTradeOrder; +import com.hfkj.model.ResponseData; +import com.hfkj.model.UserInfoModel; +import com.hfkj.service.BsTradeOrderService; +import com.hfkj.sysenum.SecUserTypeEnum; +import com.hfkj.sysenum.TradeOrderStatusEnum; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.time.*; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * @className: BsTradeCountController + * @author: HuRui + * @date: 2025/7/15 + **/ +@Controller +@Api(value = "交易订单") +@RequestMapping(value = "/tradeCount") +public class BsTradeCountController { + + private static Logger log = LoggerFactory.getLogger(BsTradeOrderController.class); + @Resource + private BsTradeOrderService tradeOrderService; + + @RequestMapping(value="/home",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "首页统计") + public ResponseData home() { + try { + Map param = new LinkedHashMap<>(); + + Map dataMap = new LinkedHashMap<>(); + // 今日数据 + param.put("createTimeS", LocalDateTime.of(LocalDate.now(), LocalTime.MIN).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); + param.put("createTimeE", LocalDateTime.of(LocalDate.now(), LocalTime.MAX).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); + param.put("status", TradeOrderStatusEnum.status3.getNumber()); + dataMap.put("today", tradeOrderService.countTradeOrderPrice(param)); + + // 月数据 + param.clear(); + // 本月数据 + param.put("createTimeS", LocalDateTime.of(LocalDate.now().withDayOfMonth(1), LocalTime.MIN).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); + param.put("createTimeE", LocalDateTime.of(LocalDate.now().withDayOfMonth(LocalDate.now().lengthOfMonth()), LocalTime.MAX).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); + param.put("status", TradeOrderStatusEnum.status3.getNumber()); + dataMap.put("thisMonth", tradeOrderService.countTradeOrderPrice(param)); + // 去年同月数据 + param.put("createTimeS", DateUtil.format(YearMonth.now().minusYears(1).atDay(1)+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()); + param.put("createTimeE", DateUtil.format(YearMonth.now().minusYears(1).atEndOfMonth()+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()); + param.put("status", TradeOrderStatusEnum.status3.getNumber()); + dataMap.put("lastMonth", tradeOrderService.countTradeOrderPrice(param)); + + // 年数据 + param.clear(); + // 今年数据 + param.put("createTimeS", DateUtil.format(Year.now().atDay(1)+" 00:00:00","yyyy-MM-dd HH:mm:ss").getTime()); + param.put("createTimeE", DateUtil.format(Year.now().atDay(Year.now().length())+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()); + param.put("status", TradeOrderStatusEnum.status3.getNumber()); + dataMap.put("thisYear", tradeOrderService.countTradeOrderPrice(param)); + // 去年数据 + param.put("createTimeS", DateUtil.format(Year.now().minusYears(1).atDay(1)+" 00:00:00","yyyy-MM-dd HH:mm:ss").getTime()); + param.put("createTimeE", DateUtil.format(Year.now().minusYears(1).atDay(Year.now().length())+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()); + param.put("status", TradeOrderStatusEnum.status3.getNumber()); + dataMap.put("lastYear", tradeOrderService.countTradeOrderPrice(param)); + + return ResponseMsgUtil.success(dataMap); + + } catch (Exception e) { + log.error(e.getMessage(), e); + return ResponseMsgUtil.exception(e); + } + } + + public static void main(String[] args) { + System.out.println("今年第一天: " + DateUtil.date2String(new Date(DateUtil.format(Year.now().minusYears(1).atDay(1)+" 00:00:00","yyyy-MM-dd HH:mm:ss").getTime()),DateUtil.Y_M_D_HMS)); + System.out.println("今年第一天: " + DateUtil.date2String(new Date(DateUtil.format(Year.now().minusYears(1).atDay(Year.now().length())+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()),DateUtil.Y_M_D_HMS)); + + System.out.println(": " + DateUtil.date2String(new Date(DateUtil.format(YearMonth.now().minusYears(1).atDay(1)+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()),DateUtil.Y_M_D_HMS)); + System.out.println(": " + DateUtil.date2String(new Date(DateUtil.format(YearMonth.now().minusYears(1).atEndOfMonth()+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()),DateUtil.Y_M_D_HMS)); + + + System.out.println(": " + DateUtil.date2String(new Date(DateUtil.format(Year.now().minusYears(1).atDay(Year.now().length())+" 23:59:59","yyyy-MM-dd HH:mm:ss").getTime()),DateUtil.Y_M_D_HMS)); + + + } + +} diff --git a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java index 6e8a76a..04ebb6c 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java @@ -622,11 +622,11 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService { } if (StringUtils.isNotBlank(MapUtils.getString(param, "outTradeNo"))) { - criteria.andOutTradeNoEqualTo(MapUtils.getString(param, "outTradeNo")); + criteria.andOutTradeNoLike("%"+MapUtils.getString(param, "outTradeNo")+"%"); } if (StringUtils.isNotBlank(MapUtils.getString(param, "accTradeNo"))) { - criteria.andAccTradeNoEqualTo(MapUtils.getString(param, "accTradeNo")); + criteria.andAccTradeNoLike("%"+MapUtils.getString(param, "accTradeNo")+"%"); } if (MapUtils.getLong(param, "createTimeS") != null) {