feats

pom.xml

@@ -159,6 +159,11 @@
 						<artifactId>maven-resources-plugin</artifactId>
 						<configuration>
 							<encoding>UTF-8</encoding>
+							<nonFilteredFileExtensions>
+								<nonFilteredFileExtension>pem</nonFilteredFileExtension>
+								<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
+								<nonFilteredFileExtension>p12</nonFilteredFileExtension>
+							</nonFilteredFileExtensions>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -168,6 +173,8 @@
 						<filtering>true</filtering>
 						<includes>
 							<include>**/*.xml</include>
+							<include>**/*.p12</include>
+							<include>**/*.pem</include>
 <!--							<include>*.xlsx</include>-->
 							<include>application.yml</include>
 							<include>application-${profileActive}.yml</include>
@@ -210,6 +217,11 @@
 						<artifactId>maven-resources-plugin</artifactId>
 						<configuration>
 							<encoding>UTF-8</encoding>
+							<nonFilteredFileExtensions>
+								<nonFilteredFileExtension>pem</nonFilteredFileExtension>
+								<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
+								<nonFilteredFileExtension>p12</nonFilteredFileExtension>
+							</nonFilteredFileExtensions>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -218,6 +230,8 @@
 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
 						<includes>
+							<include>**/*.p12</include>
+							<include>**/*.pem</include>
 							<include>**/*.xml</include>
 <!--							<include>*.xlsx</include>-->
 							<include>application.yml</include>

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

