efats

src/main/java/com/njyunzhi/pet_identity/common/BaseController.java

@@ -44,4 +44,8 @@ public class BaseController {
 
         return user;
     }
+
+    public boolean checkRole(String srcRole, String targRole) {
+        return Constants.USER_ADMIN.equals(srcRole) || srcRole.equals(targRole);
+    }
 }

src/main/java/com/njyunzhi/pet_identity/common/Constants.java

@@ -5,14 +5,37 @@ public class Constants {
     public final static int STATUS_READY = 0;
     public final static int STATUS_NORMAL = 1;
 
-    public final static String SETTING_REPORT_URL = "report_url";
 
-    //
+    // 客户端类型
     public final static String LOGIN_TYPE_ADMIN = "admin";
     public final static String LOGIN_TYPE_MINIAPP = "miniapp";
 
-    //
+    // 用户角色
     public final static String USER_ADMIN = "admin";
     public final static String USER_AUDITOR = "auditor";
     public final static String USER_MAKER = "maker";
+
+    // 申领方式
+    public final static int APPLY_METHOD_AUTO = 1;  // 自主领取
+    public final static int APPLY_METHOD_EXPRESS = 2;  // 快递
+
+    // 支付状态
+    public final static int PAY_STATUS_READY = 0;  // 未支付
+    public final static int PAY_STATUS_PAYING = 1;  // 支付中
+    public final static int PAY_STATUS_PAID = 2;  // 已支付
+
+    // 审核状态
+    public final static int AUDIT_STATUS_READY = 0;  // 未审核
+    public final static int AUDIT_STATUS_PASSED = 1;  // 审核通过
+    public final static int AUDIT_STATUS_REJECT = 2;  // 审核驳回
+
+    // 发证(制卡)状态
+    public final static int MAKE_STATUS_READY = 0;  // 待发放
+    public final static int MAKE_STATUS_MADE = 1;  // 已发放
+
+    // 流程状态
+    public final static int WORKFLOW_STATUS_READY = 0;  // 提交申请(未支付)
+    public final static int WORKFLOW_STATUS_PROCESSING = 1;  // 审批中
+    public final static int WORKFLOW_STATUS_AUDIT = 2;  // 已审批
+    public final static int WORKFLOW_STATUS_MADE = 3;  // 已发证
 }

src/main/java/com/njyunzhi/pet_identity/controller/TaApplicationController.java

@@ -4,7 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njyunzhi.pet_identity.common.BaseController;
+import com.njyunzhi.pet_identity.common.Constants;
 import com.njyunzhi.pet_identity.common.ResponseBean;
+import com.njyunzhi.pet_identity.common.StringUtils;
+import com.njyunzhi.pet_identity.entity.SysUser;
+import com.njyunzhi.pet_identity.entity.TaPerson;
+import com.njyunzhi.pet_identity.vo.AuditParam;
+import com.njyunzhi.pet_identity.vo.MakeCardParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +26,8 @@ import com.njyunzhi.pet_identity.service.ITaApplicationService;
 import com.njyunzhi.pet_identity.entity.TaApplication;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 我的申请 前端控制器
@@ -46,13 +54,55 @@ public class TaApplicationController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taApplication",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/application",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taApplicationList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
+        SysUser sysUser = currentUser();
+
         IPage<TaApplication> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaApplication> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+
