feats

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

@@ -186,12 +186,6 @@ public class TaApplicationController extends BaseController {
         taApplication.setVerifyStatus(Constants.AUDIT_STATUS_READY);
         taApplication.setMakeStatus(Constants.MAKE_STATUS_READY);
 
-        Integer totalCharge = iTaApplicationService.getTotalCharge(taApplication);
-        if (totalCharge < 1) {
-            // 不需要缴费
-            taApplication.setStatus(Constants.WORKFLOW_STATUS_PROCESSING);
-        }
-
         if (Constants.APPLY_TYPE_RENEWAL.equals(taApplication.getApplyType())) {
             // 如果是续期申请
             if (StringUtils.isEmpty(taApplication.getOriginCardNo())) {
@@ -219,12 +213,26 @@ public class TaApplicationController extends BaseController {
             if (!iTaPetIdentityService.updateById(taPetIdentity)) {
                 return ResponseBean.error("挂失证件失败, 请重试");
             }
+
+            Integer totalCharge = iTaApplicationService.getTotalCharge(taApplication);
+            if (totalCharge < 1) {
+                // 不需要缴费
+                taApplication.setStatus(Constants.WORKFLOW_STATUS_PROCESSING);
+            }
+
         } else {
             // 当前狗狗是否存在证件
             TaPetIdentity origin = iTaPetIdentityService.getByPet(taApplication.getPetId(), taApplication.getPersonId());
             if (null != origin) {
                 return ResponseBean.error("请先挂失原始证件");
             }
+
+            Integer totalCharge = iTaApplicationService.getTotalCharge(taApplication);
+            if (totalCharge < 1) {
+                // 不需要缴费
+                taApplication.setStatus(Constants.WORKFLOW_STATUS_PROCESSING);
+            }
+
         }
 
         if (iTaApplicationService.save(taApplication)){