From bea4cd8cceb220189fd1fed5c2c1ff22d3e8a9ed Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 17:16:16 +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 | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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 57ca601..8e9be1e 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
@@ -12,16 +12,14 @@
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.GetScoreNumDto;
-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.mapper.UserMapper;
import com.xzx.gc.user.service.JhyInfoService;
import com.xzx.gc.user.vo.GetScoreNumVo;
import com.xzx.gc.user.vo.JhyInfoListVo;
+import com.xzx.gc.user.vo.ViewJhyInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -59,6 +57,36 @@
}
/**
+ * 查看集货员信息详情
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/jhy/viewJhyInfo.json")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = ViewJhyInfoVo.class)})
+ @ApiOperation(value="集物员管理-查看集货员信息详情", notes="test: 仅0有正确返回")
+ public JsonResult<ViewJhyInfoVo> viewJhyInfo(@RequestBody ViewJhyInfoDto viewJhyInfoDto) {
+ Long id = viewJhyInfoDto.getId();
+ ViewJhyInfoVo viewJhyInfoVo = jhyInfoService.viewJhyInfo(id);
+ return JsonResult.success(viewJhyInfoVo);
+ }
+
+ /**
+ * 编辑集货员信息
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/jhy/updateJhyInfo.json")
+ @ApiOperation(value="集物员管理--编辑集货员信息", notes="test: 仅0有正确返回")
+ public JsonResult updateJhyInfo(@RequestBody UpdateJhyInfoDto model, HttpServletRequest request) {
+ long id = model.getId();
+ JhyInfo jhyInfo = jhyInfoMapper.selectByPrimaryKey(id);
+ if(ObjectUtil.isEmpty(jhyInfo)){
+ return JsonResult.failMessage("当前记录不存在！");
+ }
+ jhyInfoService.updateJhyInfo(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("操作成功！");
+ }
+
+ /**
* 获取积分
*/
@PostMapping(Constants.ADMIN_VIEW_PREFIX + "/jhy/getScoreNum.json")
@@ -86,7 +114,7 @@
@ApiOperation(value="集物员--调整积分", notes="test: 仅0有正确返回")
public JsonResult addScoreNum(@RequestBody AddScoreNumDto model, HttpServletRequest request) {
Integer score = model.getScore();
- if(score <= 0){
+ if(score < 0){
return JsonResult.failMessage("请输入正确的积分数量！");
}
String userId = model.getUserId();
--
Gitblit v1.9.1