From 965af8a1b7b7470a1d3659fb9efed1da21713a1c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 29 九月 2024 09:01:52 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 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 8cfd00d..e17f179 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
@@ -38,6 +38,7 @@
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;
@@ -64,15 +65,30 @@
private TAppUserCarService appUserCarService;
@Autowired
private TokenService tokenService;
- @Autowired
+ @Resource
private ChargingPileClient chargingPileClient;
- @Autowired
+ @Resource
private ChargingOrderClient chargingOrderClient;
-
@Resource
private ChargingGunClient chargingGunClient;
+
+ @Autowired
+ private TAppUserTagService appUserTagService;
+ @Autowired
+ private TAppUserService appUserService;
+
-
+ /**
+ * 后台退款 回退优惠券使用状态
+ * @return
+ */
+ @PostMapping(value = "/refund/{id}")
+ public R refund(@PathVariable("id") String id) {
+ TAppCoupon byId = tAppCouponService.getById(id);
+ byId.setStatus(1);
+ tAppCouponService.updateById(byId);
+ return R.ok();
+ }
/**
* 小程序扫一扫 添加车辆
* @param dto
@@ -90,16 +106,19 @@
* @return
*/
@ApiOperation(value = "通过充电枪id和预付金额获取电站详情", tags = {"小程序-扫一扫"})
- @GetMapping(value = "/scan/siteInfo")
+ @PostMapping(value = "/scan/siteInfo")
public AjaxResult<SiteInfoVO> siteInfo(Integer id, BigDecimal money) {
TChargingGun chargingGun = chargingGunClient.getChargingGunById(id).getData();
TChargingPile chargingPile = chargingPileClient.getChargingPileById(chargingGun.getChargingPileId()).getData();
- SiteInfoVO data = chargingPileClient.getSiteInfoByNumber(chargingPile.getNumber().toString()).getData();
+ SiteInfoVO data = chargingPileClient.getSiteInfoByNumber1(chargingPile.getCode().toString()).getData();
data.setChargingGunId(id);
+ data.setChargeMode(chargingGun.getChargeMode());
List<TAppUserCar> cars = appUserCarService.list(new QueryWrapper<TAppUserCar>()
.eq("app_user_id",tokenService.getLoginUserApplet().getUserId())
.orderByDesc("create_time"));
Long data1 = chargingOrderClient.getCar().getData();
+ Integer data2 = otherClient.getAddCarIntegral().getData();
+ data.setIntegral(data2);
if (!cars.isEmpty()){
if (data1 == -1){
// 没有充电订单 展示最新添加的车辆
@@ -186,14 +205,18 @@
* @return
*/
@PostMapping("/getExchangeRecordByCouponId")
- public R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId){
+ public R<List<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId){
return R.ok(tAppCouponService.pagelist(couponId));
}
- @Autowired
- private TAppUserTagService appUserTagService;
- @Autowired
- private TAppUserService appUserService;
+ @ApiOperation(value = "优惠卷可用数量", tags = {"小程序-站点管理-站点详情"})
+ @GetMapping(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());
+ }
+
+
/**
* 后台远程调用 给用户发放优惠券
@@ -257,5 +280,17 @@
return R.ok();
}
+
+
+ /**
+ * 根据id获取优惠券领取记录
+ * @param id
+ * @return
+ */
+ @PostMapping("/getAppCouponById")
+ public R<TAppCoupon> getAppCouponById(@RequestParam("id") Long id){
+ TAppCoupon appCoupon = tAppCouponService.getById(id);
+ return R.ok(appCoupon);
+ }
}
--
Gitblit v1.7.1