Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-19 c143e52e5bcc512232e2b21626b0e649ad2176bb

 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java

@@ -1,8 +1,8 @@
package com.dsh.course.controller;

import com.dsh.course.entity.TCoursePackage;
import com.dsh.course.model.vo.response.Details;
import com.dsh.course.model.vo.response.ExchangeCoursePackageResponse;
import com.dsh.course.model.vo.response.WeekLimitedResponse;
import com.dsh.course.service.TCoursePackageDiscountService;
import com.dsh.course.service.TCoursePackageService;
import com.dsh.course.util.ResultUtil;
@@ -12,6 +12,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * @author zhibing.pu
@@ -61,7 +63,7 @@
            @ApiImplicitParam(name = "lon",value = "经度",dataType = "String"),
            @ApiImplicitParam(name = "lat",value = "纬度",dataType = "String"),
    })
    public ResultUtil<WeekLimitedResponse> thisWeeksBenefitList(Integer discountType,String lon,String lat){
    public ResultUtil<List<Details>> thisWeeksBenefitList(Integer discountType, String lon, String lat){
        try {
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            if(null == appUserId){