From 8df678b6901427b2c31b2b38977d739f6c497785 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 18:14:04 +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/dto/ExamineJwyDto.java | 17 ++++++++
gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java | 15 +++++++
gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java | 37 ++++++++++++++++++
gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java | 2 +
4 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 afbce91..ffed1bc 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,9 +1,18 @@
package com.xzx.gc.user.controller;
+import cn.hutool.core.collection.CollUtil;
+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.model.JsonResult;
+import com.xzx.gc.user.dto.ExamineJwyDto;
import com.xzx.gc.user.dto.JhyInfoListDto;
+import com.xzx.gc.user.mapper.JhyInfoMapper;
import com.xzx.gc.user.service.JhyInfoService;
import com.xzx.gc.user.vo.JhyInfoListVo;
import io.swagger.annotations.Api;
@@ -15,7 +24,10 @@
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
@@ -25,6 +37,8 @@
@Autowired
private JhyInfoService jhyInfoService;
+ @Autowired
+ private JhyInfoMapper jhyInfoMapper;
@ApiOperation(value = "集货员信息列表")
@ApiResponses(
@@ -34,4 +48,27 @@
public JsonResult<Map<String, Object>> jhyList(@RequestBody JhyInfoListDto jhyInfoListDto) {
return JsonResult.success(jhyInfoService.queryList(jhyInfoListDto));
}
+
+ /**
+ * 取消
+ */
+ @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("操作成功！");
+ }
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/dto/ExamineJwyDto.java b/gc-user/src/main/java/com/xzx/gc/user/dto/ExamineJwyDto.java
new file mode 100644
index 0000000..f630826
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/dto/ExamineJwyDto.java
@@ -0,0 +1,17 @@
+package com.xzx.gc.user.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ExamineJwyDto", description = "集物员审核接收参数类")
+public class ExamineJwyDto {
+
+ @ApiModelProperty(value ="申请记录ID" ,required=true)
+ private Long id;
+
+ @ApiModelProperty(value ="审核类型 1：同意 2：拒绝" ,required=true)
+ private Integer type;
+
+}
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 19fc575..9f129a9 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
@@ -6,6 +6,7 @@
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.entity.JhyInfo;
+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.JhyInfoMapper;
@@ -74,4 +75,18 @@
data.put("code", 0);
return data;
}
+
+ public void examineJwy(ExamineJwyDto model) {
+ long id = model.getId();
+ JhyInfo jhyInfo = jhyInfoMapper.selectByPrimaryKey(id);
+ Integer type = model.getType();
+ if(1 == type){
+ jhyInfo.setStatus(2);
+ jhyInfo.setIsJhy(1+"");
+ }else if(2 == type){
+ jhyInfo.setStatus(3);
+ jhyInfo.setIsJhy(2+"");
+ }
+ jhyInfoMapper.updateByPrimaryKey(jhyInfo);
+ }
}
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 bd3c97f..d1c12cb 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
@@ -11,6 +11,8 @@
@ApiModel(value = "JhyInfoListVo", description = "后台集物员列表接口返回参数类")
public class JhyInfoListVo {
+ private Long id;
+
@ApiModelProperty(value = "姓名")
private String username;
--
Gitblit v1.9.1