From 4cedf9ad166e77044a08e93dae4433a144834d50 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 26 八月 2024 09:58:41 +0800
Subject: [PATCH] 可用优惠券数量
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
index d2f4568..6364f94 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.account.api.dto.CouponListDto;
import com.ruoyi.account.api.dto.GrantCouponDto;
@@ -31,10 +32,13 @@
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -54,6 +58,8 @@
public class TAppCouponController {
@Autowired
private TAppCouponService tAppCouponService;
+ @Resource
+ private OtherClient otherClient;
@Autowired
private TAppUserCarService appUserCarService;
@@ -63,11 +69,11 @@
private ChargingPileClient chargingPileClient;
@Autowired
private ChargingOrderClient chargingOrderClient;
-
+
@Resource
private ChargingGunClient chargingGunClient;
-
-
+
+
/**
* 小程序扫一扫 添加车辆
* @param dto
@@ -185,16 +191,26 @@
return R.ok(tAppCouponService.pagelist(couponId));
}
+ @ApiOperation(value = "优惠卷可用数量", tags = {"小程序-站点管理-站点详情"})
+ @PostMapping(value = "/couponCount")
+ public R<Long> couponCount() {
+ LocalDateTime now = LocalDateTime.now();
+ return R.ok(tAppCouponService.lambdaQuery().le(TAppCoupon::getStartTime, now).ge(TAppCoupon::getEndTime, now).eq(TAppCoupon::getStatus, 1).count());
+ }
+
@Autowired
private TAppUserTagService appUserTagService;
@Autowired
private TAppUserService appUserService;
+
/**
* 后台远程调用 给用户发放优惠券
*/
@PostMapping("/grantCoupon")
public R grantCoupon(@RequestBody GrantCouponDto dto){
List<TAppCoupon> res = new ArrayList<>();
+ TCoupon coupon = otherClient.getCouponById(dto.getCouponId()).getData();
+
switch (dto.getType()){
case 1:
// 根据标签ids 查询用户ids
@@ -208,6 +224,7 @@
tAppCoupon.setEndTime(dto.getEndTime());
tAppCoupon.setWaysToObtain(dto.getWaysToObtain());
tAppCoupon.setStatus(1);
+ tAppCoupon.setCouponJson(JSON.toJSONString(coupon));
res.add(tAppCoupon);
}
tAppCouponService.saveBatch(res);
@@ -224,6 +241,7 @@
tAppCoupon.setEndTime(dto.getEndTime());
tAppCoupon.setWaysToObtain(dto.getWaysToObtain());
tAppCoupon.setStatus(1);
+ tAppCoupon.setCouponJson(JSON.toJSONString(coupon));
res.add(tAppCoupon);
}
tAppCouponService.saveBatch(res);
@@ -236,6 +254,7 @@
tAppCoupon.setEndTime(dto.getEndTime());
tAppCoupon.setWaysToObtain(dto.getWaysToObtain());
tAppCoupon.setStatus(1);
+ tAppCoupon.setCouponJson(JSON.toJSONString(coupon));
res.add(tAppCoupon);
}
tAppCouponService.saveBatch(res);
--
Gitblit v1.7.1