From 782f0259bc2c0362a1075ea401c815186321d8c6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 21 八月 2024 10:45:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 17 ++++++++++++++---
1 files changed, 14 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 2bf740b..f529267 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,8 +7,7 @@
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery;
-import com.ruoyi.account.api.vo.CarListVO;
-import com.ruoyi.account.api.vo.CouponListVOVO;
+import com.ruoyi.other.api.vo.CouponListVOVO;
import com.ruoyi.account.api.vo.ExchangeRecordVO;
import com.ruoyi.account.service.TAppCouponService;
import com.ruoyi.account.service.TAppUserCarService;
@@ -54,6 +53,18 @@
private ChargingPileClient chargingPileClient;
@Autowired
private ChargingOrderClient chargingOrderClient;
+ /**
+ * 小程序扫一扫 添加车辆
+ * @param dto
+ * @return
+ */
+ @ApiOperation(value = "添加车辆", tags = {"小程序-扫一扫"})
+ @PostMapping(value = "/scan/addCar")
+ public AjaxResult addCar(@RequestBody TAppUserCar dto) {
+ dto.setAppUserId(tokenService.getLoginUserApplet().getUserId());
+ appUserCarService.save(dto);
+ return AjaxResult.success();
+ }
/**
* 查询用户可用优惠券数量
* @return
@@ -112,7 +123,7 @@
* @return 优惠券ids 查询每个优惠券的发放数量
*/
@PostMapping("/getCountByCouponIds")
- public R<List<Integer>> getCountByCouponIds(String couponIds) {
+ public R<List<Integer>> getCountByCouponIds(@RequestParam("couponIds") String couponIds) {
// 最终结果 和优惠券id一一对应
List<Integer> res = new ArrayList<>();
String[] split = couponIds.split(",");
--
Gitblit v1.7.1