cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -168,9 +168,9 @@ @ApiImplicitParam(value = "课包id", name = "lessonId", required = true, dataType = "int"), @ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"), }) public ResultUtil<ClassDetailsInsVo> coursePackageDetails(@RequestBody Integer lessonId, @RequestBody Integer stuId, HttpServletRequest request){ public ResultUtil<ClassDetailsInsVo> coursePackageDetails(@RequestBody Integer lessonId, @RequestBody Integer stuId){ try { Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request); Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(); if(null == userIdFormRedis){ return ResultUtil.tokenErr(); } @@ -193,9 +193,9 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), }) public ResultUtil<List<PurchaseRecordVo>> recordList(@RequestBody RecordTimeRequest timeRequest, HttpServletRequest request){ public ResultUtil<List<PurchaseRecordVo>> recordList(@RequestBody RecordTimeRequest timeRequest){ try { Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request); Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(); if(null == userIdFormRedis){ return ResultUtil.tokenErr(); } @@ -215,9 +215,9 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil<CourseDetailsOfContinuationResp> renewalOfCourses(@RequestBody Integer lessonId, @RequestBody Integer stuId, HttpServletRequest request){ public ResultUtil<CourseDetailsOfContinuationResp> renewalOfCourses(@RequestBody Integer lessonId, @RequestBody Integer stuId){ try { Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request); Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(); if(null == userIdFormRedis){ return ResultUtil.tokenErr(); } @@ -238,9 +238,9 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil<List<CouponStuAvailableVo>> queryCouponList(HttpServletRequest request){ public ResultUtil<List<CouponStuAvailableVo>> queryCouponList(){ try { Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(request); Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(); if(null == userIdFormRedis){ return ResultUtil.tokenErr(); } @@ -300,9 +300,9 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil<StuMedalVo> queryStuMedal(@RequestParam("stuId") Integer stuId, HttpServletRequest request){ public ResultUtil<StuMedalVo> queryStuMedal(@RequestParam("stuId") Integer stuId){ try { Integer appUserId = tokenUtil.getUserIdFormRedis(request); Integer appUserId = tokenUtil.getUserIdFormRedis(); if(null == appUserId){ return ResultUtil.tokenErr(); } cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java
@@ -1,12 +1,12 @@ package com.dsh.account.entity; import com.baomidou.mybatisplus.enums.IdType; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import java.io.Serializable; import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; cloud-server-account/src/main/java/com/dsh/account/mapper/EvaluateStudentMapper.java
@@ -1,7 +1,7 @@ package com.dsh.account.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dsh.account.entity.EvaluateStudent; import com.baomidou.mybatisplus.mapper.BaseMapper; /** * <p> cloud-server-account/src/main/java/com/dsh/account/service/EvaluateStudentService.java
@@ -1,7 +1,7 @@ package com.dsh.account.service; import com.baomidou.mybatisplus.extension.service.IService; import com.dsh.account.entity.EvaluateStudent; import com.baomidou.mybatisplus.service.IService; import com.dsh.account.model.vo.commentDetail.StuCommentsVo; import java.util.List; @@ -16,6 +16,8 @@ */ public interface EvaluateStudentService extends IService<EvaluateStudent> { List<StuCommentsVo> queryStuCommentsList(Integer stuId); } cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java
@@ -1,7 +1,7 @@ package com.dsh.account.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsh.account.entity.EvaluateStudent; import com.dsh.account.entity.TStudent; import com.dsh.account.mapper.EvaluateStudentMapper; @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -27,7 +28,7 @@ @Service public class EvaluateStudentServiceImpl extends ServiceImpl<EvaluateStudentMapper, EvaluateStudent> implements EvaluateStudentService { @Autowired @Resource private TStudentMapper tstuMapper; private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); @@ -36,7 +37,7 @@ public List<StuCommentsVo> queryStuCommentsList(Integer stuId) { List<StuCommentsVo> stuCommentsVos = new ArrayList<>(); TStudent tStudent = tstuMapper.selectById(stuId); List<EvaluateStudent> evaluateStudents = this.baseMapper.selectList(new EntityWrapper<EvaluateStudent>() List<EvaluateStudent> evaluateStudents = this.list(new QueryWrapper<EvaluateStudent>() .eq("studentId",stuId )); if (evaluateStudents.size() > 0){ for (EvaluateStudent evaluateStudent : evaluateStudents) { cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java
@@ -5,6 +5,7 @@ import com.dsh.activity.model.CouponListVo; import java.util.List; import java.util.Map; /** * @author zhibing.pu @@ -20,4 +21,9 @@ * @throws Exception */ List<CouponListVo> queryCouponList(Integer uid, Integer distributionMethod) throws Exception; Map<String, Object> queryConponRuleOfJson(Integer id); } cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -20,7 +20,7 @@ import java.util.*; @RestController @RequestMapping("/base/protocol") @RequestMapping("") public class StoreController { @Autowired @@ -33,10 +33,10 @@ @PostMapping("/storeDetail/courseOfSto") @PostMapping("/base/protocol/storeDetail/courseOfSto") public StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId){ StoreDetailOfCourse ofCourse = new StoreDetailOfCourse(); Store store = stoService.getById(storeId); Store store = storeService.getById(storeId); if (null != store){ ofCourse.setStoreName(store.getName()); ofCourse.setStoreAddr(store.getAddress()); @@ -44,7 +44,7 @@ return ofCourse; } @PostMapping("/storeDetail/nearbyStore") @PostMapping("/base/protocol/storeDetail/nearbyStore") public List<StoreInfo> getAllNearbyStoreList(@RequestBody String longitude,@RequestBody String latitude){ String current = longitude+","+latitude; List<StoreInfo> storeInfos = new ArrayList<>(); @@ -55,7 +55,7 @@ }catch (Exception e){ e.printStackTrace(); } List<Store> storeList = stoService.list(new QueryWrapper<Store>() List<Store> storeList = storeService.list(new QueryWrapper<Store>() .eq("state", 1) .eq("cityCode",cityCode)); if (storeList.size() > 0){ @@ -84,13 +84,13 @@ } @PostMapping("/storeDetail/storeOfLonLat") @PostMapping("/base/protocol/storeDetail/storeOfLonLat") public List<StoreLonLatList> getAllStoreLonLats(@RequestBody String longitude, @RequestBody String latitude){ List<StoreLonLatList> storeInfos = new ArrayList<>(); try { Map<String, String> geocode = gdMapGeocodingUtil.geocode(longitude, latitude); String cityCode = geocode.get("cityCode"); List<Store> storeList = stoService.list(new QueryWrapper<Store>() List<Store> storeList = storeService.list(new QueryWrapper<Store>() .eq("cityCode",cityCode)); if (storeList.size() > 0){ for (Store store : storeList) { @@ -192,86 +192,4 @@ } } /** * 获取门店列表 * @param provinceCode * @param cityCode * @return */ @ResponseBody @PostMapping("/store/queryStoreList") public List<Store> queryStoreList(@RequestBody String provinceCode, @RequestBody String cityCode){ try { return storeService.queryStorsList(provinceCode, cityCode); }catch (Exception e){ e.printStackTrace(); return new ArrayList<>(); } } @ResponseBody @PostMapping("/base/store/queryStoreLists") @ApiOperation(value = "获取门店列表", tags = {"APP-加入玩湃"}) @ApiImplicitParams({ @ApiImplicitParam(value = "经纬", name = "lon", dataType = "string", required = true), @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true), }) public ResultUtil<List<BaseVo>> queryStoreLists(@RequestBody String lon, @RequestBody String lat){ if(ToolUtil.isEmpty(lon)){ return ResultUtil.paranErr("lon"); } if(ToolUtil.isEmpty(lat)){ return ResultUtil.paranErr("lat"); } try { List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat); return ResultUtil.success(baseVos); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); } } /** * 根据门店模糊搜索店铺 * @param name * @return */ @ResponseBody @PostMapping("/store/queryStoreListByName") public List<Store> queryStoreListByName(@RequestBody String name){ try { List<Store> stores = storeService.list(new QueryWrapper<Store>().eq("state", 1).like("name", name)); return stores; }catch (Exception e){ e.printStackTrace(); return new ArrayList<>(); } } /** * 根据门店 * @param id * @return */ @ResponseBody @PostMapping("/store/queryStoreById") public Store queryStoreById(@RequestBody Integer id){ try { return storeService.getById(id); }catch (Exception e){ e.printStackTrace(); return null; } } }
