From 1a156f131788cb4a73bbe83896e4752779ca84cf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Jun 2021 14:47:36 +0800
Subject: [PATCH] 20210630 积分拨付
---
gc-user/src/main/java/com/xzx/gc/user/dto/AddScoreNumDto.java | 15 +++++++
gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java | 22 +++++++++++
gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java | 29 ++++++++++++++
gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java | 3 +
4 files changed, 69 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 ffed1bc..b2d42bb 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
@@ -1,6 +1,7 @@
package com.xzx.gc.user.controller;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import com.xzx.gc.common.constant.CommonEnum;
import com.xzx.gc.common.constant.Constants;
@@ -9,10 +10,14 @@
import com.xzx.gc.entity.JhyInfo;
import com.xzx.gc.entity.ScoreDetails;
import com.xzx.gc.entity.ScoreOrder;
+import com.xzx.gc.entity.UserInfo;
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.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.JhyInfoListVo;
import io.swagger.annotations.Api;
@@ -39,6 +44,8 @@
private JhyInfoService jhyInfoService;
@Autowired
private JhyInfoMapper jhyInfoMapper;
+ @Autowired
+ private UserMapper userMapper;
@ApiOperation(value = "集货员信息列表")
@ApiResponses(
@@ -50,6 +57,28 @@
}
/**
+ * 增加积分
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/jhy/addScoreNum.json")
+ @ApiOperation(value="集物员--增加积分", notes="test: 仅0有正确返回")
+ public JsonResult addScoreNum(@RequestBody AddScoreNumDto model, HttpServletRequest request) {
+ Integer score = model.getScore();
+ if(score <= 0){
+ return JsonResult.failMessage("请输入正确的积分数量！");
+ }
+ String userId = model.getUserId();
+ UserInfo userInfo = userMapper.selectByPrimaryKey(userId);
+ if(ObjectUtil.isEmpty(userInfo)){
+ return JsonResult.failMessage("查询不到用户信息！");
+ }
+ jhyInfoService.addScoreNum(model);
+ OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
+ .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("积分商城-"+userId+"-增加积分-" + score).build();
+ mqUtil.sendApp(build);
+ return JsonResult.success("操作成功！");
+ }
+
+ /**
* 取消
*/
@PostMapping(Constants.ADMIN_VIEW_PREFIX + "/jhy/examineJwy.json")
diff --git a/gc-user/src/main/java/com/xzx/gc/user/dto/AddScoreNumDto.java b/gc-user/src/main/java/com/xzx/gc/user/dto/AddScoreNumDto.java
new file mode 100644
index 0000000..ae4692f
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/dto/AddScoreNumDto.java
@@ -0,0 +1,15 @@
+package com.xzx.gc.user.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AddScoreNumDto {
+
+ @ApiModelProperty(value="用户ID",required=true)
+ private String userId;
+
+ @ApiModelProperty(value="积分数量",required=true)
+ private Integer score;
+
+}
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 9c01856..3055b23 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
@@ -1,20 +1,26 @@
package com.xzx.gc.user.service;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.exception.RestException;
+import com.xzx.gc.entity.AccountInfo;
import com.xzx.gc.entity.JhyInfo;
+import com.xzx.gc.entity.ScoreGoodsSearch;
+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.mapper.AccountMapper;
import com.xzx.gc.user.mapper.JhyInfoMapper;
import com.xzx.gc.user.vo.JhyInfoListVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
import java.util.Date;
import java.util.HashMap;
@@ -28,6 +34,8 @@
@Autowired
private JhyInfoMapper jhyInfoMapper;
+ @Autowired
+ private AccountMapper accountMapper;
public void applyJhy(JhyApplyDto applyDto) {
JhyInfo mobileIsExist = jhyInfoMapper.selectExistJhyByIndeityOrMobile(applyDto.getMobile(), applyDto.getIdentity());
@@ -103,4 +111,18 @@
}
jhyInfoMapper.updateByPrimaryKey(jhyInfo);
}
+
+ public void addScoreNum(AddScoreNumDto model) {
+ 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());
+ collectScore = collectScore + model.getScore();
+ accountInfo.setCollectScore(collectScore.toString());
+ accountMapper.updateByPrimaryKey(accountInfo);
+ }
+ }
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
index 01679f0..123aed7 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
@@ -22,6 +22,9 @@
@ApiModelProperty(value = "手机号")
private String mobile;
+ @ApiModelProperty(value = "用户USERID")
+ private String userId;
+
@ApiModelProperty(value = "身份证号")
private String identity;
--
Gitblit v1.9.1