Your Name 3 years ago
parent
commit
4c8b1daba6

+ 14
- 14
src/main/java/com/njyunzhi/pet_identity/controller/TaApplicationController.java View File

312
 
312
 
313
         if (Constants.APPLY_TYPE_FIRST.equals(taApplication.getApplyType())) {
313
         if (Constants.APPLY_TYPE_FIRST.equals(taApplication.getApplyType())) {
314
             // 办证申请
314
             // 办证申请
315
-            if (taApplication.getPayStatus() != Constants.PAY_STATUS_PAID) {
316
-                return ResponseBean.error("用户未支付");
317
-            }
315
+//            if (taApplication.getPayStatus() != Constants.PAY_STATUS_PAID) {
316
+//                return ResponseBean.error("用户未支付");
317
+//            }
318
         } else if (Constants.APPLY_TYPE_RENEWAL.equals(taApplication.getApplyType())) {
318
         } else if (Constants.APPLY_TYPE_RENEWAL.equals(taApplication.getApplyType())) {
319
             // 续期 - 续期不需要费用
319
             // 续期 - 续期不需要费用
320
             if (StringUtils.isEmpty(taApplication.getOriginCardNo())) {
320
             if (StringUtils.isEmpty(taApplication.getOriginCardNo())) {
338
             }
338
             }
339
         } else if (Constants.APPLY_TYPE_REISSUE.equals(taApplication.getApplyType())) {
339
         } else if (Constants.APPLY_TYPE_REISSUE.equals(taApplication.getApplyType())) {
340
             // 补办
340
             // 补办
341
-            if (taApplication.getPayStatus() != Constants.PAY_STATUS_PAID) {
342
-                return ResponseBean.error("用户未支付");
343
-            }
341
+//            if (taApplication.getPayStatus() != Constants.PAY_STATUS_PAID) {
342
+//                return ResponseBean.error("用户未支付");
343
+//            }
344
 
344
 
345
             if (StringUtils.isEmpty(taApplication.getOriginCardNo())) {
345
             if (StringUtils.isEmpty(taApplication.getOriginCardNo())) {
346
                 return ResponseBean.error("未找到原始证件信息");
346
                 return ResponseBean.error("未找到原始证件信息");
381
             return ResponseBean.error("未找到数据");
381
             return ResponseBean.error("未找到数据");
382
         }
382
         }
383
 
383
 
384
-        if (!taApplication.getApplyType().equals(Constants.APPLY_TYPE_RENEWAL)
385
-                && taApplication.getPayStatus() != Constants.PAY_STATUS_PAID) {
386
-            return ResponseBean.error("当前申请工本费未支付");
387
-        }
384
+//        if (!taApplication.getApplyType().equals(Constants.APPLY_TYPE_RENEWAL)
385
+//                && taApplication.getPayStatus() != Constants.PAY_STATUS_PAID) {
386
+//            return ResponseBean.error("当前申请工本费未支付");
387
+//        }
388
 
388
 
389
-        if (taApplication.getStatus() != Constants.WORKFLOW_STATUS_AUDIT
390
-                && taApplication.getVerifyStatus() == Constants.AUDIT_STATUS_PASSED) {
391
-            return ResponseBean.error("申请未通过或状态不对");
392
-        }
389
+//        if (taApplication.getStatus() != Constants.WORKFLOW_STATUS_AUDIT
390
+//                && taApplication.getVerifyStatus() == Constants.AUDIT_STATUS_PASSED) {
391
+//            return ResponseBean.error("申请未通过或状态不对");
392
+//        }
393
 
393
 
394
         if (!Constants.APPLY_TYPE_FIRST.equals(taApplication.getApplyType())
394
         if (!Constants.APPLY_TYPE_FIRST.equals(taApplication.getApplyType())
395
                 && !Constants.APPLY_TYPE_REISSUE.equals(taApplication.getApplyType())) {
395
                 && !Constants.APPLY_TYPE_REISSUE.equals(taApplication.getApplyType())) {