From 96e858bd02271c8aba75abf5e3503e7cad7241a8 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 30 Jun 2021 14:59:55 +0800 Subject: [PATCH] modify --- gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java | 71 +++++++++++++++++++++++++++++++++++ 1 files changed, 71 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 3984a19..95ee520 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,19 +1,38 @@ 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; +import com.xzx.gc.common.dto.log.OperationAppLog; import com.xzx.gc.common.request.BaseController; +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; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import tk.mybatis.mapper.entity.Example; +import javax.servlet.http.HttpServletRequest; +import java.util.List; import java.util.Map; @RestController @@ -23,10 +42,62 @@ @Autowired private JhyInfoService jhyInfoService; + @Autowired + private JhyInfoMapper jhyInfoMapper; + @Autowired + private UserMapper userMapper; @ApiOperation(value = "集货员信息列表") + @ApiResponses( + @ApiResponse(code = 200, message = "success", response = JhyInfoListVo.class) + ) @PostMapping(value = Constants.ADMIN_VIEW_PREFIX + "/jhy/list.json") public JsonResult<Map<String, Object>> jhyList(@RequestBody JhyInfoListDto jhyInfoListDto) { return JsonResult.success(jhyInfoService.queryList(jhyInfoListDto)); } + + /** + * 调整积分 + */ + @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") + @ApiOperation(value="集物员--审核", notes="test: 仅0有正确返回") + public JsonResult examineJwy(@RequestBody ExamineJwyDto model, HttpServletRequest request) { + long id = model.getId(); + JhyInfo jhyInfo = jhyInfoMapper.selectByPrimaryKey(id); + if(ObjectUtil.isEmpty(jhyInfo)){ + return JsonResult.failMessage("当前记录不存在!"); + } + Integer status = jhyInfo.getStatus(); + if(1 != status){ + return JsonResult.failMessage("当前不是待审核状态!"); + } + + jhyInfoService.examineJwy(model); + OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request)) + .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("集物员--审核-" + id).build(); + mqUtil.sendApp(build); + return JsonResult.success("操作成功!"); + } } -- Gitblit v1.9.1