From cd4f41c98dd9a071b3e2003e324b9fd61472c7f4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Jun 2021 16:40:53 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java
index 95ee520..57ca601 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java
@@ -14,11 +14,13 @@
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.user.dto.AddScoreNumDto;
import com.xzx.gc.user.dto.ExamineJwyDto;
+import com.xzx.gc.user.dto.GetScoreNumDto;
import com.xzx.gc.user.dto.JhyInfoListDto;
import com.xzx.gc.user.mapper.AccountMapper;
import com.xzx.gc.user.mapper.JhyInfoMapper;
import com.xzx.gc.user.mapper.UserMapper;
import com.xzx.gc.user.service.JhyInfoService;
+import com.xzx.gc.user.vo.GetScoreNumVo;
import com.xzx.gc.user.vo.JhyInfoListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -57,6 +59,27 @@
}
/**
+ * 获取积分
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/jhy/getScoreNum.json")
+ @ApiResponses(
+ @ApiResponse(code = 200, message = "success", response = GetScoreNumVo.class)
+ )
+ @ApiOperation(value="集物员--获取积分", notes="test: 仅0有正确返回")
+ public JsonResult getScoreNum(@RequestBody GetScoreNumDto model, HttpServletRequest request) {
+ String userId = model.getUserId();
+ UserInfo userInfo = userMapper.selectByPrimaryKey(userId);
+ if(ObjectUtil.isEmpty(userInfo)){
+ return JsonResult.failMessage("查询不到用户信息！");
+ }
+ GetScoreNumVo getScoreNumVo = jhyInfoService.getScoreNum(model);
+ OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
+ .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("积分商城-获取积分-" + userId).build();
+ mqUtil.sendApp(build);
+ return JsonResult.success(getScoreNumVo);
+ }
+
+ /**
* 调整积分
*/
@PostMapping(Constants.ADMIN_VIEW_PREFIX + "/jhy/addScoreNum.json")
--
Gitblit v1.9.1