Skip to content

wangming / kzy-wx

Go to a project
Commit 73bbaa40 by 魏文甫
Options

Merge branch 'wei_master' into '105' 

update

See merge request !12
2 parents 670aec9d 357596a7
Inline Side-by-side
Showing with 36 additions and 31 deletions
src/main/java/com/server/web/common/service/Impl/UserServiceImpl.java
...@@ -62,36 +62,34 @@ public class UserServiceImpl implements UserService { ...@@ -62,36 +62,34 @@ public class UserServiceImpl implements UserService {
loginUser.setSignInCount(0); loginUser.setSignInCount(0);
} }
String firstDay = simpleDateFormat.format(DateUtils.firstDayOfMonth()); String firstDay = simpleDateFormat.format(DateUtils.firstDayOfMonth());
Integer integral = 1;
if (firstDay.equals(simpleDateFormat.format(new Date()))) { if (firstDay.equals(simpleDateFormat.format(new Date()))) {
loginUser.setIntegral(loginUser.getIntegral() + 1);
loginUser.setSignInCount(1); loginUser.setSignInCount(1);
tKzyUserIntegralFlowing.setIntegral(1); tKzyUserIntegralFlowing.setIntegral(1);
} else { } else {
if (loginUser.getSignInCount() <= 2) { if (loginUser.getSignInCount() <= 2) {
loginUser.setIntegral(loginUser.getIntegral() + 1); integral = 1;
loginUser.setSignInCount(loginUser.getSignInCount() + 1);
tKzyUserIntegralFlowing.setIntegral(1);
} else if (loginUser.getSignInCount() == 3) { } else if (loginUser.getSignInCount() == 3) {
loginUser.setIntegral(loginUser.getIntegral() + 3); integral = 3;
loginUser.setSignInCount(loginUser.getSignInCount() + 1);
tKzyUserIntegralFlowing.setIntegral(3);
} else if (loginUser.getSignInCount() == 4) { } else if (loginUser.getSignInCount() == 4) {
loginUser.setIntegral(loginUser.getIntegral() + 3); integral = 1;
loginUser.setSignInCount(loginUser.getSignInCount() + 1);
tKzyUserIntegralFlowing.setIntegral(1);
} else if (loginUser.getSignInCount() == 5) { } else if (loginUser.getSignInCount() == 5) {
loginUser.setIntegral(loginUser.getIntegral() + 5); integral = 5;
loginUser.setSignInCount(1);
tKzyUserIntegralFlowing.setIntegral(5); tKzyUserIntegralFlowing.setIntegral(5);
} else { } else {
loginUser.setIntegral(1); integral = 1;
loginUser.setSignInCount(1);
tKzyUserIntegralFlowing.setIntegral(1);
} }
loginUser.setSignInCount(loginUser.getSignInCount() + 1);
} }
loginUser.setIntegral(loginUser.getIntegral() + integral);
tKzyUserIntegralFlowing.setIntegral(integral);
loginUser.setLastSignDt(new Date()); loginUser.setLastSignDt(new Date());
tKzyUserMapper.updateByPrimaryKeySelective(loginUser); tKzyUserMapper.updateByPrimaryKeySelective(loginUser);
tKzyUserIntegralFlowingMapper.insertSelective(tKzyUserIntegralFlowing); tKzyUserIntegralFlowingMapper.insertSelective(tKzyUserIntegralFlowing);
Map<String, Object> dataMap = new HashMap<>();
dataMap.put("integral", integral);
dataMap.put("signInCount", loginUser.getSignInCount());
return ResultMapUtil.returnMap("1", "操作成功!", null); return ResultMapUtil.returnMap("1", "操作成功!", null);
} }
......
src/main/java/com/server/web/controller/CourseController.java
...@@ -7,10 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -7,10 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -44,7 +41,8 @@ public class CourseController extends BaseController { ...@@ -44,7 +41,8 @@ public class CourseController extends BaseController {
* *
* @return * @return
*/ */
@RequestMapping("/hotCourse") @ResponseBody
@RequestMapping(value = "/hotCourse", method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json")
public Map<String, Object> hotCourse() { public Map<String, Object> hotCourse() {
return tKzyCourseService.hotCourse(); return tKzyCourseService.hotCourse();
} }
...@@ -54,7 +52,8 @@ public class CourseController extends BaseController { ...@@ -54,7 +52,8 @@ public class CourseController extends BaseController {
* *
* @return * @return
*/ */
@RequestMapping("/recordCourse") @ResponseBody
@RequestMapping(value = "/recordCourse", method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json")
public Map<String, Object> recordCourse(@RequestParam(value = "typeId", required = false) Long typeId, @RequestParam(value = "pageNo", required = false) Integer pageNo, @RequestParam(value = "pageSize", required = false) Integer pageSize) { public Map<String, Object> recordCourse(@RequestParam(value = "typeId", required = false) Long typeId, @RequestParam(value = "pageNo", required = false) Integer pageNo, @RequestParam(value = "pageSize", required = false) Integer pageSize) {
return tKzyCourseService.recordCourse(typeId, pageNo, pageSize); return tKzyCourseService.recordCourse(typeId, pageNo, pageSize);
} }
...@@ -64,7 +63,8 @@ public class CourseController extends BaseController { ...@@ -64,7 +63,8 @@ public class CourseController extends BaseController {
* *
* @return * @return
*/ */
@RequestMapping("/livingCourse") @ResponseBody
@RequestMapping(value = "/livingCourse", method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json")
public Map<String, Object> livingCourse() { public Map<String, Object> livingCourse() {
return tKzyCourseService.livingCourse(); return tKzyCourseService.livingCourse();
} }
...@@ -74,7 +74,8 @@ public class CourseController extends BaseController { ...@@ -74,7 +74,8 @@ public class CourseController extends BaseController {
* *
* @return * @return
*/ */
@RequestMapping("/livingCourseDetail") @ResponseBody
@RequestMapping(value = "/livingCourseDetail", method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json")
public Map<String, Object> livingCourseDetail(HttpServletRequest request, @RequestParam(value = "courseId", required = true) Long courseId) { public Map<String, Object> livingCourseDetail(HttpServletRequest request, @RequestParam(value = "courseId", required = true) Long courseId) {
TKzyUser tKzyUser = getLoginUser(request); TKzyUser tKzyUser = getLoginUser(request);
Long userId = null; Long userId = null;
...@@ -89,7 +90,8 @@ public class CourseController extends BaseController { ...@@ -89,7 +90,8 @@ public class CourseController extends BaseController {
* *
* @return * @return
*/ */
@RequestMapping("/recordCourseDetail") @ResponseBody
@RequestMapping(value = "/recordCourseDetail", method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json")
public Map<String, Object> recordCourseDetail(HttpServletRequest request, @RequestParam(value = "courseId", required = true) Long courseId) { public Map<String, Object> recordCourseDetail(HttpServletRequest request, @RequestParam(value = "courseId", required = true) Long courseId) {
TKzyUser tKzyUser = getLoginUser(request); TKzyUser tKzyUser = getLoginUser(request);
Long userId = null; Long userId = null;
...@@ -105,7 +107,8 @@ public class CourseController extends BaseController { ...@@ -105,7 +107,8 @@ public class CourseController extends BaseController {
* @param courseId * @param courseId
* @return * @return
*/ */
@RequestMapping("/commentList") @ResponseBody
@RequestMapping(value = "/commentList", method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json")
public Map<String, Object> commentList(@RequestParam(value = "courseId") Long courseId, @RequestParam(value = "pageNo", required = false) Integer pageNo, @RequestParam(value = "pageSize", required = false) Integer pageSize) { public Map<String, Object> commentList(@RequestParam(value = "courseId") Long courseId, @RequestParam(value = "pageNo", required = false) Integer pageNo, @RequestParam(value = "pageSize", required = false) Integer pageSize) {
return tKzyCourseService.commentList(courseId, pageNo, pageSize); return tKzyCourseService.commentList(courseId, pageNo, pageSize);
} }
...@@ -118,7 +121,8 @@ public class CourseController extends BaseController { ...@@ -118,7 +121,8 @@ public class CourseController extends BaseController {
* @param comment * @param comment
* @return * @return
*/ */
@RequestMapping("/comment") @ResponseBody
@RequestMapping(value = "/comment", method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json")
public Map<String, Object> comment(HttpServletRequest request, @RequestParam(value = "courseId") Long courseId, @RequestParam(value = "comment") String comment) { public Map<String, Object> comment(HttpServletRequest request, @RequestParam(value = "courseId") Long courseId, @RequestParam(value = "comment") String comment) {
TKzyUser tKzyUser = getLoginUser(request); TKzyUser tKzyUser = getLoginUser(request);
Long userId = null; Long userId = null;
...@@ -135,7 +139,8 @@ public class CourseController extends BaseController { ...@@ -135,7 +139,8 @@ public class CourseController extends BaseController {
* @param userId * @param userId
* @return * @return
*/ */
@RequestMapping("/tmpSetSession") @ResponseBody
@RequestMapping(value = "/tmpSetSession", method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json")
public Map<String, Object> tmpSetSession(HttpServletRequest request, @RequestParam(value = "userId", required = true) Long userId) { public Map<String, Object> tmpSetSession(HttpServletRequest request, @RequestParam(value = "userId", required = true) Long userId) {
Map<String, Object> resultMap = new HashMap<String, Object>(); Map<String, Object> resultMap = new HashMap<String, Object>();
resultMap.put("status", "0"); resultMap.put("status", "0");
......
src/main/java/com/server/web/controller/UserController.java
...@@ -28,7 +28,7 @@ public class UserController extends BaseController { ...@@ -28,7 +28,7 @@ public class UserController extends BaseController {
UserService userService; UserService userService;
@GetMapping("/userData") @PostMapping("/userData")
public Map userData(HttpServletRequest request) { public Map userData(HttpServletRequest request) {
TKzyUser loginUser = getLoginUser(request); TKzyUser loginUser = getLoginUser(request);
return returnSuccess(loginUser); return returnSuccess(loginUser);
...@@ -221,7 +221,8 @@ public class UserController extends BaseController { ...@@ -221,7 +221,8 @@ public class UserController extends BaseController {
* @param request * @param request
* @return * @return
*/ */
@GetMapping("/signIn") @ResponseBody
@RequestMapping(value = "/signIn", method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json")
public Map<String, Object> signIn(HttpServletRequest request) { public Map<String, Object> signIn(HttpServletRequest request) {
TKzyUser loginUser = getLoginUser(request); TKzyUser loginUser = getLoginUser(request);
if (loginUser == null || loginUser.getId() == null) { if (loginUser == null || loginUser.getId() == null) {
...@@ -236,7 +237,8 @@ public class UserController extends BaseController { ...@@ -236,7 +237,8 @@ public class UserController extends BaseController {
* @param request * @param request
* @return * @return
*/ */
@GetMapping("/signInList") @ResponseBody
@RequestMapping(value = "/signInList", method = {RequestMethod.POST,RequestMethod.GET},produces = "application/json")
public Map<String, Object> signInList(HttpServletRequest request) { public Map<String, Object> signInList(HttpServletRequest request) {
TKzyUser loginUser = getLoginUser(request); TKzyUser loginUser = getLoginUser(request);
if (loginUser == null || loginUser.getId() == null) { if (loginUser == null || loginUser.getId() == null) {
......
src/main/resources/mybatis/mapping/IntegralMapper.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<select id="signInList" parameterType="java.util.HashMap" resultType="java.util.HashMap"> <select id="signInList" parameterType="java.util.HashMap" resultType="java.util.HashMap">
SELECT SELECT
t.id, t.id,
t.create_dt AS t.createDt, t.create_dt AS createDt,
t.integral t.integral
FROM FROM
t_kzy_user_integral_flowing t t_kzy_user_integral_flowing t
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!