@@ -28,6 +28,7 @@ public class Constants {
     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 PAY_STATUS_REFUND = 3;  // 已退款
 
     // 审核状态
     public final static int AUDIT_STATUS_READY = 0;  // 未审核
@@ -50,6 +51,10 @@ public class Constants {
     public final static int WORKFLOW_STATUS_AUDIT = 2;  // 已审批
     public final static int WORKFLOW_STATUS_MADE = 3;  // 已发证
 
+    // 流程进度
+    public final static int WORKFLOW_PROCESS_AUDIT = 1;  // 待审批
+    public final static int WORKFLOW_PROCESS_MADE = 2;  // 待发证
+
     // 系统参数
     public final static String SYSSETTING_EXPRESS_FEE = "express_fee";  // 快递费
     public final static String SYSSETTING_PRODUCTION_COST = "production_cost";  // 工本费

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

@@ -48,4 +48,13 @@ public class DateUtils {
         if (dt == null || dt.equals("")) return null;
         return from(dt + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
     }
+
+    public static String today(String ...formaters) {
+        String formater = "yyyy-MM-dd";
+        if (formaters.length > 0) {
+            formater = formaters[0];
+        }
+
+        return toString(LocalDateTime.now(ZoneId.of("Asia/Shanghai")), formater);
+    }
 }

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

@@ -21,7 +21,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
         anonList.add("/swagger-ui/**");
         anonList.add("/swagger-resources/**");
         anonList.add("/v2/**");
-//        anonList.add("/wxpay/notify/**");
+        anonList.add("/wxpay/notify/**");
         anonList.add("/h5/**");
         anonList.add("/**/sms-captcha");
         anonList.add("/**/**/sms-captcha");

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

@@ -7,9 +7,8 @@ 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.entity.TaPetIdentity;
+import com.njyunzhi.pet_identity.entity.*;
+import com.njyunzhi.pet_identity.service.ITaOrderService;
 import com.njyunzhi.pet_identity.service.ITaPetIdentityService;
 import com.njyunzhi.pet_identity.vo.AuditParam;
 import com.njyunzhi.pet_identity.vo.MakeCardParam;
@@ -25,10 +24,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 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;
+import java.util.ArrayList;
 
 /**
  * <p>
@@ -52,6 +51,9 @@ public class TaApplicationController extends BaseController {
     @Autowired
     public ITaPetIdentityService iTaPetIdentityService;
 
+    @Autowired
+    public ITaOrderService iTaOrderService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -61,7 +63,8 @@ public class TaApplicationController extends BaseController {
     @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{
+                                          @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @ApiParam("表单进度") @RequestParam(value ="process", defaultValue = "0") Integer process) throws Exception{
 
         SysUser sysUser = currentUser();
 
@@ -69,17 +72,30 @@ public class TaApplicationController extends BaseController {
         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.WORKFLOW_PROCESS_AUDIT == process) {
+            // 过滤待审批列表
+            // 必须是已交费的 或者 续期的
+            queryWrapper.in("status", new Integer[] { Constants.WORKFLOW_STATUS_PROCESSING, Constants.WORKFLOW_STATUS_AUDIT });
+            queryWrapper.nested(q -> q.eq("pay_status", Constants.PAY_STATUS_PAID).or().eq("apply_type", Constants.APPLY_TYPE_RENEWAL));
+        } else if (Constants.WORKFLOW_PROCESS_MADE == process) {
+            // 过滤待制卡列表
+            // 必须是审核通过的, 且是初次提审或者挂失补办的
+            queryWrapper.in("status", new Integer[] { Constants.WORKFLOW_STATUS_AUDIT, Constants.WORKFLOW_STATUS_MADE });
+            queryWrapper.eq("verify_Status", Constants.AUDIT_STATUS_PASSED);
+            queryWrapper.in("apply_type", new String[] { Constants.APPLY_TYPE_FIRST,  Constants.APPLY_TYPE_REISSUE});
         }
 
-        // 发证(制卡)人角色
-        if (Constants.USER_MAKER.equals(sysUser.getRoleName())) {
-            queryWrapper.ge("status", Constants.WORKFLOW_STATUS_AUDIT);
-            queryWrapper.le("status", Constants.WORKFLOW_STATUS_MADE);
-        }
+//        // 审核人角色
+//        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");
@@ -136,6 +152,39 @@ public class TaApplicationController extends BaseController {
         taApplication.setVerifyStatus(Constants.AUDIT_STATUS_READY);
         taApplication.setMakeStatus(Constants.MAKE_STATUS_READY);
 
+        if (Constants.APPLY_TYPE_RENEWAL.equals(taApplication.getApplyType())) {
+            // 如果是续期申请
+            if (StringUtils.isEmpty(taApplication.getOriginCardNo())) {
+                return ResponseBean.error("未找到原始证件信息");
+            }
+            TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", taApplication.getOriginCardNo(), false, true);
+            if (null == taPetIdentity) {
+                return ResponseBean.error("未找到原始证件信息");
+            }
+            taApplication.setStatus(Constants.WORKFLOW_STATUS_PROCESSING);
+        } else if (Constants.APPLY_TYPE_REISSUE.equals(taApplication.getApplyType())) {
+            // 如果是挂失补办
+            if (StringUtils.isEmpty(taApplication.getOriginCardNo())) {
+                return ResponseBean.error("未找到原始证件信息");
+            }
+            TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", taApplication.getOriginCardNo(), false, true);
+            if (null == taPetIdentity) {
+                return ResponseBean.error("未找到原始证件信息");
+            }
+
+            // 直接将原卡置为挂失
+            taPetIdentity.setStatus(Constants.CARD_STATUS_LOSS);
+            if (!iTaPetIdentityService.updateById(taPetIdentity)) {
+                return ResponseBean.error("挂失证件失败, 请重试");
+            }
+        } else {
+            // 当前狗狗是否存在证件
+            TaPetIdentity origin = iTaPetIdentityService.getByPet(taApplication.getPetId(), taApplication.getPersonId());
+            if (null != origin) {
+                return ResponseBean.error("请先挂失原始证件");
+            }
+        }
+
         if (iTaApplicationService.save(taApplication)){
             return ResponseBean.success(taApplication);
         } else {
@@ -183,6 +232,10 @@ public class TaApplicationController extends BaseController {
     public ResponseBean audit(@ApiParam("对象ID") @PathVariable Integer id,
                                         @ApiParam("更新内容") @RequestBody AuditParam auditParam) throws Exception{
 
+        // 目前业务有 3 种, 初次申请, 挂失, 续期
+        // 其中 续期 不需要缴费
+        // 如果审核驳回，那么已缴费用, 需要原路返回
+
         SysUser sysUser = currentUser();
         if (!checkRole(sysUser.getRoleName(), Constants.USER_AUDITOR)) {
             return ResponseBean.error("暂无权限");
@@ -229,14 +282,6 @@ public class TaApplicationController extends BaseController {
             if (null == taPetIdentity) {
                 return ResponseBean.error("未找到原始证件信息");
             }
-
-            // 审核同意之后, 直接作废原始证件
-            if (Constants.AUDIT_STATUS_PASSED == auditParam.getVerifyStatus()) {
-                taPetIdentity.setStatus(Constants.CARD_STATUS_LOSS);
-                if (!iTaPetIdentityService.updateById(taPetIdentity)) {
-                    return ResponseBean.error("续期挂失失败, 请重试");
-                }
-            }
         } else {
             return ResponseBean.error("申办业务类型不支持");
         }
@@ -245,14 +290,23 @@ public class TaApplicationController extends BaseController {
             return ResponseBean.error("当前记录已审批");
         }
 
-        if (auditParam.getVerifyStatus() == Constants.AUDIT_STATUS_REJECT && StringUtils.isEmpty(auditParam.getRejectReason())) {
-            return ResponseBean.error("请填写驳回理由");
+        if (auditParam.getVerifyStatus() == Constants.AUDIT_STATUS_REJECT) {
+            if (StringUtils.isEmpty(auditParam.getRejectReason())) {
+                return ResponseBean.error("请填写驳回理由");
+            }
+
+            // 如果已经缴费, 则原路退回费用
+            if (Constants.PAY_STATUS_PAID == taApplication.getPayStatus()) {
+                iTaOrderService.refundByApplication(taApplication);
+            }
         }
 
         taApplication.setVerifyStatus(auditParam.getVerifyStatus());
+        taApplication.setRejectReason(auditParam.getRejectReason());
         taApplication.setVerifyDate(LocalDateTime.now());
         taApplication.setVerifyUser(sysUser.getUserId());
         taApplication.setVerifyUserName(sysUser.getUserName());
+        taApplication.setStatus(Constants.WORKFLOW_STATUS_AUDIT);
 
         if (iTaApplicationService.updateById(taApplication)){
             return ResponseBean.success(taApplication);
@@ -297,8 +351,11 @@ public class TaApplicationController extends BaseController {
         }
 
         if (taApplication.getApplyMethod() == Constants.APPLY_METHOD_EXPRESS) {
-            if (StringUtils.isEmpty(taApplication.getTrackingType()) || StringUtils.isEmpty(taApplication.getTrackingNo())) {
+            if (StringUtils.isEmpty(makeCardParam.getTrackingType()) || StringUtils.isEmpty(makeCardParam.getTrackingNo())) {
                 return ResponseBean.error("请填写快递信息");
+            } else {
+                taApplication.setTrackingNo(makeCardParam.getTrackingNo());
+                taApplication.setTrackingType(makeCardParam.getTrackingType());
             }
         }
 
@@ -311,12 +368,15 @@ public class TaApplicationController extends BaseController {
             }
         }
 
+        // 关联证件
+        taApplication.setOriginCardNo(makeCardParam.getCardNo());
         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());
+        taApplication.setStatus(Constants.WORKFLOW_STATUS_MADE);
 
         if (iTaApplicationService.updateById(taApplication)){
             TaPetIdentity newCard = iTaPetIdentityService.createNewCard(taApplication, makeCardParam);
@@ -363,4 +423,5 @@ public class TaApplicationController extends BaseController {
 
         return ResponseBean.success(taApplication);
     }
+
 }

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

@@ -106,18 +106,18 @@ public class TaOrderController extends BaseController {
 
         // 快递费
         SysSetting expressFeeSetting = iSysSettingService.getById(Constants.SYSSETTING_EXPRESS_FEE);
-        Integer expressFee = Float.valueOf(expressFeeSetting.getContent()).intValue();
+        float expressFee = Float.parseFloat(expressFeeSetting.getContent());
         // 工本费
         SysSetting productionCostSetting = iSysSettingService.getById(Constants.SYSSETTING_PRODUCTION_COST);
-        Integer productionCost = Float.valueOf(productionCostSetting.getContent()).intValue();
+        float productionCost = Float.parseFloat(productionCostSetting.getContent());
 
         TaOrder taOrder = new TaOrder();
         String orderNo = iTaOrderService.createOrderNo();
         taOrder.setOrderNo(orderNo);
         taOrder.setApplyId(applyId);
-        taOrder.setProductionCost(productionCost);
+        taOrder.setProductionCost((int) (productionCost * 100));
         // 如果没有选择快递提取, 则没有快递费用
-        taOrder.setExpressFee(taApplication.getApplyMethod() == 2 ? expressFee : 0);
+        taOrder.setExpressFee(taApplication.getApplyMethod() == 2 ? (int) (expressFee * 100) : 0);
         taOrder.setCharges(taOrder.getExpressFee() + taOrder.getProductionCost());
         taOrder.setStatus(Constants.PAY_STATUS_READY);
         taOrder.setCreateDate(LocalDateTime.now());
@@ -153,6 +153,7 @@ public class TaOrderController extends BaseController {
 
             return ResponseBean.success(rtn);
         } catch (Exception e) {
+            e.printStackTrace();
             return ResponseBean.error("生成微信预支付信息失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }

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

@@ -39,25 +39,25 @@ public class TaPersonController extends BaseController {
     @Autowired
     public ITaPersonService iTaPersonService;
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @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{
 
-//    /**
-//     * 分页查询列表
-//     * @param pageNum
-//     * @param pageSize
-//     * @return
-//     */
-//    @RequestMapping(value="/taPerson",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{
-//
-//        IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
-//        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.orderByDesc("create_date");
-//
-//        IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
-//        return ResponseBean.success(result);
-//    }
+        IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.isNotNull("phone");
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
 
 //    /**
 //     * 保存对象

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

@@ -7,6 +7,8 @@ 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.entity.TaPerson;
+import com.njyunzhi.pet_identity.entity.TaPetIdentity;
+import com.njyunzhi.pet_identity.service.ITaPetIdentityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -35,7 +37,7 @@ import java.time.LocalDateTime;
 
 @Api(tags = "宠物表")
 @RestController
-@RequestMapping("/wx/{clientId}")
+@RequestMapping("/")
 public class TaPetController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaPetController.class);
@@ -43,6 +45,9 @@ public class TaPetController extends BaseController {
     @Autowired
     public ITaPetService iTaPetService;
 
+    @Autowired
+    public ITaPetIdentityService iTaPetIdentityService;
+
 
     /**
      * 分页查询列表
@@ -50,7 +55,7 @@ public class TaPetController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/pet",method= RequestMethod.GET)
+    @RequestMapping(value="/wx/{clientId}/pet",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taPetList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
@@ -71,7 +76,7 @@ public class TaPetController extends BaseController {
      * @param taPet 实体对象
      * @return
      */
-    @RequestMapping(value="/pet",method= RequestMethod.POST)
+    @RequestMapping(value="/wx/{clientId}/pet",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taPetAdd(@ApiParam("保存内容") @RequestBody TaPet taPet) throws Exception {
         TaPerson taPerson = currentPerson();
@@ -106,7 +111,7 @@ public class TaPetController extends BaseController {
      * @param taPet 实体对象
      * @return
      */
-    @RequestMapping(value="/pet/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/wx/{clientId}/pet/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean taPetUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaPet taPet) throws Exception{
@@ -125,9 +130,35 @@ public class TaPetController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/pet/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/wx/{clientId}/pet/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taPetGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaPetService.getById(id));
     }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/wx/{clientId}/pet/{id}/card",method= RequestMethod.GET)
+    @ApiOperation(value="狗子证件", notes = "狗子证件", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getCard(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+
+        TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("pet_id", id, false, true);
+
+        return ResponseBean.success(taPetIdentity);
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/pet/{id}/card",method= RequestMethod.GET)
+    @ApiOperation(value="狗子证件", notes = "狗子证件", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getPetCard(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+
+        TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("pet_id", id, false, true);
+
+        return ResponseBean.success(taPetIdentity);
+    }
 }

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

@@ -3,10 +3,9 @@ package com.njyunzhi.pet_identity.controller;
 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.*;
 import com.njyunzhi.pet_identity.entity.TaPerson;
+import com.njyunzhi.pet_identity.service.ITaSequenceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -41,6 +40,28 @@ public class TaPetIdentityController extends BaseController {
     @Autowired
     public ITaPetIdentityService iTaPetIdentityService;
 
+    @Autowired
+    public ITaSequenceService iTaSequenceService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @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{
+
+        IPage<TaPetIdentity> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaPetIdentity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaPetIdentity> result = iTaPetIdentityService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
 
     /**
      * 分页查询列表
@@ -112,6 +133,21 @@ public class TaPetIdentityController extends BaseController {
 //        }
 //    }
 
+    /**
+     * 获取证件号码
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/card/next",method= RequestMethod.GET)
+    @ApiOperation(value="获取证件号码", notes = "获取证件号码", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getNewNo() throws Exception{
+        String seqName = String.format("%s-%s", "card", DateUtils.today("yyyyMMdd"));
+        Integer nextVal = iTaSequenceService.getNextVal(seqName);
+
+        String cardNo = StringUtils.lpad(nextVal.toString(), "0", 3);
+
+        return ResponseBean.success(DateUtils.today("yyyyMMdd")+cardNo);
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID
@@ -126,4 +162,20 @@ public class TaPetIdentityController extends BaseController {
 
         return ResponseBean.success(taPetIdentity);
     }
+
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/card/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="证件详情", notes = "证件详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_id", id, false, true);
+        if (null == taPetIdentity) {
+            return ResponseBean.error("未找到证件信息");
+        }
+
+        return ResponseBean.success(taPetIdentity);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.njyunzhi.pet_identity.controller;
 
 import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
+import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyV3Result;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.njyunzhi.pet_identity.common.BaseController;
 import com.njyunzhi.pet_identity.common.WxUtils;
@@ -41,19 +42,19 @@ public class WxPayController extends BaseController {
 
     }
 
-//    @ResponseBody
-//    @RequestMapping("/notify/refund")
-//    public String refundNotify(@RequestBody String jsonData) {
-//        WxPayService payService = wxUtils.getPayService();
-//        WxPayRefundNotifyV3Result result = null;
-//        try {
-//            result = payService.parseRefundNotifyV3Result(jsonData, null);
-//            orderPayService.refundNotifyOrder(result.getResult());
-//            return WxPayNotifyResponse.success("OK");
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            return WxPayNotifyResponse.fail(e.getMessage());
-//        }
-//    }
+    @ResponseBody
+    @RequestMapping("/notify/refund")
+    public String refundNotify(@RequestBody String jsonData) {
+        WxPayService payService = wxUtils.getPayService();
+        WxPayRefundNotifyV3Result result = null;
+        try {
+            result = payService.parseRefundNotifyV3Result(jsonData, null);
+            iTaOrderService.refundNotifyOrder(result.getResult());
+            return WxPayNotifyResponse.success("OK");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return WxPayNotifyResponse.fail(e.getMessage());
+        }
+    }
 
 }

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

@@ -54,4 +54,7 @@ public class TaOrder implements Serializable {
     @ApiModelProperty(value = "支付日期")
     private LocalDateTime payDate;
 
+    @ApiModelProperty(value = "退款日期")
+    private LocalDateTime refundDate;
+
 }

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

@@ -3,6 +3,7 @@ package com.njyunzhi.pet_identity.mapper;
 import com.njyunzhi.pet_identity.entity.TaOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 /**
@@ -18,4 +19,6 @@ public interface TaOrderMapper extends BaseMapper<TaOrder> {
 
     @Select("SELECT UUID_SHORT()")
     String getShortUUID();
+
+    TaOrder getByApplyId(@Param("applyId") String applyId);
 }

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

@@ -3,6 +3,8 @@ package com.njyunzhi.pet_identity.mapper;
 import com.njyunzhi.pet_identity.entity.TaSequence;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -15,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaSequenceMapper extends BaseMapper<TaSequence> {
 
+    @Select("SELECT fn_nextval(#{seqName})")
+    Integer getNextVal(@Param("seqName") String seqName);
 }

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

@@ -1,8 +1,10 @@
 package com.njyunzhi.pet_identity.service;
 
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
+import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyV3Result;
+import com.njyunzhi.pet_identity.entity.TaApplication;
 import com.njyunzhi.pet_identity.entity.TaOrder;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.njyunzhi.pet_identity.entity.TaPerson;
 
 /**
  * <p>
@@ -17,4 +19,10 @@ public interface ITaOrderService extends IBaseService<TaOrder> {
     void notifyOrderPay(WxPayOrderNotifyV3Result.DecryptNotifyResult result) throws Exception;
 
     String createOrderNo() throws Exception;
+
+    boolean refundByApplication(TaApplication taApplication) throws Exception;
+
+    TaOrder createByApplication(TaPerson taPerson, TaApplication taApplication) throws Exception;
+
+    void refundNotifyOrder(WxPayRefundNotifyV3Result.DecryptNotifyResult result) throws Exception;
 }

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

@@ -17,4 +17,6 @@ public interface ITaPetIdentityService extends IBaseService<TaPetIdentity> {
     TaPetIdentity createNewCard(TaApplication taApplication, MakeCardParam makeCardParam) throws Exception;
 
     boolean extendDate(TaPetIdentity taPetIdentity) throws Exception;
+
+    TaPetIdentity getByPet(String petId, String personId);
 }

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

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaSequenceService extends IService<TaSequence> {
 
+    Integer getNextVal(String seqName);
 }

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

@@ -1,13 +1,20 @@
 package com.njyunzhi.pet_identity.service.impl;
 
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
+import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyV3Result;
+import com.github.binarywang.wxpay.bean.request.WxPayRefundV3Request;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
 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.common.WxPayUtils;
+import com.njyunzhi.pet_identity.entity.SysSetting;
 import com.njyunzhi.pet_identity.entity.TaApplication;
 import com.njyunzhi.pet_identity.entity.TaOrder;
+import com.njyunzhi.pet_identity.entity.TaPerson;
 import com.njyunzhi.pet_identity.mapper.TaApplicationMapper;
 import com.njyunzhi.pet_identity.mapper.TaOrderMapper;
+import com.njyunzhi.pet_identity.service.ISysSettingService;
 import com.njyunzhi.pet_identity.service.ITaOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +35,12 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
     @Autowired
     TaApplicationMapper applicationMapper;
 
+    @Autowired
+    ISysSettingService iSysSettingService;
+
+    @Autowired
+    WxPayUtils wxPayUtils;
+
     @Override
     public void notifyOrderPay(WxPayOrderNotifyV3Result.DecryptNotifyResult result) throws Exception {
         TaOrder taOrder = getExistBy("order_no", result.getOutTradeNo(), false, true);
@@ -53,6 +66,7 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
         if (null == taApplication || Constants.STATUS_DELETE == taApplication.getStatus()) return;
 
         taApplication.setPayStatus(Constants.PAY_STATUS_PAID);
+        taApplication.setStatus(Constants.WORKFLOW_STATUS_PROCESSING);
         applicationMapper.updateById(taApplication);
     }
 
@@ -60,4 +74,80 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
     public String createOrderNo() throws Exception {
         return baseMapper.getShortUUID();
     }
+
+    @Override
+    public boolean refundByApplication(TaApplication taApplication) throws Exception {
+        TaOrder taOrder = baseMapper.getByApplyId(taApplication.getApplyId().toString());
+
+        WxPayRefundV3Request request = new WxPayRefundV3Request();
+        request.setOutTradeNo(taOrder.getOrderNo()); // 原单号
+        request.setOutRefundNo("R-" + taOrder.getOrderNo()); // 退款单号
+        WxPayRefundV3Request.Amount amount = new  WxPayRefundV3Request.Amount();
+        amount.setTotal(taOrder.getCharges());
+        amount.setRefund(taOrder.getCharges());
+        amount.setCurrency("CNY");
+        request.setAmount(amount);
+        wxPayUtils.refund(request);
+
+        return true;
+    }
+
+    @Override
+    public TaOrder createByApplication(TaPerson taPerson, TaApplication taApplication) throws Exception {
+        if (!taPerson.getPersonId().equals(taApplication.getPersonId())) {
+            throw new Exception("非本人订单, 不能支付");
+        }
+
+        if (Constants.PAY_STATUS_PAID == taApplication.getPayStatus()) {
+            throw new Exception("当前申请已支付");
+        }
+
+        // 快递费
+        SysSetting expressFeeSetting = iSysSettingService.getById(Constants.SYSSETTING_EXPRESS_FEE);
+        float expressFee = Float.parseFloat(expressFeeSetting.getContent());
+        // 工本费
+        SysSetting productionCostSetting = iSysSettingService.getById(Constants.SYSSETTING_PRODUCTION_COST);
+        float productionCost = Float.parseFloat(productionCostSetting.getContent());
+
+        TaOrder taOrder = new TaOrder();
+        String orderNo = createOrderNo();
+        taOrder.setOrderNo(orderNo);
+        taOrder.setApplyId(taApplication.getApplyId().toString());
+        taOrder.setProductionCost((int) (productionCost * 100));
+        // 如果没有选择快递提取, 则没有快递费用
+        taOrder.setExpressFee(taApplication.getApplyMethod() == 2 ? (int) (expressFee * 100) : 0);
+        taOrder.setCharges(taOrder.getExpressFee() + taOrder.getProductionCost());
+        taOrder.setStatus(Constants.PAY_STATUS_READY);
+        taOrder.setCreateDate(LocalDateTime.now());
+
+        if (save(taOrder)) {
+            return taOrder;
+        } else {
+            throw new Exception("生成订单失败");
+        }
+    }
+
+    @Override
+    public void refundNotifyOrder(WxPayRefundNotifyV3Result.DecryptNotifyResult result) throws Exception {
+        String orderNo = result.getOutTradeNo();
+        TaOrder taOrder = getExistBy("order_no", orderNo, false, true);
+        if (null == taOrder) {
+            log.error("退款通知处理失败: 单号 " + orderNo);
+            log.error(result.toString());
+            return;
+        }
+
+        boolean isSuccess = WxPayConstants.RefundStatus.SUCCESS.equals(result.getRefundStatus());
+        if (isSuccess) {
+            // 更新订单
+            taOrder.setStatus(Constants.PAY_STATUS_REFUND);
+            taOrder.setRefundDate(LocalDateTime.now());
+            updateById(taOrder);
+            // 更新申请
+            TaApplication taApplication = applicationMapper.selectById(taOrder.getApplyId());
+            taApplication.setPayStatus(Constants.PAY_STATUS_REFUND);
+            applicationMapper.updateById(taApplication);
+        }
+
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.njyunzhi.pet_identity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njyunzhi.pet_identity.common.Constants;
 import com.njyunzhi.pet_identity.common.DateUtils;
 import com.njyunzhi.pet_identity.entity.SysSetting;
@@ -52,7 +53,7 @@ public class TaPetIdentityServiceImpl extends BaseServiceImpl<TaPetIdentityMappe
         taPetIdentity.setPetImg2(taApplication.getImg2());
         taPetIdentity.setAddress(taApplication.getAddress());
         taPetIdentity.setStartDate(DateUtils.toString(now, "yyyy-MM-dd"));
-        taPetIdentity.setStartDate(DateUtils.toString(expire, "yyyy-MM-dd"));
+        taPetIdentity.setExpireDate(DateUtils.toString(expire, "yyyy-MM-dd"));
         taPetIdentity.setStatus(Constants.STATUS_NORMAL);
         taPetIdentity.setCreateDate(now);
 
@@ -73,8 +74,19 @@ public class TaPetIdentityServiceImpl extends BaseServiceImpl<TaPetIdentityMappe
         LocalDateTime expire = now.plusDays(Long.parseLong(sysSetting.getContent()));
 
         taPetIdentity.setStartDate(DateUtils.toString(now, "yyyy-MM-dd"));
-        taPetIdentity.setStartDate(DateUtils.toString(expire, "yyyy-MM-dd"));
+        taPetIdentity.setExpireDate(DateUtils.toString(expire, "yyyy-MM-dd"));
 
         return updateById(taPetIdentity);
     }
+
+    @Override
+    public TaPetIdentity getByPet(String petId, String personId) {
+        QueryWrapper<TaPetIdentity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("pet_id", petId);
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.in("status", new Integer[] { Constants.CARD_STATUS_NORMAL, Constants.CARD_STATUS_EXPIRE });
+        queryWrapper.last("limit 1");
+
+        return getOne(queryWrapper);
+    }
 }

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

@@ -17,4 +17,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaSequenceServiceImpl extends ServiceImpl<TaSequenceMapper, TaSequence> implements ITaSequenceService {
 
+    @Override
+    public Integer getNextVal(String seqName) {
+        return baseMapper.getNextVal(seqName);
+    }
 }

src/main/resources/application.yml

@@ -41,7 +41,7 @@ sms:
 ###
 yz:
   default:
-    servBase: https://xxx
+    servBase: https://pet-certificate-online.njyunzhi.com/api
   sms:
     ## ??????
     appid: ubpa

src/main/resources/mapper/TaOrderMapper.xml

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njyunzhi.pet_identity.mapper.TaOrderMapper">
 
+    <select id="getByApplyId" resultType="com.njyunzhi.pet_identity.entity.TaOrder">
+        SELECT
+            *
+        FROM
+            ta_order t
+        WHERE
+            t.apply_id = #{applyId}
+          AND t.`status` = 2
+    </select>
 </mapper>