|
@@ -88,7 +88,7 @@ public class TaApplicationController extends BaseController {
|
88
|
88
|
@ApiParam("犬主") @RequestParam(value ="personName", required = false) String personName,
|
89
|
89
|
@ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
|
90
|
90
|
@ApiParam("犬名") @RequestParam(value ="petName", required = false) String petName,
|
91
|
|
- @ApiParam("卡号") @RequestParam(value ="originCardNo", required = false) String originCardNo,
|
|
91
|
+ @ApiParam("卡号") @RequestParam(value ="cardNo", required = false) String cardNo,
|
92
|
92
|
@ApiParam("是否企业") @RequestParam(value ="isOrg", required = false) Boolean isOrg,
|
93
|
93
|
@ApiParam("企业名称") @RequestParam(value ="orgName", required = false) String orgName,
|
94
|
94
|
@ApiParam("状态") @RequestParam(value ="status", required = false) Integer status) throws Exception{
|
|
@@ -112,7 +112,7 @@ public class TaApplicationController extends BaseController {
|
112
|
112
|
params.setPersonName(personName);
|
113
|
113
|
params.setPhone(phone);
|
114
|
114
|
params.setPetName(petName);
|
115
|
|
- params.setOriginCardNo(originCardNo);
|
|
115
|
+ params.setCardNo(cardNo);
|
116
|
116
|
params.setIsOrg(isOrg);
|
117
|
117
|
params.setOrgName(orgName);
|
118
|
118
|
params.setStatus(status);
|
|
@@ -212,6 +212,12 @@ public class TaApplicationController extends BaseController {
|
212
|
212
|
return ResponseBean.error("请先完善个人信息");
|
213
|
213
|
}
|
214
|
214
|
|
|
215
|
+ // 如果有提交记录
|
|
216
|
+ List<TaApplication> applicationList = iTaApplicationService.getNormalApplication(taApplication.getPetId());
|
|
217
|
+ if (null != applicationList && applicationList.size() > 0) {
|
|
218
|
+ return ResponseBean.error("当前狗狗已有申请在处理");
|
|
219
|
+ }
|
|
220
|
+
|
215
|
221
|
taApplication.setPersonId(taPerson.getPersonId());
|
216
|
222
|
taApplication.setPersonName(taPerson.getNickName());
|
217
|
223
|
taApplication.setPhone(taPerson.getPhone());
|
|
@@ -231,6 +237,17 @@ public class TaApplicationController extends BaseController {
|
231
|
237
|
return ResponseBean.error("未找到原始证件信息");
|
232
|
238
|
}
|
233
|
239
|
|
|
240
|
+ // 原始申请记录
|
|
241
|
+ TaApplication origin = iTaApplicationService.getLastApplication(taApplication.getPetId());
|
|
242
|
+ if (null == origin) {
|
|
243
|
+ return ResponseBean.error("系统未找到上次申请记录");
|
|
244
|
+ }
|
|
245
|
+ taApplication.setOriginApplyId(origin.getApplyId());
|
|
246
|
+
|
|
247
|
+ if (!taApplication.getOriginCardNo().equals(origin.getCardNo())) {
|
|
248
|
+ return ResponseBean.error("原始证件信息校验异常");
|
|
249
|
+ }
|
|
250
|
+
|
234
|
251
|
// 续期不需要缴费, 直接状态位待审核
|
235
|
252
|
taApplication.setStatus(Constants.WORKFLOW_STATUS_PROCESSING);
|
236
|
253
|
} else if (Constants.APPLY_TYPE_REISSUE.equals(taApplication.getApplyType())) {
|
|
@@ -243,6 +260,17 @@ public class TaApplicationController extends BaseController {
|
243
|
260
|
return ResponseBean.error("未找到原始证件信息");
|
244
|
261
|
}
|
245
|
262
|
|
|
263
|
+ // 原始申请记录
|
|
264
|
+ TaApplication origin = iTaApplicationService.getLastApplication(taApplication.getPetId());
|
|
265
|
+ if (null == origin) {
|
|
266
|
+ return ResponseBean.error("系统未找到上次申请记录");
|
|
267
|
+ }
|
|
268
|
+ taApplication.setOriginApplyId(origin.getApplyId());
|
|
269
|
+
|
|
270
|
+ if (!taApplication.getOriginCardNo().equals(origin.getOriginCardNo())) {
|
|
271
|
+ return ResponseBean.error("原始证件信息校验异常");
|
|
272
|
+ }
|
|
273
|
+
|
246
|
274
|
// 直接将原卡置为挂失
|
247
|
275
|
taPetIdentity.setStatus(Constants.CARD_STATUS_LOSS);
|
248
|
276
|
if (!iTaPetIdentityService.updateById(taPetIdentity)) {
|
|
@@ -254,7 +282,6 @@ public class TaApplicationController extends BaseController {
|
254
|
282
|
// 不需要缴费
|
255
|
283
|
taApplication.setStatus(Constants.WORKFLOW_STATUS_PROCESSING);
|
256
|
284
|
}
|
257
|
|
-
|
258
|
285
|
} else {
|
259
|
286
|
// 当前狗狗是否存在证件
|
260
|
287
|
TaPetIdentity origin = iTaPetIdentityService.getByPet(taApplication.getPetId(), taApplication.getPersonId());
|
|
@@ -344,6 +371,9 @@ public class TaApplicationController extends BaseController {
|
344
|
371
|
if (Constants.PAY_STATUS_PAID == taApplication.getPayStatus()) {
|
345
|
372
|
iTaOrderService.refundByApplication(taApplication);
|
346
|
373
|
}
|
|
374
|
+
|
|
375
|
+ // 驳回, 意味着流程结束
|
|
376
|
+ taApplication.setProcessingDone(true);
|
347
|
377
|
}
|
348
|
378
|
|
349
|
379
|
taApplication.setVerifyStatus(auditParam.getVerifyStatus());
|
|
@@ -379,6 +409,10 @@ public class TaApplicationController extends BaseController {
|
379
|
409
|
taApplication.setStatus(Constants.WORKFLOW_STATUS_MADE);
|
380
|
410
|
taApplication.setMakeStatus(Constants.MAKE_STATUS_MADE);
|
381
|
411
|
}
|
|
412
|
+
|
|
413
|
+ // 续期, 不需要制卡
|
|
414
|
+ taApplication.setCardNo(taApplication.getOriginCardNo());
|
|
415
|
+ taApplication.setProcessingDone(true);
|
382
|
416
|
} else if (Constants.APPLY_TYPE_REISSUE.equals(taApplication.getApplyType())) {
|
383
|
417
|
// 补办
|
384
|
418
|
// if (taApplication.getPayStatus() != Constants.PAY_STATUS_PAID) {
|
|
@@ -442,7 +476,7 @@ public class TaApplicationController extends BaseController {
|
442
|
476
|
}
|
443
|
477
|
}
|
444
|
478
|
|
445
|
|
- taApplication.setOriginCardNo(makeCardParam.getCardNo());
|
|
479
|
+ taApplication.setCardNo(makeCardParam.getCardNo());
|
446
|
480
|
iTaApplicationService.updateById(taApplication);
|
447
|
481
|
TaPetIdentity newCard = iTaPetIdentityService.createNewCard(taApplication, makeCardParam);
|
448
|
482
|
return ResponseBean.success(newCard);
|
|
@@ -500,9 +534,10 @@ public class TaApplicationController extends BaseController {
|
500
|
534
|
taApplication.setTrackingType(makeCardParam.getTrackingType());
|
501
|
535
|
taApplication.setTrackingNo(makeCardParam.getTrackingNo());
|
502
|
536
|
taApplication.setStatus(Constants.WORKFLOW_STATUS_MADE);
|
|
537
|
+ taApplication.setProcessingDone(true);
|
503
|
538
|
|
504
|
|
- TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", taApplication.getOriginCardNo(), false, true);
|
505
|
|
- if (!taApplication.getApplyType().equals(Constants.APPLY_TYPE_REISSUE)) {
|
|
539
|
+ TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", taApplication.getCardNo(), false, true);
|
|
540
|
+ if (null != taPetIdentity) {
|
506
|
541
|
// 新办 续期,都需要重置有效期
|
507
|
542
|
iTaPetIdentityService.updateCardDate(taPetIdentity.getCardNo());
|
508
|
543
|
}
|