From 60471f5ff134cd036495cd33249d757a1f9a351a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Jun 2021 16:40:49 +0800
Subject: [PATCH] 20210630 积分拨付

---
 gc-user/src/main/java/com/xzx/gc/user/vo/GetScoreNumVo.java                  |   16 ++++++++
 gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java            |   20 ++++++++--
 gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java |   23 +++++++++++
 gc-user/src/main/java/com/xzx/gc/user/dto/GetScoreNumDto.java                |   11 +++++
 4 files changed, 66 insertions(+), 4 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")
diff --git a/gc-user/src/main/java/com/xzx/gc/user/dto/GetScoreNumDto.java b/gc-user/src/main/java/com/xzx/gc/user/dto/GetScoreNumDto.java
new file mode 100644
index 0000000..85bb648
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/dto/GetScoreNumDto.java
@@ -0,0 +1,11 @@
+package com.xzx.gc.user.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class GetScoreNumDto {
+
+    @ApiModelProperty(value="用户ID",required=true)
+    private String userId;
+}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
index ea4fb16..34fe401 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
@@ -9,12 +9,10 @@
 import com.xzx.gc.entity.AccountInfo;
 import com.xzx.gc.entity.JhyInfo;
 import com.xzx.gc.entity.ScoreDetails;
-import com.xzx.gc.user.dto.AddScoreNumDto;
-import com.xzx.gc.user.dto.ExamineJwyDto;
-import com.xzx.gc.user.dto.JhyApplyDto;
-import com.xzx.gc.user.dto.JhyInfoListDto;
+import com.xzx.gc.user.dto.*;
 import com.xzx.gc.user.mapper.AccountMapper;
 import com.xzx.gc.user.mapper.JhyInfoMapper;
+import com.xzx.gc.user.vo.GetScoreNumVo;
 import com.xzx.gc.user.vo.JhyInfoListVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -135,4 +133,18 @@
             accountMapper.insertScoreDetailsRet(scoreDetailsRet);
         }
     }
+
+    public GetScoreNumVo getScoreNum(GetScoreNumDto model) {
+        GetScoreNumVo getScoreNumVo = new GetScoreNumVo();
+        Example exampleAccount = new Example(AccountInfo.class);
+        Example.Criteria criteriaAccount = exampleAccount.createCriteria();
+        criteriaAccount.andEqualTo("userId",model.getUserId());
+        List<AccountInfo> accountInfos = accountMapper.selectByExample(exampleAccount);
+        if(CollUtil.isNotEmpty(accountInfos)){
+            AccountInfo accountInfo = accountInfos.get(0);
+            Integer collectScore = Integer.parseInt(accountInfo.getCollectScore());
+            getScoreNumVo.setScore(new BigDecimal(collectScore));
+        }
+        return getScoreNumVo;
+    }
 }
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/GetScoreNumVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/GetScoreNumVo.java
new file mode 100644
index 0000000..053d8bc
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/GetScoreNumVo.java
@@ -0,0 +1,16 @@
+package com.xzx.gc.user.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "GetScoreNumVo", description = "获取积分返回参数类")
+public class GetScoreNumVo {
+
+    @ApiModelProperty(value = "积分数")
+    private BigDecimal score;
+
+}

--
Gitblit v1.9.1