ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
@@ -1,5 +1,6 @@ package com.ruoyi.member.controller.miniapp; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.R; @@ -104,9 +105,8 @@ @ApiImplicitParam(name = "id", value = "优惠券id", required = true, dataType = "String", paramType = "path") }) public R<CouponInfoVo> getCouponInfo(@PathVariable("couponId") String couponId) { MemberCoupon memberCoupon = memberCouponService.getById(couponId); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Coupon coupon = couponService.getById(memberCoupon.getCouponId()); Coupon coupon = couponService.getById(couponId); CouponInfoVo vo = new CouponInfoVo(); vo.setId(coupon.getCouponId()); vo.setName(coupon.getCouponName()); @@ -134,9 +134,11 @@ } vo.setLaveNum(coupon.getSendLimitFlag()); vo.setReceiveNum(coupon.getSendLimitNumber()); int count = memberCouponService.count(new QueryWrapper<MemberCoupon>().eq("coupon_id", memberCoupon.getCouponId()).eq("del_flag", 0)); int count = memberCouponService.count(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId).eq("del_flag", 0)); vo.setLaveNum(coupon.getSendLimitNumber() - count); vo.setStatus(memberCoupon.getCouponStatus()); Long userId = SecurityUtils.getUserId(); List<MemberCoupon> list = memberCouponService.list(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId).eq("user_id", userId).eq("del_flag", 0)); vo.setStatus(list.isEmpty() ? null : list.get(0).getCouponStatus()); return R.ok(vo); }
@@ -18,7 +18,7 @@ public class AppMemberCouponPageVo { @ApiModelProperty(value = "用户优惠券id") private Long memberCouponId; private String memberCouponId; @ApiModelProperty(value = "优惠券id") private String couponId; ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
@@ -210,7 +210,7 @@ //分页获取三方订单 @RequestMapping(value = "/pageMgtThirdOrder", method = RequestMethod.POST) @ApiOperation(value = "分页获取三方订单") @ApiOperation(value = "分页获取三方订单【2.0】") public R<Page<MgtThirdOrderPageVo>> pageMgtThirdOrder(@RequestBody MgtThirdOrderPageDto dto) { Long userId = SecurityUtils.getUserId(); dto.setUserId(userId); @@ -222,7 +222,7 @@ } // 导出三方订单 @RequestMapping(value = "/exportPageMgtThirdOrder", method = RequestMethod.POST) @ApiOperation(value = "导出三方订单列表") @ApiOperation(value = "导出三方订单列表【2.0】") public void exportPageMgtThirdOrder( MgtThirdOrderPageDto mgtShopOrderPageDto, HttpServletResponse response) { Long userId = SecurityUtils.getUserId(); mgtShopOrderPageDto.setUserId(userId); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtThirdOrderPageDto.java
@@ -23,7 +23,7 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; @ApiModelProperty(value = "订单来源1.店铺商品2.平台秒杀活动3.线下创建") @ApiModelProperty(value = "订单来源5.美团6.抖音7.快手8.小鹅云") private Integer orderFrom; @ApiModelProperty(value = "核销时间-范围开始") ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -4952,8 +4952,31 @@ //获取来源销售排名 List<MgtMapBigTotalVo> orderFromList = orderMapper.listPlTotalOrderTotalOrderFrom(mgtBasePlatformDto); if (orderFromList != null && orderFromList.size() > 0) { MgtMapBigTotalVo duoyin = new MgtMapBigTotalVo(); duoyin.setMapKey("抖音"); duoyin.setMapValue(totalOrderTotalVo.getDouyinAmount()); MgtMapBigTotalVo kauishou = new MgtMapBigTotalVo(); kauishou.setMapKey("快手"); kauishou.setMapValue(totalOrderTotalVo.getKuaishouAmount()); MgtMapBigTotalVo meituan = new MgtMapBigTotalVo(); meituan.setMapKey("美团"); meituan.setMapValue(totalOrderTotalVo.getMeituanAmount()); orderFromList.add(duoyin); orderFromList.add(kauishou); orderFromList.add(meituan); orderFromList = bigListRemoveNull(orderFromList); mgtTotalOrderTotalVo.setOrderFromRankList(orderFromList); //排行 List<MgtMapBigTotalVo> sortedList = orderFromList.stream() // 按 mapValue 降序排序，处理 null 值（若 mapValue 可能为 null） .sorted(Comparator.comparing( MgtMapBigTotalVo::getMapValue, Comparator.nullsLast(BigDecimal::compareTo).reversed() )) .collect(Collectors.toList()); mgtTotalOrderTotalVo.setOrderFromRankList(sortedList); } //订单分布 //日期全部时固定为5天 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -1324,6 +1324,7 @@ WHEN 1 THEN "商城订单" WHEN 2 THEN "秒杀订单" WHEN 3 THEN "线下订单" -- other END mapKey, IFNULL(SUM(CASE WHEN pay_type = 1 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) WHEN pay_type = 2 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) + online_pay_money ELSE 0 END),0) mapValue FROM t_order toc
