From ef3996043992d97eaf5a0da6b02bad70dcfddf8f Mon Sep 17 00:00:00 2001 From: zhibing.pu <393733352@qq.com> Date: 星期五, 16 八月 2024 15:31:25 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 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 5f5f700..a85603f 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 @@ -5,10 +5,13 @@ import com.ruoyi.account.api.dto.CouponListDto; import com.ruoyi.account.api.dto.GrantCouponDto; 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.account.api.vo.ExchangeRecordVO; import com.ruoyi.account.service.TAppCouponService; +import com.ruoyi.account.service.TAppUserCarService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.BasePage; @@ -43,19 +46,31 @@ @Autowired private OtherClient otherClient; + @Autowired + private TAppUserCarService appUserCarService; /** * 查询用户可用优惠券数量 * @param dto * @return */ - @ApiOperation(value = "选择优惠券分页查询", tags = {"小程序-扫一扫"}) @PostMapping(value = "/scan/couponList") public AjaxResult<PageInfo<CouponListVOVO>> couponList(@RequestBody CouponListDto dto) { - PageInfo<CouponListVOVO> res = tAppCouponService.couponList(dto); return AjaxResult.ok(res); } + /** + * 选择车辆列表 + * @return + */ + @ApiOperation(value = "选择车辆列表", tags = {"小程序-扫一扫"}) + @PostMapping(value = "/scan/carList") + public AjaxResult<List<TAppUserCar>> carList() { + // todo 用户id + List<TAppUserCar> appUserId = appUserCarService.list(new QueryWrapper<TAppUserCar>() + .eq("app_user_id", 11)); + return AjaxResult.ok(appUserId); + } /** * 管理后台远程调用 根据优惠券ids 查询对应的发放数量 -- Gitblit v1.7.1