From 8d99c68a91484026ab86f837aaa25cbb4b19911e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 23 十月 2024 18:50:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 b06dc64..da21e71 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
@@ -109,11 +109,12 @@
TChargingPile chargingPile = chargingPileClient.getChargingPileById(chargingGun.getChargingPileId()).getData();
SiteInfoVO data = chargingPileClient.getSiteInfoByNumber1(chargingPile.getCode().toString()).getData();
data.setChargingGunId(id);
+ data.setSiteId(chargingGun.getId());
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()){
@@ -305,5 +306,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