zjh20250806

zjh

3 天以前 9cf381f93354a5f0fcaf14bd3ab118886d589f80

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java

@@ -151,6 +151,7 @@
    @PostMapping(value = "/cusIdcard")
    @ApiOperation(value = "根据身份证号获取用户信息")
//    @Log(title = "客户身份信息", businessType = BusinessType.EXPORT)
    @RepeatSubmit
    public AjaxResult getInfoByIdCard(@RequestParam @ApiParam(value = "客户身份证号") String cusIdcard) {
        if (!"".equals(cusIdcard) && cusIdcard != null) {

@@ -163,11 +164,6 @@
                        return AjaxResult.error("身份证号码错误");
                    }
                }
//                if(cusIdcard.length()==9){
//                    if (!MatchUtils.cardValidates(cusIdcard)) {
//                        return AjaxResult.error("身份证号码错误");
//                    }
//                }
            }


@@ -234,9 +230,7 @@
                    tjReservationService.updateById(tjReservation);
                    return AjaxResult.error("对不起您的预约已超时请重新预约");
                }
                LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
                qw.eq(TjCustomer::getCusIdcard, cusIdcard);
                TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
                TjCustomer tjCustomer1 = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
                if (tjCustomer1 != null) {
//                    if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
//                    if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany());
@@ -287,8 +281,8 @@
                    tjCustomer.setCusPhone(tjReservation.getPhoe());
                    tjCustomer.setCusEmail(tjReservation.getEmail());
                    tjCustomer.setCusAddr(tjReservation.getAddress());
                    tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
                    tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
                    tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage())==null ?"0": tjReservation.getMarriage().toString());
                    tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()) ==null ? "0": tjReservation.getNation().toString());

                    tjCustomer.setIdType(tjReservation.getIdType());
                    tjCustomer.setAge(tjReservation.getAge());
@@ -318,7 +312,7 @@
                                String pationid = resultData.get("PationId").toString();
                                if (null != pationid) {
                                    tjCustomer.setPationId(pationid);
                                    tjCustomerService.save(tjCustomer);
//                                    tjCustomerService.save(tjCustomer);
                                    //保存注册入参出参
                                    resultData.put("cardId",pationid);
                                    JSONObject object4 = JSONUtil.parseObj(resultData);
@@ -330,18 +324,17 @@
                            }
                        }
                    } else if(null != s && s.equalsIgnoreCase("Y")) {
                        TjCustomer requestCommonHisApi = isRequestCommonHisApi(tjCustomer);
                        if (null !=requestCommonHisApi){
                            tjCustomerService.save(requestCommonHisApi);
                        }
                    }else {
                        tjCustomerService.save(tjCustomer);
                        tjCustomer = isRequestCommonHisApi(tjCustomer);
                    }
                    tjCustomer.setTeamNo(tjReservation.getTeamNo());
                    tjCustomer.setCompId(tjReservation.getCompanyId());
                    tjCustomer.setReservationId(tjReservation.getId());
                    tjCustomer.setDiscount(tjReservation.getDiscount());
                    tjCustomer.setGroupingId(tjReservation.getGroupingId());
//                    TjCustomer tjCustomerByCusIdCard = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
//                    if(null != tjCustomerByCusIdCard)
                    tjCustomerService.save(tjCustomer);
                        tjCustomer.setTeamNo(tjReservation.getTeamNo());
                        tjCustomer.setCompId(tjReservation.getCompanyId());
                        tjCustomer.setReservationId(tjReservation.getId());
                        tjCustomer.setDiscount(tjReservation.getDiscount());
                        tjCustomer.setGroupingId(tjReservation.getGroupingId());

                    return success(tjCustomer);
                }

@@ -354,16 +347,7 @@
            if (null == tjCustomerServiceOne) {
                return AjaxResult.error("该人员信息不存在请先进行登记!!!");
            }
//            if (null != key && key.equals("Y")) {
                String cardId = tjCustomerServiceOne.getCardId();
                if (null != cardId && !cardId.equals("0")) {
//                    int i = tjOrderService.selectTjOrderByCardId(cardId);
//                    if (i > 0) {
//                        return AjaxResult.error("不可重复签到");
//                    }
                }

//            }
            if(!tjCustomerServiceOne.getAge().equals(String.valueOf(DateUtil.ageOfNow(tjCustomerServiceOne.getCusBrithday())))){
                tjCustomerServiceOne.setAge(String.valueOf(DateUtil.ageOfNow(tjCustomerServiceOne.getCusBrithday())));
                tjCustomerService.updateById(tjCustomerServiceOne);
@@ -493,24 +477,24 @@
                if(sfjysfzh.equalsIgnoreCase("Y")){
                    if(cusIdcard.length()==18){
                        b = MatchUtils.isIdCard(cusIdcard);
                    }else {
                        return AjaxResult.error("请输入十八位号的证件号!");
                    }
                }
            }
//            else {
//                if(cusIdcard.length()==9){
//                    b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
//                }
//
//            }
        } else {
            return AjaxResult.error("请选择证件类型");
        }
        if (!b) return AjaxResult.error("证件号有误");
        if (!b) return AjaxResult.error("证件号有误,请检查证件号是否有效!");


        //判断身份证号格式是否正确
        if (tjCustomer.getCusPhone().length() != 11)
            return AjaxResult.error("请输入十一位号的手机号!");

        if(sfjysjh.equalsIgnoreCase("Y")){
            if (!(MatchUtils.isMobileNO(tjCustomer.getCusPhone())))
                return AjaxResult.error("手机号错误");
                return AjaxResult.error("手机号错误,请检查手机号是否有效!");
        }

        LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();