管理台bug和用户端

jiangqs

2023-07-11 7109e2fefaa46caffcd36b44828f48e0f8a790ba

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.vo.AppUnGetCouponPageVo;
import com.ruoyi.member.domain.vo.AppGetAbleCouponPageVo;
import com.ruoyi.member.service.coupon.CouponService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.system.api.domain.dto.AppPageDto;
@@ -25,7 +25,7 @@
 * @Date 2023/7/9 11:44
 * @Version 1.0
 */
@Api(value = "小程序配置相关接口", tags = "小程序配置相关接口", description = "小程序配置相关接口")
@Api(value = "小程序优惠券相关接口", tags = "小程序优惠券相关接口", description = "小程序优惠券相关接口")
@RestController
@RequestMapping("/app/coupon")
public class AppCouponController {
@@ -39,7 +39,7 @@

    @RequestMapping(value = "/pageAppUserGetAbleCoupon", method = RequestMethod.POST)
    @ApiOperation(value = "用户分页获取可领取优惠券列表")
    public R<Page<AppUnGetCouponPageVo>> pagePlatformMerCoupon(@RequestBody AppPageDto appPageDto) {
    public R<Page<AppGetAbleCouponPageVo>> pagePlatformMerCoupon(@RequestBody AppPageDto appPageDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getByUserId(userId);
@@ -47,10 +47,10 @@
            }
        }
        appPageDto.setUserId(userId);
        Page<AppUnGetCouponPageVo> page = new Page<>();
        Page<AppGetAbleCouponPageVo> page = new Page<>();
        page.setSize(appPageDto.getPageSize());
        page.setCurrent(appPageDto.getPageNum());
        List<AppUnGetCouponPageVo> unGetCouponPageVoList = couponService.pageAppUserGetAbleCoupon(page,appPageDto);
        List<AppGetAbleCouponPageVo> unGetCouponPageVoList = couponService.pageAppUserGetAbleCoupon(page,appPageDto);
        return R.ok(page.setRecords(unGetCouponPageVoList));
    }