Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2024-08-16 731c3d326b6cc2e08e703f06d06aa453bc52cda3

 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,6 +46,8 @@
    @Autowired
    private OtherClient otherClient;

    @Autowired
    private TAppUserCarService appUserCarService;
    /**
     * 查询用户可用优惠券数量
     * @param dto
@@ -55,14 +60,16 @@
        return AjaxResult.ok(res);
    }
    /**
     *
     * @param dto
     * 选择车辆列表
     * @return
     */
    @ApiOperation(value = "选择车辆列表", tags = {"小程序-扫一扫"})
    @PostMapping(value = "/scan/carList")
    public AjaxResult<CouponListVOVO> carList(@RequestBody CouponListDto dto) {
        return AjaxResult.success();
    public AjaxResult<List<TAppUserCar>> carList() {
        // todo 用户id
        List<TAppUserCar> appUserId = appUserCarService.list(new QueryWrapper<TAppUserCar>()
                .eq("app_user_id", 11));
        return AjaxResult.ok(appUserId);
    }

    /**