+        // 审核人角色
+        if (Constants.USER_AUDITOR.equals(sysUser.getRoleName())) {
+            queryWrapper.ge("status", Constants.WORKFLOW_STATUS_PROCESSING);
+            queryWrapper.le("status", Constants.WORKFLOW_STATUS_AUDIT);
+        }
+
+        // 发证(制卡)人角色
+        if (Constants.USER_MAKER.equals(sysUser.getRoleName())) {
+            queryWrapper.ge("status", Constants.WORKFLOW_STATUS_AUDIT);
+            queryWrapper.le("status", Constants.WORKFLOW_STATUS_MADE);
+        }
+
+        queryWrapper.orderByAsc("status");
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaApplication> result = iTaApplicationService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/{client}/application",method= RequestMethod.GET)
+    @ApiOperation(value="微信列表", notes = "微信列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean wxList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                               @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+        TaPerson taPerson = currentPerson();
+
+        IPage<TaApplication> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaApplication> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.eq("person_id", taPerson.getPersonId());
+
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaApplication> result = iTaApplicationService.page(pg, queryWrapper);
@@ -64,13 +114,27 @@ public class TaApplicationController extends BaseController {
      * @param taApplication 实体对象
      * @return
      */
-    @RequestMapping(value="/taApplication",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    @RequestMapping(value="/wx/{clientId}/application",method= RequestMethod.POST)
+    @ApiOperation(value="微信申请", notes = "微信申请", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taApplicationAdd(@ApiParam("保存内容") @RequestBody TaApplication taApplication) throws Exception{
 
+        TaPerson taPerson = currentPerson();
+        if (StringUtils.isEmpty(taPerson.getPhone())) {
+            return ResponseBean.error("请先完善个人信息");
+        }
+
+        taApplication.setPersonId(taPerson.getPersonId());
+        taApplication.setPersonName(taPerson.getNickName());
+        taApplication.setPhone(taPerson.getPhone());
+        taApplication.setPayStatus(Constants.PAY_STATUS_READY);
+        taApplication.setStatus(Constants.WORKFLOW_STATUS_READY);
+        taApplication.setCreateDate(LocalDateTime.now());
+        taApplication.setVerifyStatus(Constants.AUDIT_STATUS_READY);
+        taApplication.setMakeStatus(Constants.MAKE_STATUS_READY);
+
         if (iTaApplicationService.save(taApplication)){
             return ResponseBean.success(taApplication);
-        }else {
+        } else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
@@ -79,10 +143,25 @@ public class TaApplicationController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taApplication/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    @RequestMapping(value="/wx/{clientId}/application/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="微信删除", notes = "微信删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean taApplicationDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaApplicationService.removeById(id)){
+        TaPerson taPerson = currentPerson();
+
+        TaApplication taApplication = iTaApplicationService.getById(id);
+        if (null == taApplication || taApplication.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到数据");
+        }
+
+        if (!taPerson.getPersonId().equals(taApplication.getPersonId())) {
+            return ResponseBean.error("无权操作");
+        }
+
+        if (taApplication.getStatus() >= Constants.WORKFLOW_STATUS_PROCESSING) {
+            return ResponseBean.error("流程已提审, 不能删除");
+        }
+
+        if(iTaApplicationService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,10 +174,36 @@ public class TaApplicationController extends BaseController {
      * @param taApplication 实体对象
      * @return
      */
-    @RequestMapping(value="/taApplication/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taApplicationUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaApplication taApplication) throws Exception{
+    @RequestMapping(value="/admin/application/{id}/audit",method= RequestMethod.PUT)
+    @ApiOperation(value="审批", notes = "审批", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean audit(@ApiParam("对象ID") @PathVariable Integer id,
+                                        @ApiParam("更新内容") @RequestBody AuditParam auditParam) throws Exception{
+
+        SysUser sysUser = currentUser();
+        if (!checkRole(sysUser.getRoleName(), Constants.USER_AUDITOR)) {
+            return ResponseBean.error("暂无权限");
+        }
+
+        TaApplication taApplication = iTaApplicationService.getById(id);
+        if (null == taApplication || taApplication.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到数据");
+        }
+
+        if (taApplication.getStatus() < Constants.WORKFLOW_STATUS_PROCESSING) {
+            return ResponseBean.error("用户未支付");
+        }
+        if (taApplication.getStatus() >= Constants.WORKFLOW_STATUS_AUDIT) {
+            return ResponseBean.error("当前记录已审批");
+        }
+
+        if (auditParam.getVerifyStatus() == Constants.AUDIT_STATUS_REJECT && StringUtils.isEmpty(auditParam.getRejectReason())) {
+            return ResponseBean.error("请填写驳回理由");
+        }
+
+        taApplication.setVerifyStatus(auditParam.getVerifyStatus());
+        taApplication.setVerifyDate(LocalDateTime.now());
+        taApplication.setVerifyUser(sysUser.getUserId());
+        taApplication.setVerifyUserName(sysUser.getUserName());
 
         if (iTaApplicationService.updateById(taApplication)){
             return ResponseBean.success(iTaApplicationService.getById(id));
@@ -107,13 +212,84 @@ public class TaApplicationController extends BaseController {
         }
     }
 
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taApplication 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/application/{id}/make",method= RequestMethod.PUT)
+    @ApiOperation(value="发证", notes = "发证", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean makeCard(@ApiParam("对象ID") @PathVariable Integer id,
+                              @ApiParam("更新内容") @RequestBody MakeCardParam makeCardParam) throws Exception{
+        SysUser sysUser = currentUser();
+        if (!checkRole(sysUser.getRoleName(), Constants.USER_MAKER)) {
+            return ResponseBean.error("暂无权限");
+        }
+
+        TaApplication taApplication = iTaApplicationService.getById(id);
+        if (null == taApplication || taApplication.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到数据");
+        }
+
+        if (taApplication.getStatus() != Constants.WORKFLOW_STATUS_AUDIT && taApplication.getVerifyStatus() == Constants.AUDIT_STATUS_PASSED) {
+            return ResponseBean.error("申请未通过或状态不对");
+        }
+
+        if (taApplication.getApplyMethod() == Constants.APPLY_METHOD_EXPRESS) {
+            if (StringUtils.isEmpty(taApplication.getTrackingType()) || StringUtils.isEmpty(taApplication.getTrackingNo())) {
+                return ResponseBean.error("请填写快递信息");
+            }
+        }
+
+        taApplication.setMakeStatus(Constants.MAKE_STATUS_MADE);
+        taApplication.setMakeDate(LocalDateTime.now());
+        taApplication.setMakeUser(sysUser.getUserId());
+        taApplication.setMakeUserName(sysUser.getUserName());
+        taApplication.setTrackingType(makeCardParam.getTrackingType());
+        taApplication.setTrackingNo(makeCardParam.getTrackingNo());
+
+        if (iTaApplicationService.updateById(taApplication)){
+            return ResponseBean.success(iTaApplicationService.getById(id));
+        } else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taApplication/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/application/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taApplicationGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaApplicationService.getById(id));
+
+        TaApplication taApplication = iTaApplicationService.getById(id);
+        if (taApplication == null || taApplication.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到数据");
+        }
+
+        return ResponseBean.success(taApplication);
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/wx/{clientId}/application/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="微信详情", notes = "微信详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean wxGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+
+        TaApplication taApplication = iTaApplicationService.getById(id);
+        if (taApplication == null || taApplication.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到数据");
+        }
+
+        TaPerson taPerson = currentPerson();
+        if (!taPerson.getPersonId().equals(taApplication.getPersonId())) {
+            return ResponseBean.error("未找到数据");
+        }
+
+        return ResponseBean.success(taApplication);
     }
 }

src/main/java/com/njyunzhi/pet_identity/entity/TaApplication.java

@@ -3,6 +3,8 @@ package com.njyunzhi.pet_identity.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.time.LocalDateTime;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,55 +29,90 @@ public class TaApplication implements Serializable {
 
     @ApiModelProperty(value = "申请ID")
     @TableId(value = "apply_id", type = IdType.AUTO)
-    private Integer applyId;
-
-    @ApiModelProperty(value = "申请人")
-    private String personId;
-
-    @ApiModelProperty(value = "宠物名称")
-    private String petName;
-
-    @ApiModelProperty(value = "性别")
-    private String petSex;
-
-    @ApiModelProperty(value = "生日")
-    private String petBirthday;
-
-    @ApiModelProperty(value = "类别")
-    private String petType;
-
-    @ApiModelProperty(value = "毛色")
-    private String petColor;
-
-    @ApiModelProperty(value = "免疫证明")
-    private String immunization;
-
-    @ApiModelProperty(value = "宠养区域")
-    private String areaCode;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "宠物照片")
-    private String img1;
-
-    @ApiModelProperty(value = "图片2")
-    private String img2;
-
-    @ApiModelProperty(value = "状态")
-    private String status;
-
-    @ApiModelProperty(value = "申请时间")
-    private String createDate;
-
-    @ApiModelProperty(value = "申请状态")
-    private String verifyStatus;
-
-    @ApiModelProperty(value = "是否通过")
-    private String isAgree;
-
-    @ApiModelProperty(value = "驳回原因")
-    private String rejectReason;
-
+    private Integer applyId ;
+    /** 申请人 */
+    @ApiModelProperty(value = "申请人",notes = "")
+    private String personId ;
+    /** 申请人姓名;冗余 */
+    @ApiModelProperty(value = "申请人姓名",notes = "冗余")
+    private String personName ;
+    /** 申请人手机;冗余 */
+    @ApiModelProperty(value = "申请人手机",notes = "冗余")
+    private String phone ;
+    /** 宠物名称 */
+    @ApiModelProperty(value = "宠物名称",notes = "")
+    private String petName ;
+    /** 性别 */
+    @ApiModelProperty(value = "性别",notes = "")
+    private Integer petSex ;
+    /** 生日 */
+    @ApiModelProperty(value = "生日",notes = "")
+    private String petBirthday ;
+    /** 类别 */
+    @ApiModelProperty(value = "类别",notes = "")
+    private String petType ;
+    /** 毛色 */
+    @ApiModelProperty(value = "毛色",notes = "")
+    private String petColor ;
+    /** 免疫证明 */
+    @ApiModelProperty(value = "免疫证明",notes = "")
+    private String immunization ;
+    /** 宠养区域 */
+    @ApiModelProperty(value = "宠养区域",notes = "")
+    private String areaCode ;
+    /** 详细地址 */
+    @ApiModelProperty(value = "详细地址",notes = "")
+    private String address ;
+    /** 宠物照片 */
+    @ApiModelProperty(value = "宠物照片",notes = "")
+    private String img1 ;
+    /** 图片2 */
+    @ApiModelProperty(value = "图片2",notes = "")
+    private String img2 ;
+    /** 申领方式;1自提,2快递 */
+    @ApiModelProperty(value = "申领方式",notes = "1自提,2快递")
+    private Integer applyMethod ;
+    /** 付款状态;0未支付,1已支付 */
+    @ApiModelProperty(value = "付款状态",notes = "0未支付,1支付中,2已支付")
+    private Integer payStatus ;
+    /** 状态 */
+    @ApiModelProperty(value = "状态",notes = "")
+    private Integer status ;
+    /** 申请时间 */
+    @ApiModelProperty(value = "申请时间",notes = "")
+    private LocalDateTime createDate ;
+    /** 申请状态;0未审核,1通过,2未通过 */
+    @ApiModelProperty(value = "申请状态",notes = "0未审核,1通过,2未通过")
+    private Integer verifyStatus ;
+    /** 审核时间 */
+    @ApiModelProperty(value = "审核时间",notes = "")
+    private LocalDateTime verifyDate ;
+    /** 审核人 */
+    @ApiModelProperty(value = "审核人",notes = "")
+    private String verifyUser ;
+    /** 审核人姓名;冗余 */
+    @ApiModelProperty(value = "审核人姓名",notes = "冗余")
+    private String verifyUserName ;
+    /** 驳回原因 */
+    @ApiModelProperty(value = "驳回原因",notes = "")
+    private String rejectReason ;
+    /** 制证状态;0待发放,1已发放 */
+    @ApiModelProperty(value = "制证状态",notes = "0待发放,1已发放")
+    private Integer makeStatus ;
+    /** 发证人 */
+    @ApiModelProperty(value = "发证人",notes = "")
+    private String makeUser ;
+    /** 发证人姓名;冗余 */
+    @ApiModelProperty(value = "发证人姓名",notes = "冗余")
+    private String makeUserName ;
+    /** 发放时间 */
+    @ApiModelProperty(value = "发放时间",notes = "")
+    private LocalDateTime makeDate ;
+    /** 快递名称 */
+    @ApiModelProperty(value = "快递名称",notes = "")
+    private String trackingType ;
+    /** 快递单号 */
+    @ApiModelProperty(value = "快递单号",notes = "")
+    private String trackingNo ;
 
 }

src/main/java/com/njyunzhi/pet_identity/service/ITaApplicationService.java

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-05-24
  */
-public interface ITaApplicationService extends IService<TaApplication> {
+public interface ITaApplicationService extends IBaseService<TaApplication> {
 
 }

src/main/java/com/njyunzhi/pet_identity/service/impl/TaApplicationServiceImpl.java

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-05-24
  */
 @Service
-public class TaApplicationServiceImpl extends ServiceImpl<TaApplicationMapper, TaApplication> implements ITaApplicationService {
+public class TaApplicationServiceImpl extends BaseServiceImpl<TaApplicationMapper, TaApplication> implements ITaApplicationService {
 
 }

src/main/java/com/njyunzhi/pet_identity/vo/AuditParam.java

@@ -0,0 +1,16 @@
+package com.njyunzhi.pet_identity.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "审批参数")
+@Data
+public class AuditParam {
+    @ApiModelProperty(value = "审批状态",notes = "0未审核,1通过,2未通过")
+    private Integer verifyStatus ;
+
+    @ApiModelProperty(value = "驳回原因",notes = "")
+    private String rejectReason ;
+}

src/main/java/com/njyunzhi/pet_identity/vo/MakeCardParam.java

@@ -0,0 +1,20 @@
+package com.njyunzhi.pet_identity.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "发证参数")
+@Data
+public class MakeCardParam {
+    /** 制证状态;0待发放,1已发放 */
+    @ApiModelProperty(value = "制证状态",notes = "0待发放,1已发放")
+    private Integer makeStatus ;
+    /** 快递名称 */
+    @ApiModelProperty(value = "快递名称",notes = "")
+    private String trackingType ;
+    /** 快递单号 */
+    @ApiModelProperty(value = "快递单号",notes = "")
+    private String trackingNo ;
+}