feats

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

@@ -46,6 +46,6 @@ public class BaseController {
     }
 
     public boolean checkRole(String srcRole, String targRole) {
-        return Constants.USER_ADMIN.equals(srcRole) || srcRole.equals(targRole);
+        return Constants.USER_ADMIN.equals(srcRole) || Constants.USER_MANAGER.equals(srcRole) || srcRole.equals(targRole);
     }
 }

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

@@ -14,8 +14,9 @@ public class Constants {
     public final static String USER_ADMIN = "admin";
     public final static String USER_AUDITOR = "auditor";
     public final static String USER_MAKER = "maker";
+    public final static String USER_MANAGER = "manager";
 
-    // 用户角色
+    // 申请单类型
     public final static String APPLY_TYPE_FIRST = "first";  // 申请
     public final static String APPLY_TYPE_REISSUE = "reissue"; // 补办
     public final static String APPLY_TYPE_RENEWAL = "renewal"; // 续期

src/main/java/com/njyunzhi/pet_identity/config/CorsConfig.java

@@ -29,9 +29,9 @@ public class CorsConfig implements WebMvcConfigurer {
 
         //设置放行哪些原始域
         if ("prod".equals(mode)) {
-            registration.allowedOrigins("http://resumework.njyunzhi.com", "https://resumework.njyunzhi.com");
+            registration.allowedOrigins("https://pet-certificate-online.njyunzhi.com");
         } else {
-            registration.allowedOrigins("http://localhost:8000", "http://localhost:3000");
+            registration.allowedOrigins("http://localhost:8000", "http://localhost:3000", "https://pet-certificate-online.njyunzhi.com");
         }
 
         //放行哪些请求方式

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

@@ -12,6 +12,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
 import java.util.Map;
 
 @Api(tags = "通用")

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

@@ -49,11 +49,12 @@ public class SysUserController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean sysUserList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                    @ApiParam("用户名") @RequestParam(value ="userName", required = false) String userName) throws Exception{
+                                    @ApiParam("用户名") @RequestParam(value ="userName", required = false) String userName,
+                                    @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone) throws Exception{
 
         IPage<SysUser> pg = new Page<>(pageNum, pageSize);
 
-        IPage<SysUser> result = iSysUserService.getPagedBy(pg, userName);
+        IPage<SysUser> result = iSysUserService.getPagedBy(pg, userName, phone);
         return ResponseBean.success(result);
     }
 

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

@@ -68,13 +68,41 @@ public class TaApplicationController extends BaseController {
     @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,
-                                          @ApiParam("表单进度") @RequestParam(value ="process", defaultValue = "0") Integer process) throws Exception{
+                                          @ApiParam("表单进度") @RequestParam(value ="process", defaultValue = "0") Integer process,
+                                          @ApiParam(value = "申请开始时间", example = "2022-06-01") @RequestParam(value ="applyStart", required = false) String applyStart,
+                                          @ApiParam(value = "申请结束时间", example = "2022-06-30") @RequestParam(value ="applyEnd", required = false) String applyEnd,
+                                          @ApiParam(value = "审核开始时间", example = "2022-06-01") @RequestParam(value ="auditStart", required = false) String auditStart,
+                                          @ApiParam(value = "审核结束时间", example = "2022-06-30") @RequestParam(value ="auditEnd", required = false) String auditEnd,
+                                          @ApiParam(value = "发证开始时间", example = "2022-06-01") @RequestParam(value ="makeStart", required = false) String makeStart,
+                                          @ApiParam(value = "发证结束时间", example = "2022-06-30") @RequestParam(value ="makeEnd", required = false) String makeEnd,
+                                          @ApiParam("申请类型") @RequestParam(value ="applyType", required = false) String applyType,
+                                          @ApiParam("申领方式") @RequestParam(value ="applyMethod", required = false) Integer applyMethod,
+                                          @ApiParam("付款状态") @RequestParam(value ="payStatus", required = false) Integer payStatus,
+                                          @ApiParam("审核状态") @RequestParam(value ="verifyStatus", required = false) Integer verifyStatus,
+                                          @ApiParam("犬主") @RequestParam(value ="personName", required = false) String personName,
+                                          @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
+                                          @ApiParam("犬名") @RequestParam(value ="petName", required = false) String petName,
+                                          @ApiParam("卡号") @RequestParam(value ="originCardNo", required = false) String originCardNo) throws Exception{
 
         SysUser sysUser = currentUser();
 
         IPage<TaApplication> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaApplication> queryWrapper = new QueryWrapper<>();
         queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.eq(!StringUtils.isEmpty(applyType), "apply_type", applyType);
+        queryWrapper.eq(null != applyMethod, "apply_method", applyMethod);
+        queryWrapper.eq(null != payStatus, "pay_status", payStatus);
+        queryWrapper.eq(null != verifyStatus, "verify_status", verifyStatus);
+        queryWrapper.like(!StringUtils.isEmpty(personName), "person_name", "%" + personName + "%");
+        queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%" + phone + "%");
+        queryWrapper.like(!StringUtils.isEmpty(petName), "pet_name", "%" + petName + "%");
+        queryWrapper.like(!StringUtils.isEmpty(originCardNo), "origin_card_no", "%" + originCardNo + "%");
+        queryWrapper.ge(!StringUtils.isEmpty(applyStart), "create_date", applyStart);
+        queryWrapper.le(!StringUtils.isEmpty(applyEnd), "create_date", applyEnd);
+        queryWrapper.ge(!StringUtils.isEmpty(auditStart), "verify_date", auditStart);
+        queryWrapper.le(!StringUtils.isEmpty(auditEnd), "verify_date", auditEnd);
+        queryWrapper.ge(!StringUtils.isEmpty(makeStart), "make_date", makeStart);
+        queryWrapper.le(!StringUtils.isEmpty(makeEnd), "make_date", makeEnd);
 
         if (Constants.WORKFLOW_PROCESS_AUDIT == process) {
             // 过滤待审批列表

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

@@ -6,6 +6,7 @@ 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -50,10 +51,12 @@ public class TaNoticeController extends BaseController {
     @RequestMapping(value="/admin/notice",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taNoticeList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("标题") @RequestParam(value ="title", required = false) String title) throws Exception{
 
         IPage<TaNotice> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaNotice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(title), "title", "%" + title + "%");
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
 

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

@@ -5,6 +5,7 @@ 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.ResponseBean;
+import com.njyunzhi.pet_identity.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -48,10 +49,14 @@ public class TaPersonController extends BaseController {
     @RequestMapping(value="/admin/person",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("犬主") @RequestParam(value ="personName", required = false) String personName,
+                                     @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone) throws Exception{
 
         IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(personName), "person_name", "%" + personName + "%");
+        queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%" + phone + "%");
         queryWrapper.isNotNull("phone");
         queryWrapper.orderByDesc("create_date");
 

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

@@ -52,10 +52,16 @@ public class TaPetIdentityController extends BaseController {
     @RequestMapping(value="/admin/card",method= RequestMethod.GET)
     @ApiOperation(value="证件列表", notes = "证件列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                               @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                @ApiParam("卡号") @RequestParam(value ="cardNo", required = false) String cardNo,
+                                @ApiParam("犬主") @RequestParam(value ="personName", required = false) String personName,
+                                @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone) throws Exception{
 
         IPage<TaPetIdentity> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaPetIdentity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(cardNo), "card_no", "%" + cardNo + "%");
+        queryWrapper.like(!StringUtils.isEmpty(personName), "person_name", "%" + personName + "%");
+        queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%" + phone + "%");
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
 
@@ -85,53 +91,6 @@ public class TaPetIdentityController extends BaseController {
         return ResponseBean.success(result);
     }
 
-//    /**
-//     * 保存对象
-//     * @param taPetIdentity 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taPetIdentity",method= RequestMethod.POST)
-//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-//    public ResponseBean taPetIdentityAdd(@ApiParam("保存内容") @RequestBody TaPetIdentity taPetIdentity) throws Exception{
-//
-//        if (iTaPetIdentityService.save(taPetIdentity)){
-//            return ResponseBean.success(taPetIdentity);
-//        }else {
-//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 根据id删除对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/taPetIdentity/{id}", method= RequestMethod.DELETE)
-//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-//    public ResponseBean taPetIdentityDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        if(iTaPetIdentityService.removeById(id)){
-//            return ResponseBean.success("success");
-//        }else {
-//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 修改对象
-//     * @param id  实体ID
-//     * @param taPetIdentity 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taPetIdentity/{id}",method= RequestMethod.PUT)
-//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-//    public ResponseBean taPetIdentityUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-//                                        @ApiParam("更新内容") @RequestBody TaPetIdentity taPetIdentity) throws Exception{
-//
-//        if (iTaPetIdentityService.updateById(taPetIdentity)){
-//            return ResponseBean.success(iTaPetIdentityService.getById(id));
-//        }else {
-//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
 
     /**
      * 获取证件号码

src/main/java/com/njyunzhi/pet_identity/mapper/SysUserMapper.java

@@ -17,5 +17,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-    IPage<SysUser> getPagedBy(IPage<SysUser> pg, @Param("userName") String userName);
+    IPage<SysUser> getPagedBy(IPage<SysUser> pg, @Param("userName") String userName, @Param("phone") String phone);
 }

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

@@ -2,7 +2,6 @@ package com.njyunzhi.pet_identity.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.pet_identity.entity.SysUser;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -14,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISysUserService extends IBaseService<SysUser> {
 
-    IPage<SysUser> getPagedBy(IPage<SysUser> pg, String userName);
+    IPage<SysUser> getPagedBy(IPage<SysUser> pg, String userName, String phone);
 }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.pet_identity.entity.SysUser;
 import com.njyunzhi.pet_identity.mapper.SysUserMapper;
 import com.njyunzhi.pet_identity.service.ISysUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -19,7 +18,7 @@ import org.springframework.stereotype.Service;
 public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
 
     @Override
-    public IPage<SysUser> getPagedBy(IPage<SysUser> pg, String userName) {
-        return baseMapper.getPagedBy(pg, userName);
+    public IPage<SysUser> getPagedBy(IPage<SysUser> pg, String userName, String phone) {
+        return baseMapper.getPagedBy(pg, userName, phone);
     }
 }

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

@@ -78,6 +78,9 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
     @Override
     public boolean refundByApplication(TaApplication taApplication) throws Exception {
         TaOrder taOrder = baseMapper.getByApplyId(taApplication.getApplyId().toString());
+        if (null == taOrder) {
+            throw new Exception("未找到支付订单信息");
+        }
 
         WxPayRefundV3Request request = new WxPayRefundV3Request();
         request.setOutTradeNo(taOrder.getOrderNo()); // 原单号

src/main/resources/mapper/SysUserMapper.xml

@@ -22,6 +22,9 @@
           <if test="userName != null and userName != ''">
               AND t.user_name LIKE CONCAT( '%', #{userName}, '%' )
           </if>
+        <if test="phone != null and phone != ''">
+            AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
+        </if>
         ORDER BY
             t.create_date DESC
     </select>