Subversion Repositories SmartDukaan

Rev

Rev 36644 | Rev 36761 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 36644 Rev 36741
Line 822... Line 822...
822
        lead.setCreatedTimestamp(LocalDateTime.now());
822
        lead.setCreatedTimestamp(LocalDateTime.now());
823
        lead.setUpdatedTimestamp(LocalDateTime.now());
823
        lead.setUpdatedTimestamp(LocalDateTime.now());
824
        lead.setStatus(createRefferalRequest.getStatus());
824
        lead.setStatus(createRefferalRequest.getStatus());
825
        lead.setAssignTo(createRefferalRequest.getAssignTo());
825
        lead.setAssignTo(createRefferalRequest.getAssignTo());
826
        lead.setSource(createRefferalRequest.getSource());
826
        lead.setSource(createRefferalRequest.getSource());
827
        if (createRefferalRequest.getColorCheck() == true) {
827
        if (Boolean.TRUE.equals(createRefferalRequest.getColorCheck())) {
828
            lead.setColor("Green");
828
            lead.setColor("Green");
829
        } else {
829
        } else {
830
            lead.setColor("Yellow");
830
            lead.setColor("Yellow");
831
        }
831
        }
832
        // change
832
        // change
Line 926... Line 926...
926
        LOGGER.info("createRefferalRequest" + createLeadActivityRequest);
926
        LOGGER.info("createRefferalRequest" + createLeadActivityRequest);
927
 
927
 
928
        if (createLeadActivityRequest.getStatus() == LeadStatus.followUp) {
928
        if (createLeadActivityRequest.getStatus() == LeadStatus.followUp) {
929
            leadActivity.setSchelduleTimestamp(createLeadActivityRequest.getScheldule());
929
            leadActivity.setSchelduleTimestamp(createLeadActivityRequest.getScheldule());
930
            leadActivity.setCommunicationType(createLeadActivityRequest.getCommunicationType());
930
            leadActivity.setCommunicationType(createLeadActivityRequest.getCommunicationType());
931
            if (leadActivity.getCommunicationType().equals(CommunicationType.VISIT)) {
931
            // A beat-day pick wires the lead onto that beat's route regardless of
932
                // Parse beat selection (format: "date|beatName|beatId")
932
            // communication type (TELEPHONIC = call on that beat day).
933
                String beatSelection = createLeadActivityRequest.getBeatSelection();
933
            String beatSelection = createLeadActivityRequest.getBeatSelection();
-
 
934
            if (beatSelection != null && beatSelection.contains("|")) {
934
                int beatId = 0;
935
                int beatId = 0;
935
                LocalDate beatDate = createLeadActivityRequest.getScheldule() != null
936
                LocalDate beatDate = createLeadActivityRequest.getScheldule() != null
936
                        ? createLeadActivityRequest.getScheldule().toLocalDate() : LocalDate.now();
937
                        ? createLeadActivityRequest.getScheldule().toLocalDate() : LocalDate.now();
937
                String beatName = "Beat";
938
                String beatName = "Beat";
938
 
939
 
939
                if (beatSelection != null && beatSelection.contains("|")) {
-
 
940
                    String[] parts = beatSelection.split("\\|", 3);
940
                String[] parts = beatSelection.split("\\|", 3);
941
                    beatDate = LocalDate.parse(parts[0]);
941
                beatDate = LocalDate.parse(parts[0]);
942
                    beatName = parts.length > 1 ? parts[1] : "Beat";
942
                beatName = parts.length > 1 ? parts[1] : "Beat";
943
                    if (parts.length > 2) {
943
                if (parts.length > 2) {
944
                        try {
944
                    try {
945
                            beatId = Integer.parseInt(parts[2]);
945
                        beatId = Integer.parseInt(parts[2]);
946
                        } catch (NumberFormatException ignored) {
946
                    } catch (NumberFormatException ignored) {
947
                        }
-
 
948
                    }
947
                    }
949
                }
948
                }
950
 
949
 
951
                // Find optimal insert position using lead geolocation
950
                // Find optimal insert position using lead geolocation
952
                int insertAt = 0;
951
                int insertAt = 0;
Line 1017... Line 1016...
1017
        lead.setState(createLeadActivityRequest.getState());
1016
        lead.setState(createLeadActivityRequest.getState());
1018
        lead.setCity(createLeadActivityRequest.getCity());
1017
        lead.setCity(createLeadActivityRequest.getCity());
1019
        if (createLeadActivityRequest.getSource() != null && !createLeadActivityRequest.getSource().isEmpty()) {
1018
        if (createLeadActivityRequest.getSource() != null && !createLeadActivityRequest.getSource().isEmpty()) {
1020
            lead.setSource(createLeadActivityRequest.getSource());
1019
            lead.setSource(createLeadActivityRequest.getSource());
1021
        }
1020
        }
1022
        if (createLeadActivityRequest.getColorCheck() == true) {
1021
        if (Boolean.TRUE.equals(createLeadActivityRequest.getColorCheck())) {
1023
            lead.setColor("Green");
1022
            lead.setColor("Green");
1024
        } else {
1023
        } else {
1025
            lead.setColor("Yellow");
1024
            lead.setColor("Yellow");
1026
        }
1025
        }
1027
        lead.setNotinterestedReason(createLeadActivityRequest.getReason());
1026
        lead.setNotinterestedReason(createLeadActivityRequest.getReason());