From 5c41048a7b55e5df92fc88996ef10e58cbf967d1 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 21 八月 2024 18:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 b01fb9f..c8ae422 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
@@ -7,6 +7,9 @@
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery;
+import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient;
+import com.ruoyi.chargingPile.api.model.TChargingGun;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.other.api.vo.CouponListVOVO;
import com.ruoyi.account.api.vo.ExchangeRecordVO;
import com.ruoyi.account.service.TAppCouponService;
@@ -26,6 +29,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
@@ -54,6 +58,11 @@
private ChargingPileClient chargingPileClient;
@Autowired
private ChargingOrderClient chargingOrderClient;
+
+ @Resource
+ private ChargingGunClient chargingGunClient;
+
+
/**
* 小程序扫一扫 添加车辆
* @param dto
@@ -70,10 +79,13 @@
* 查询用户可用优惠券数量
* @return
*/
- @ApiOperation(value = "通过桩编号和预付金额获取电站详情", tags = {"小程序-扫一扫"})
+ @ApiOperation(value = "通过充电枪id和预付金额获取电站详情", tags = {"小程序-扫一扫"})
@GetMapping(value = "/scan/siteInfo")
- public AjaxResult<SiteInfoVO> siteInfo(String number,BigDecimal money) {
- SiteInfoVO data = chargingPileClient.getSiteInfoByNumber(number).getData();
+ 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();
+ data.setChargingGunId(id);
List<TAppUserCar> cars = appUserCarService.list(new QueryWrapper<TAppUserCar>()
.eq("app_user_id",tokenService.getLoginUserApplet().getUserId())
.orderByDesc("create_time"));
@@ -133,7 +145,7 @@
* @return 优惠券ids 查询每个优惠券的发放数量
*/
@PostMapping("/getCountByCouponIds")
- public R<List<Integer>> getCountByCouponIds(@RequestParam("couponIds") String couponIds) {
+ public R<List<Integer>> getCountByCouponIds( String couponIds) {
// 最终结果 和优惠券id一一对应
List<Integer> res = new ArrayList<>();
String[] split = couponIds.split(",");
--
Gitblit v1.7.1