|
@@ -312,9 +312,9 @@ public class TaApplicationController extends BaseController {
|
312
|
312
|
|
313
|
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
|
318
|
} else if (Constants.APPLY_TYPE_RENEWAL.equals(taApplication.getApplyType())) {
|
319
|
319
|
// 续期 - 续期不需要费用
|
320
|
320
|
if (StringUtils.isEmpty(taApplication.getOriginCardNo())) {
|
|
@@ -338,9 +338,9 @@ public class TaApplicationController extends BaseController {
|
338
|
338
|
}
|
339
|
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
|
345
|
if (StringUtils.isEmpty(taApplication.getOriginCardNo())) {
|
346
|
346
|
return ResponseBean.error("未找到原始证件信息");
|
|
@@ -381,15 +381,15 @@ public class TaApplicationController extends BaseController {
|
381
|
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
|
394
|
if (!Constants.APPLY_TYPE_FIRST.equals(taApplication.getApplyType())
|
395
|
395
|
&& !Constants.APPLY_TYPE_REISSUE.equals(taApplication.getApplyType())) {
|