From 4b5eb2ee5cfcffe55a72e29a388c75715eb45d28 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 23 十月 2024 20:52:07 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 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 f675847..7944129 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
@@ -39,10 +39,7 @@
import java.math.BigDecimal;
import javax.annotation.Resource;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -63,7 +60,7 @@
@Autowired
private TAppUserCarService appUserCarService;
- @Autowired
+ @Resource
private TokenService tokenService;
@Resource
private ChargingPileClient chargingPileClient;
@@ -112,15 +109,16 @@
TChargingPile chargingPile = chargingPileClient.getChargingPileById(chargingGun.getChargingPileId()).getData();
SiteInfoVO data = chargingPileClient.getSiteInfoByNumber1(chargingPile.getCode().toString()).getData();
data.setChargingGunId(id);
+ data.setSiteId(chargingGun.getSiteId());
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();
+ Long data1 = chargingOrderClient.getCar(tokenService.getLoginUserApplet().getUserId().toString()).getData();
Integer data2 = otherClient.getAddCarIntegral().getData();
data.setIntegral(data2);
if (!cars.isEmpty()){
- if (data1 == -1){
+ if (null == data1 || data1 == -1){
// 没有充电订单 展示最新添加的车辆
data.setLicensePlate(cars.get(0).getLicensePlate());
data.setVehicleBrand(cars.get(0).getVehicleBrand());
@@ -212,8 +210,12 @@
@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());
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ Long count = tAppCouponService.lambdaQuery().eq(TAppCoupon::getAppUserId, userId).ge(TAppCoupon::getEndTime, LocalDateTime.now()).eq(TAppCoupon::getStatus, 1).count();
+ if(Objects.isNull(count)){
+ count = 0L;
+ }
+ return R.ok(count);
}
@@ -223,7 +225,9 @@
*/
@PostMapping("/grantCoupon")
public R grantCoupon(@RequestBody GrantCouponDto dto){
+ if (dto.getWaysToObtain()==null){
dto.setWaysToObtain(3);
+ }
List<TAppCoupon> res = new ArrayList<>();
TCoupon coupon = otherClient.getCouponById(dto.getCouponId()).getData();
@@ -304,5 +308,16 @@
TAppCoupon appCoupon = tAppCouponService.getById(id);
return R.ok(appCoupon);
}
+
+ /**
+ * 修改用户优惠券
+ * @param appCoupon
+ * @return
+ */
+ @PostMapping("/updateAppCoupon")
+ public R updateAppCoupon(@RequestBody TAppCoupon appCoupon){
+ tAppCouponService.updateById(appCoupon);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1