| 29222 |
tejbeer |
1 |
package com.spice.profitmandi.web.controller;
|
|
|
2 |
|
|
|
3 |
import com.google.gson.Gson;
|
|
|
4 |
import com.spice.profitmandi.common.enumuration.MessageType;
|
|
|
5 |
import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
|
|
|
6 |
import com.spice.profitmandi.common.model.CustomRetailer;
|
|
|
7 |
import com.spice.profitmandi.common.model.ProfitMandiConstants;
|
|
|
8 |
import com.spice.profitmandi.common.model.SendNotificationModel;
|
|
|
9 |
import com.spice.profitmandi.common.util.FileUtil;
|
| 32603 |
raveendra. |
10 |
import com.spice.profitmandi.common.util.FormattingUtils;
|
| 29222 |
tejbeer |
11 |
import com.spice.profitmandi.dao.entity.auth.AuthUser;
|
|
|
12 |
import com.spice.profitmandi.dao.entity.cs.Position;
|
|
|
13 |
import com.spice.profitmandi.dao.entity.logistics.Provider;
|
|
|
14 |
import com.spice.profitmandi.dao.entity.logistics.ProviderDetails;
|
|
|
15 |
import com.spice.profitmandi.dao.entity.logistics.ProviderTat;
|
|
|
16 |
import com.spice.profitmandi.dao.entity.logistics.PublicHolidays;
|
|
|
17 |
import com.spice.profitmandi.dao.entity.transaction.Order;
|
| 30989 |
tejbeer |
18 |
import com.spice.profitmandi.dao.entity.user.Address;
|
| 32933 |
amit.gupta |
19 |
import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
|
| 31107 |
amit.gupta |
20 |
import com.spice.profitmandi.dao.model.*;
|
| 29222 |
tejbeer |
21 |
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
|
|
|
22 |
import com.spice.profitmandi.dao.repository.cs.CsService;
|
|
|
23 |
import com.spice.profitmandi.dao.repository.cs.PositionRepository;
|
|
|
24 |
import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
|
|
|
25 |
import com.spice.profitmandi.dao.repository.logistics.ProviderDetailsRepository;
|
|
|
26 |
import com.spice.profitmandi.dao.repository.logistics.ProviderRepository;
|
|
|
27 |
import com.spice.profitmandi.dao.repository.logistics.ProviderTatRepository;
|
|
|
28 |
import com.spice.profitmandi.dao.repository.logistics.PublicHolidaysRepository;
|
|
|
29 |
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
|
| 30989 |
tejbeer |
30 |
import com.spice.profitmandi.dao.repository.user.AddressRepository;
|
|
|
31 |
import com.spice.profitmandi.dao.repository.user.UserRepository;
|
| 31043 |
tejbeer |
32 |
import com.spice.profitmandi.dao.service.biuedart.BluedartService;
|
| 29222 |
tejbeer |
33 |
import com.spice.profitmandi.service.LogisticsService;
|
|
|
34 |
import com.spice.profitmandi.service.NotificationService;
|
|
|
35 |
import com.spice.profitmandi.web.model.LoginDetails;
|
|
|
36 |
import com.spice.profitmandi.web.util.CookiesProcessor;
|
|
|
37 |
import com.spice.profitmandi.web.util.MVCResponseSender;
|
|
|
38 |
import in.shop2020.logistics.DeliveryType;
|
| 30220 |
amit.gupta |
39 |
import in.shop2020.logistics.PickUpType;
|
| 29222 |
tejbeer |
40 |
import in.shop2020.model.v1.order.OrderStatus;
|
| 31107 |
amit.gupta |
41 |
import org.apache.commons.csv.CSVRecord;
|
| 33910 |
amit.gupta |
42 |
import org.apache.commons.lang3.tuple.Pair;
|
| 31107 |
amit.gupta |
43 |
import org.apache.logging.log4j.LogManager;
|
|
|
44 |
import org.apache.logging.log4j.Logger;
|
|
|
45 |
import org.json.JSONArray;
|
|
|
46 |
import org.json.JSONObject;
|
|
|
47 |
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
48 |
import org.springframework.core.io.InputStreamResource;
|
|
|
49 |
import org.springframework.http.HttpHeaders;
|
|
|
50 |
import org.springframework.http.HttpStatus;
|
|
|
51 |
import org.springframework.http.ResponseEntity;
|
|
|
52 |
import org.springframework.stereotype.Controller;
|
|
|
53 |
import org.springframework.ui.Model;
|
|
|
54 |
import org.springframework.web.bind.annotation.*;
|
|
|
55 |
import org.springframework.web.multipart.MultipartFile;
|
| 29222 |
tejbeer |
56 |
|
| 31107 |
amit.gupta |
57 |
import javax.servlet.http.HttpServletRequest;
|
|
|
58 |
import javax.servlet.http.HttpServletResponse;
|
|
|
59 |
import javax.transaction.Transactional;
|
|
|
60 |
import java.io.ByteArrayInputStream;
|
|
|
61 |
import java.io.InputStream;
|
|
|
62 |
import java.time.LocalDate;
|
|
|
63 |
import java.time.LocalDateTime;
|
|
|
64 |
import java.time.format.DateTimeFormatter;
|
|
|
65 |
import java.util.*;
|
|
|
66 |
import java.util.Map.Entry;
|
|
|
67 |
import java.util.stream.Collectors;
|
|
|
68 |
|
| 29222 |
tejbeer |
69 |
@Controller
|
|
|
70 |
@Transactional(rollbackOn = Throwable.class)
|
|
|
71 |
public class LogisticsController {
|
|
|
72 |
|
| 32050 |
tejbeer |
73 |
@Autowired
|
|
|
74 |
private OrderRepository orderRepository;
|
| 29222 |
tejbeer |
75 |
|
| 32050 |
tejbeer |
76 |
@Autowired
|
|
|
77 |
private ProviderRepository providerRepository;
|
| 29222 |
tejbeer |
78 |
|
| 32050 |
tejbeer |
79 |
@Autowired
|
|
|
80 |
private ProviderDetailsRepository providerDetailsRepository;
|
| 29222 |
tejbeer |
81 |
|
| 32050 |
tejbeer |
82 |
@Autowired
|
|
|
83 |
private MVCResponseSender mvcResponseSender;
|
| 29222 |
tejbeer |
84 |
|
| 32050 |
tejbeer |
85 |
@Autowired
|
|
|
86 |
private ProviderTatRepository providerTatRepository;
|
| 29222 |
tejbeer |
87 |
|
| 32050 |
tejbeer |
88 |
@Autowired
|
|
|
89 |
private PublicHolidaysRepository publicHolidaysRepository;
|
| 29222 |
tejbeer |
90 |
|
| 32050 |
tejbeer |
91 |
@Autowired
|
|
|
92 |
private LogisticsService logisticsService;
|
| 29222 |
tejbeer |
93 |
|
| 32050 |
tejbeer |
94 |
@Autowired
|
|
|
95 |
private UserAccountRepository userAccountRepository;
|
| 29222 |
tejbeer |
96 |
|
| 32050 |
tejbeer |
97 |
@Autowired
|
|
|
98 |
private NotificationService notificationService;
|
| 29222 |
tejbeer |
99 |
|
| 32050 |
tejbeer |
100 |
@Autowired
|
|
|
101 |
private AuthRepository authRepository;
|
| 29222 |
tejbeer |
102 |
|
| 32050 |
tejbeer |
103 |
@Autowired
|
|
|
104 |
private PositionRepository positionRepository;
|
| 29222 |
tejbeer |
105 |
|
| 32050 |
tejbeer |
106 |
@Autowired
|
|
|
107 |
private CookiesProcessor cookiesProcessor;
|
| 29222 |
tejbeer |
108 |
|
| 32050 |
tejbeer |
109 |
@Autowired
|
|
|
110 |
CsService csService;
|
| 29222 |
tejbeer |
111 |
|
| 32050 |
tejbeer |
112 |
@Autowired
|
|
|
113 |
private Gson gson;
|
| 29222 |
tejbeer |
114 |
|
| 32050 |
tejbeer |
115 |
@Autowired
|
|
|
116 |
private AddressRepository addressRepository;
|
| 30989 |
tejbeer |
117 |
|
| 32050 |
tejbeer |
118 |
@Autowired
|
|
|
119 |
private UserRepository userUserRepository;
|
| 30989 |
tejbeer |
120 |
|
| 32050 |
tejbeer |
121 |
@Autowired
|
| 32789 |
amit.gupta |
122 |
private BluedartService bluedartService;
|
| 31043 |
tejbeer |
123 |
|
| 32050 |
tejbeer |
124 |
private static final Logger LOGGER = LogManager.getLogger(LogisticsController.class);
|
| 29222 |
tejbeer |
125 |
|
| 32050 |
tejbeer |
126 |
@RequestMapping(value = "/logistics", method = RequestMethod.GET)
|
|
|
127 |
public String logistics(HttpServletRequest request, Model model) throws Exception {
|
|
|
128 |
ProviderTat pt = providerTatRepository.selectByProviderId(1, 7678, "110018");
|
| 29222 |
tejbeer |
129 |
|
| 32050 |
tejbeer |
130 |
return "logistics";
|
| 29222 |
tejbeer |
131 |
|
| 32050 |
tejbeer |
132 |
}
|
| 29222 |
tejbeer |
133 |
|
| 32050 |
tejbeer |
134 |
@RequestMapping(value = "/authorisedWarehouses")
|
|
|
135 |
public String authorisedWarehouses(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
| 29222 |
tejbeer |
136 |
|
| 32050 |
tejbeer |
137 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
|
|
138 |
String email = loginDetails.getEmailId();
|
| 29222 |
tejbeer |
139 |
|
| 32050 |
tejbeer |
140 |
AuthUser authUser = authRepository.selectByEmailOrMobile(email);
|
|
|
141 |
List<Position> positions = positionRepository.selectAll(authUser.getId());
|
| 29222 |
tejbeer |
142 |
|
| 32050 |
tejbeer |
143 |
List<Position> warehousePositions = positions.stream().filter(x -> x.getCategoryId() == ProfitMandiConstants.TICKET_CATEGORY_WAREHOUSE).collect(Collectors.toList());
|
|
|
144 |
Set<CustomRetailer> positionRetailers = new HashSet<>();
|
|
|
145 |
csService.getPositionCustomRetailerMap(warehousePositions).values().forEach(customRetailers -> {
|
|
|
146 |
positionRetailers.addAll(customRetailers);
|
| 29222 |
tejbeer |
147 |
|
| 32050 |
tejbeer |
148 |
});
|
| 29222 |
tejbeer |
149 |
|
| 32050 |
tejbeer |
150 |
Map<Integer, String> warehouseMap = this.getWarehouses(positionRetailers);
|
|
|
151 |
JSONArray response = new JSONArray();
|
| 29222 |
tejbeer |
152 |
|
| 32050 |
tejbeer |
153 |
warehouseMap.keySet().stream().filter(x -> warehouseMap.get(x) != null).forEach(x -> {
|
|
|
154 |
response.put(new JSONObject().put("id", x).put("name", warehouseMap.get(x)));
|
|
|
155 |
});
|
| 29222 |
tejbeer |
156 |
|
| 32050 |
tejbeer |
157 |
LOGGER.info("response1", response.toString());
|
| 29222 |
tejbeer |
158 |
|
| 32050 |
tejbeer |
159 |
model.addAttribute("response1", response.toString());
|
| 29222 |
tejbeer |
160 |
|
| 32050 |
tejbeer |
161 |
return "response";
|
|
|
162 |
}
|
| 29222 |
tejbeer |
163 |
|
| 32050 |
tejbeer |
164 |
@RequestMapping(value = "/billedOrderFileUploader", method = RequestMethod.POST)
|
|
|
165 |
public String getBilledOrderFileUploader(HttpServletRequest request, Model model, HttpServletResponse response, @RequestPart MultipartFile file) throws Throwable {
|
| 29222 |
tejbeer |
166 |
|
| 32050 |
tejbeer |
167 |
LOGGER.info("file" + file.toString());
|
|
|
168 |
String fileName = file.getName();
|
| 29222 |
tejbeer |
169 |
|
| 32050 |
tejbeer |
170 |
String fileNames = file.getOriginalFilename();
|
| 29222 |
tejbeer |
171 |
|
| 32050 |
tejbeer |
172 |
LOGGER.info("fileName" + fileName);
|
|
|
173 |
LOGGER.info("fileNames" + fileNames);
|
| 29222 |
tejbeer |
174 |
|
| 32050 |
tejbeer |
175 |
List<CSVRecord> records = FileUtil.readFile(file);
|
| 29222 |
tejbeer |
176 |
|
| 32763 |
amit.gupta |
177 |
List<BilledOrderListModel> billedOrderListModels = new ArrayList<>();
|
| 32050 |
tejbeer |
178 |
for (CSVRecord record : records) {
|
| 32789 |
amit.gupta |
179 |
BilledOrderListModel billedOrderListModel = createBilleOrder(record);
|
|
|
180 |
billedOrderListModels.add(billedOrderListModel);
|
| 32050 |
tejbeer |
181 |
LOGGER.info("records" + record.get(1));
|
|
|
182 |
}
|
| 29250 |
tejbeer |
183 |
|
| 32790 |
amit.gupta |
184 |
//Add Validation
|
|
|
185 |
//This is server side validation
|
|
|
186 |
Map<String, Set<String>> providerWayBillNumberMap = billedOrderListModels.stream()
|
|
|
187 |
.collect(Collectors.groupingBy(x -> x.getLogisticsProviderName(), Collectors.mapping(BilledOrderListModel::getAirwayBillNumber, Collectors.toSet())));
|
|
|
188 |
List<Order> ordersByWaybill = orderRepository.selectByAirwayBillNumber(providerWayBillNumberMap.values().stream().flatMap(x -> x.stream()).collect(Collectors.toList()));
|
|
|
189 |
|
|
|
190 |
Map<Integer, String> providerMap = providerRepository.selectAll().stream().collect(Collectors.toMap(x -> x.getId(), x -> x.getName()));
|
|
|
191 |
Map<Integer, List<Order>> existingProviderOrderMap = ordersByWaybill.stream().collect(Collectors.groupingBy(x -> x.getLogisticsProviderId()));
|
|
|
192 |
for (Entry<Integer, List<Order>> existingProviderEntrySet : existingProviderOrderMap.entrySet()) {
|
|
|
193 |
String providerName = providerMap.get(existingProviderEntrySet.getKey());
|
| 32800 |
amit.gupta |
194 |
LOGGER.info("Provider Name - {}", providerName);
|
| 32790 |
amit.gupta |
195 |
Set<String> wayBillNumbers = providerWayBillNumberMap.get(providerName);
|
| 32933 |
amit.gupta |
196 |
if (wayBillNumbers == null) continue;
|
| 32790 |
amit.gupta |
197 |
for (Order order : ordersByWaybill) {
|
| 32799 |
amit.gupta |
198 |
if (wayBillNumbers.contains(order.getAirwayBillNumber())) {
|
| 32800 |
amit.gupta |
199 |
String errorMessage = "Provider " + providerName + ", wayBillNumber " + order.getAirwayBillNumber() + " already exists";
|
| 32790 |
amit.gupta |
200 |
throw new ProfitMandiBusinessException(errorMessage, errorMessage, errorMessage);
|
|
|
201 |
}
|
|
|
202 |
}
|
|
|
203 |
}
|
|
|
204 |
|
|
|
205 |
|
| 32050 |
tejbeer |
206 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
|
|
207 |
String email = loginDetails.getEmailId();
|
| 29222 |
tejbeer |
208 |
|
| 32050 |
tejbeer |
209 |
AuthUser authUser = authRepository.selectByEmailOrMobile(email);
|
|
|
210 |
List<Position> positions = positionRepository.selectAll(authUser.getId());
|
| 29222 |
tejbeer |
211 |
|
| 32050 |
tejbeer |
212 |
List<Position> warehousePositions = positions.stream().filter(x -> x.getCategoryId() == ProfitMandiConstants.TICKET_CATEGORY_WAREHOUSE).collect(Collectors.toList());
|
| 32933 |
amit.gupta |
213 |
List<Integer> authWarehouseIds = null;
|
|
|
214 |
if (warehousePositions.stream().filter(x -> EscalationType.L2.isGreaterThanEqualTo(x.getEscalationType())).count() > 0) {
|
|
|
215 |
authWarehouseIds = new ArrayList<>(ProfitMandiConstants.WAREHOUSE_MAP.keySet());
|
|
|
216 |
} else {
|
|
|
217 |
Set<CustomRetailer> positionRetailers = new HashSet<>();
|
|
|
218 |
csService.getPositionCustomRetailerMap(warehousePositions).values().forEach(customRetailers -> {
|
|
|
219 |
positionRetailers.addAll(customRetailers);
|
|
|
220 |
});
|
| 29222 |
tejbeer |
221 |
|
| 32933 |
amit.gupta |
222 |
LOGGER.info("positionRetailers" + positionRetailers);
|
|
|
223 |
List<Integer> fofoIds = new ArrayList<>();
|
|
|
224 |
if (!positionRetailers.isEmpty()) {
|
|
|
225 |
fofoIds.addAll(positionRetailers.stream().map(x -> x.getPartnerId()).collect(Collectors.toList()));
|
| 29222 |
tejbeer |
226 |
|
| 32933 |
amit.gupta |
227 |
authWarehouseIds = this.getWarehouses(positionRetailers).entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList());
|
| 29222 |
tejbeer |
228 |
|
| 32933 |
amit.gupta |
229 |
}
|
| 32050 |
tejbeer |
230 |
}
|
| 29222 |
tejbeer |
231 |
|
| 32050 |
tejbeer |
232 |
Map<String, DispatchNotificationModel> dispatchNotication = new HashMap<>();
|
| 29222 |
tejbeer |
233 |
|
| 32763 |
amit.gupta |
234 |
if (!billedOrderListModels.isEmpty()) {
|
| 32050 |
tejbeer |
235 |
List<Order> ords = orderRepository.selectByInvoiceNumbers(
|
| 32763 |
amit.gupta |
236 |
billedOrderListModels.stream().map(x -> x.getInvoiceNumber()).collect(Collectors.toList()));
|
| 29222 |
tejbeer |
237 |
|
| 32050 |
tejbeer |
238 |
List<Integer> shippingWarehouseIds = ords.stream().map(x -> x.getWarehouseId()).collect(Collectors.toList());
|
| 29222 |
tejbeer |
239 |
|
| 32933 |
amit.gupta |
240 |
if (!authWarehouseIds.containsAll(shippingWarehouseIds)) {
|
| 32050 |
tejbeer |
241 |
throw new ProfitMandiBusinessException("Uploaded File", "", "Partners are not belong to the same warehouse");
|
| 29222 |
tejbeer |
242 |
|
| 32050 |
tejbeer |
243 |
}
|
| 29222 |
tejbeer |
244 |
|
| 32790 |
amit.gupta |
245 |
Map<String, Integer> invoiceRetailerMap = ords.stream().collect(Collectors.toMap(
|
| 32933 |
amit.gupta |
246 |
x -> x.getInvoiceNumber(), x -> x.getRetailerId(), (u, v) -> u));
|
| 29222 |
tejbeer |
247 |
|
| 32790 |
amit.gupta |
248 |
LOGGER.info("invoicefofoIdmap" + invoiceRetailerMap);
|
| 29292 |
tejbeer |
249 |
|
| 32763 |
amit.gupta |
250 |
Map<String, Set<String>> airbillInvoiceNumberMap = billedOrderListModels.stream().collect(Collectors.groupingBy(x -> x.getAirwayBillNumber(), Collectors.mapping(BilledOrderListModel::getInvoiceNumber, Collectors.toSet())));
|
| 29222 |
tejbeer |
251 |
|
| 32050 |
tejbeer |
252 |
LOGGER.info("airbillInvoiceNumberMap" + airbillInvoiceNumberMap);
|
| 29292 |
tejbeer |
253 |
|
| 32790 |
amit.gupta |
254 |
for (Entry<String, Set<String>> airbillInvoiceNumberEntry : airbillInvoiceNumberMap.entrySet()) {
|
|
|
255 |
Set<String> invoiceNumbers = airbillInvoiceNumberEntry.getValue();
|
|
|
256 |
Set<Integer> wayBillRetailerSet = new HashSet<>();
|
|
|
257 |
for (String invoiceNumber : invoiceNumbers) {
|
|
|
258 |
if (invoiceRetailerMap.get(invoiceNumber) != null) {
|
|
|
259 |
wayBillRetailerSet.add(invoiceRetailerMap.get(invoiceNumber));
|
| 32050 |
tejbeer |
260 |
}
|
|
|
261 |
}
|
| 32790 |
amit.gupta |
262 |
LOGGER.info("wayBillRetailerSet - {}" + wayBillRetailerSet);
|
| 29222 |
tejbeer |
263 |
|
| 32790 |
amit.gupta |
264 |
if (wayBillRetailerSet.size() > 1) {
|
|
|
265 |
throw new ProfitMandiBusinessException("Uploaded File", "", "Waybill " + airbillInvoiceNumberEntry.getKey() + " number cannot have invoices with different Retailers");
|
| 32050 |
tejbeer |
266 |
}
|
|
|
267 |
}
|
| 29222 |
tejbeer |
268 |
|
| 32790 |
amit.gupta |
269 |
Map<String, List<BilledOrderListModel>> blueDartAwbBilledOrderMap = billedOrderListModels.stream().filter(x -> x.getLogisticsProviderName().equals("BlueDart")).collect(Collectors.groupingBy(x -> x.getAirwayBillNumber(), Collectors.toList()));
|
| 31077 |
tejbeer |
270 |
|
| 32763 |
amit.gupta |
271 |
List<BilledOrderListModel> orderList = billedOrderListModels.stream().filter(x -> !x.getLogisticsProviderName().equals("BlueDart")).collect(Collectors.toList());
|
| 31077 |
tejbeer |
272 |
|
| 32790 |
amit.gupta |
273 |
|
|
|
274 |
if (!blueDartAwbBilledOrderMap.isEmpty()) {
|
| 32763 |
amit.gupta |
275 |
List<BilledOrderListModel> blueDartorderList = billedOrderListModels.stream().filter(x -> x.getLogisticsProviderName().equals("BlueDart")).collect(Collectors.toList());
|
| 32790 |
amit.gupta |
276 |
Provider provider = providerRepository.selectByName("BlueDart");
|
| 31077 |
tejbeer |
277 |
|
| 32050 |
tejbeer |
278 |
List<Integer> unserviceablePincode = new ArrayList<>();
|
| 31077 |
tejbeer |
279 |
|
| 32050 |
tejbeer |
280 |
for (BilledOrderListModel billedOrder : blueDartorderList) {
|
|
|
281 |
List<Order> orders = orderRepository.selectByInvoiceNumber(billedOrder.getInvoiceNumber());
|
|
|
282 |
for (Order order : orders) {
|
|
|
283 |
ProviderTat providerTat = providerTatRepository.selectByProviderId(provider.getId(), order.getWarehouseId(), order.getRetailerPinCode());
|
|
|
284 |
if (providerTat == null) {
|
|
|
285 |
unserviceablePincode.add(order.getId());
|
|
|
286 |
}
|
|
|
287 |
}
|
| 31077 |
tejbeer |
288 |
|
| 32050 |
tejbeer |
289 |
}
|
|
|
290 |
if (!unserviceablePincode.isEmpty()) {
|
|
|
291 |
throw new ProfitMandiBusinessException("Uploaded File", "", "Orders " + unserviceablePincode + " Unserviceable Pincode");
|
| 31077 |
tejbeer |
292 |
|
| 32050 |
tejbeer |
293 |
}
|
| 32790 |
amit.gupta |
294 |
//Use api to create fresh Waybills for BlueDart
|
|
|
295 |
List<BilledOrderListModel> blueDartOrders = bluedartService.getAirwayBillNo(blueDartAwbBilledOrderMap, authUser.getEmailId());
|
| 31077 |
tejbeer |
296 |
|
| 32050 |
tejbeer |
297 |
orderList.addAll(blueDartOrders);
|
|
|
298 |
}
|
| 32790 |
amit.gupta |
299 |
|
| 32784 |
raveendra. |
300 |
Map<String, BilledOrderListModel> uniqueCombinations = new HashMap<>();
|
|
|
301 |
for (BilledOrderListModel bl : orderList) {
|
| 32050 |
tejbeer |
302 |
List<Order> orders = orderRepository.selectByInvoiceNumber(bl.getInvoiceNumber());
|
|
|
303 |
Provider provider = providerRepository.selectByName(bl.getLogisticsProviderName());
|
| 29222 |
tejbeer |
304 |
|
| 32050 |
tejbeer |
305 |
if (provider == null) {
|
|
|
306 |
throw new ProfitMandiBusinessException("Uploaded File", "", "Provider is not Available");
|
|
|
307 |
}
|
|
|
308 |
if (!orders.isEmpty()) {
|
| 32609 |
raveendra. |
309 |
dispatchNotication = logisticsService.markedOrderShippedDetail(orders, provider, dispatchNotication, bl.getAirwayBillNumber(), bl.getShippingDate());
|
| 29222 |
tejbeer |
310 |
|
| 32050 |
tejbeer |
311 |
} else {
|
|
|
312 |
throw new ProfitMandiBusinessException("Uploaded File", "", "No Order Found");
|
|
|
313 |
}
|
| 29222 |
tejbeer |
314 |
|
| 32050 |
tejbeer |
315 |
LOGGER.info("dispatchNotication" + dispatchNotication);
|
|
|
316 |
}
|
| 29222 |
tejbeer |
317 |
|
| 32050 |
tejbeer |
318 |
if (!dispatchNotication.isEmpty()) {
|
| 29222 |
tejbeer |
319 |
|
| 32050 |
tejbeer |
320 |
for (Entry<String, DispatchNotificationModel> dn : dispatchNotication.entrySet()) {
|
| 32883 |
amit.gupta |
321 |
DispatchNotificationModel dispatchNotificationModel = dn.getValue();
|
|
|
322 |
//Send message only if shipping date is within T+1 of upload date
|
| 32933 |
amit.gupta |
323 |
if (dispatchNotificationModel.getShippingDate().isAfter(LocalDate.now().minusDays(2))) {
|
| 32883 |
amit.gupta |
324 |
Provider pr = providerRepository.selectById(dispatchNotificationModel.getProviderId());
|
| 29222 |
tejbeer |
325 |
|
| 32883 |
amit.gupta |
326 |
String title = "Order Shipped";
|
| 29222 |
tejbeer |
327 |
|
| 32883 |
amit.gupta |
328 |
com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(dn.getValue().getFofoId());
|
| 30989 |
tejbeer |
329 |
|
|
|
330 |
|
| 32883 |
amit.gupta |
331 |
Set<String> invoiceNumber = new HashSet<>();
|
|
|
332 |
invoiceNumber.addAll(dn.getValue().getInvoiceNumber());
|
| 30989 |
tejbeer |
333 |
|
| 32883 |
amit.gupta |
334 |
String message = String.format("Dear partner, your items with Invoice Number " + String.join(",", invoiceNumber) + " worth Rs." + dn.getValue().getTotalAmount() + " and qty " + dn.getValue().getTotalQty() + " has been shipped through " + pr.getName() + " via your track id " + dn.getKey() + " and expected to be delivered by " + dn.getValue().getDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + ".");
|
| 30989 |
tejbeer |
335 |
|
| 32883 |
amit.gupta |
336 |
SendNotificationModel sendNotificationModel = new SendNotificationModel();
|
|
|
337 |
sendNotificationModel.setCampaignName("Order Shipped");
|
|
|
338 |
sendNotificationModel.setTitle(title);
|
|
|
339 |
sendNotificationModel.setMessage(message);
|
|
|
340 |
sendNotificationModel.setType("url");
|
|
|
341 |
sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/notifications");
|
|
|
342 |
sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(1));
|
|
|
343 |
sendNotificationModel.setMessageType(MessageType.notification);
|
|
|
344 |
int userId = userAccountRepository.selectUserIdByRetailerId(dn.getValue().getFofoId());
|
|
|
345 |
sendNotificationModel.setUserIds(Arrays.asList(userId));
|
|
|
346 |
notificationService.sendNotification(sendNotificationModel);
|
|
|
347 |
}
|
| 32050 |
tejbeer |
348 |
}
|
| 29222 |
tejbeer |
349 |
|
| 32050 |
tejbeer |
350 |
}
|
|
|
351 |
}
|
| 29222 |
tejbeer |
352 |
|
| 32050 |
tejbeer |
353 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
|
|
354 |
return "response";
|
| 29222 |
tejbeer |
355 |
|
| 32050 |
tejbeer |
356 |
}
|
| 29222 |
tejbeer |
357 |
|
| 32050 |
tejbeer |
358 |
private BilledOrderListModel createBilleOrder(CSVRecord record) {
|
|
|
359 |
BilledOrderListModel bol = new BilledOrderListModel();
|
|
|
360 |
bol.setInvoiceNumber(record.get(0));
|
|
|
361 |
bol.setLogisticsProviderName(record.get(1));
|
|
|
362 |
bol.setAirwayBillNumber(record.get(2));
|
|
|
363 |
bol.setWeight(Double.valueOf(record.get(3)));
|
| 32609 |
raveendra. |
364 |
bol.setShippingDate(LocalDateTime.parse(record.get(4), FormattingUtils.dateTimeFormatter));
|
| 32603 |
raveendra. |
365 |
// bol.setShippingDate(String.valueOf(LocalDateTime.parse(record.get(4), FormattingUtils.yyMMDDTimeFormatter)));
|
|
|
366 |
//rkb
|
| 29222 |
tejbeer |
367 |
|
| 32603 |
raveendra. |
368 |
//bol.setShipping_Date(record.get(formattingUtils.formatDateTime(ofpat)));
|
|
|
369 |
//bol.setShipping_Date(record.get(FormattingUtils.formatDateTime(yyyy-MM-dd HH:mm));
|
|
|
370 |
// bol.setDate(record.get(4));
|
|
|
371 |
//bol.setDate(DateTimeFormatter);
|
|
|
372 |
// bol.simpleDateFormat(dateTimeFormat);
|
|
|
373 |
|
| 32050 |
tejbeer |
374 |
return bol;
|
|
|
375 |
}
|
| 29222 |
tejbeer |
376 |
|
| 32050 |
tejbeer |
377 |
@RequestMapping(value = "/provider", method = RequestMethod.GET)
|
|
|
378 |
public String provider(HttpServletRequest request, Model model) throws Exception {
|
|
|
379 |
List<Provider> providers = providerRepository.selectAll();
|
|
|
380 |
List<Integer> providerIds = providers.stream().map(x -> x.getId()).collect(Collectors.toList());
|
|
|
381 |
Map<Integer, ProviderDetails> providerDetails = providerDetailsRepository.selectByProviderIds(providerIds, DeliveryType.PREPAID, true).stream().collect(Collectors.toMap(x -> x.getProviderId(), x -> x));
|
|
|
382 |
model.addAttribute("providers", providers);
|
|
|
383 |
model.addAttribute("providerDetails", providerDetails);
|
| 29222 |
tejbeer |
384 |
|
| 32050 |
tejbeer |
385 |
model.addAttribute("deliveryTypes", DeliveryType.values());
|
| 29222 |
tejbeer |
386 |
|
| 32050 |
tejbeer |
387 |
return "provider";
|
| 29222 |
tejbeer |
388 |
|
| 32050 |
tejbeer |
389 |
}
|
| 29222 |
tejbeer |
390 |
|
| 32050 |
tejbeer |
391 |
@RequestMapping(value = "/createProvider", method = RequestMethod.POST)
|
|
|
392 |
public String createProvider(HttpServletRequest request, @RequestBody ProviderDetailModel providerDetailModel, Model model) throws Exception {
|
| 29222 |
tejbeer |
393 |
|
| 32050 |
tejbeer |
394 |
Provider provider = new Provider();
|
|
|
395 |
provider.setName(providerDetailModel.getName());
|
|
|
396 |
provider.setActive(providerDetailModel.isProvideractive());
|
|
|
397 |
provider.setBundleWeightLimit(0);
|
|
|
398 |
provider.setGroupShipmentAllowed(true);
|
|
|
399 |
provider.setPickupType(PickUpType.COURIER);
|
|
|
400 |
provider.setMaxCODLimit(0);
|
| 29222 |
tejbeer |
401 |
|
| 32050 |
tejbeer |
402 |
providerRepository.persist(provider);
|
| 29222 |
tejbeer |
403 |
|
| 32050 |
tejbeer |
404 |
ProviderDetails pd = new ProviderDetails();
|
|
|
405 |
pd.setAccountNo(providerDetailModel.getAccountNo());
|
|
|
406 |
pd.setEmail(providerDetailModel.getEmail());
|
|
|
407 |
pd.setPhone(providerDetailModel.getMobile());
|
|
|
408 |
pd.setProviderId(provider.getId());
|
|
|
409 |
pd.setActive(true);
|
|
|
410 |
pd.setType(DeliveryType.PREPAID);
|
|
|
411 |
providerDetailsRepository.persist(pd);
|
|
|
412 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
| 29222 |
tejbeer |
413 |
|
| 32050 |
tejbeer |
414 |
return "response";
|
| 29222 |
tejbeer |
415 |
|
| 32050 |
tejbeer |
416 |
}
|
| 29222 |
tejbeer |
417 |
|
| 32050 |
tejbeer |
418 |
@RequestMapping(value = "/providerTat", method = RequestMethod.GET)
|
|
|
419 |
public String providerTat(HttpServletRequest request, Model model) throws Exception {
|
| 29222 |
tejbeer |
420 |
|
| 32050 |
tejbeer |
421 |
List<Provider> providers = providerRepository.selectAll();
|
|
|
422 |
model.addAttribute("providers", providers);
|
|
|
423 |
return "provider-tat";
|
| 29222 |
tejbeer |
424 |
|
| 32050 |
tejbeer |
425 |
}
|
| 29222 |
tejbeer |
426 |
|
| 32050 |
tejbeer |
427 |
@RequestMapping(value = "/getProviderTat", method = RequestMethod.GET)
|
|
|
428 |
public String getProviderTat(HttpServletRequest request, @RequestParam int providerId, Model model) throws Exception {
|
|
|
429 |
List<ProviderTat> providerTat = providerTatRepository.selectByProviderId(providerId);
|
|
|
430 |
Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
|
| 29222 |
tejbeer |
431 |
|
| 32050 |
tejbeer |
432 |
providerTat = providerTat.stream().filter(x -> warehouseMap.containsKey(x.getWarehouseLocation())).collect(Collectors.toList());
|
| 29222 |
tejbeer |
433 |
|
| 32050 |
tejbeer |
434 |
Map<Integer, Provider> providerIdMap = new HashMap<>();
|
|
|
435 |
Provider provider = providerRepository.selectById(providerId);
|
|
|
436 |
providerIdMap.put(provider.getId(), provider);
|
| 29222 |
tejbeer |
437 |
|
| 32050 |
tejbeer |
438 |
LOGGER.info("providerTat" + providerTat);
|
|
|
439 |
model.addAttribute("providerTat", providerTat);
|
|
|
440 |
model.addAttribute("warehouseMap", warehouseMap);
|
|
|
441 |
model.addAttribute("providerIdMap", providerIdMap);
|
| 29222 |
tejbeer |
442 |
|
| 32050 |
tejbeer |
443 |
return "provider-tat-detail";
|
| 29222 |
tejbeer |
444 |
|
| 32050 |
tejbeer |
445 |
}
|
| 29222 |
tejbeer |
446 |
|
| 32050 |
tejbeer |
447 |
@RequestMapping(value = "/providerTatFileUploader", method = RequestMethod.POST)
|
|
|
448 |
public String providerTatFileUploader(HttpServletRequest request, Model model, HttpServletResponse response, @RequestPart MultipartFile file) throws Throwable {
|
| 29222 |
tejbeer |
449 |
|
| 32050 |
tejbeer |
450 |
LOGGER.info("file" + file.toString());
|
|
|
451 |
String fileName = file.getName();
|
| 29222 |
tejbeer |
452 |
|
| 32050 |
tejbeer |
453 |
String fileNames = file.getOriginalFilename();
|
| 29222 |
tejbeer |
454 |
|
| 32050 |
tejbeer |
455 |
LOGGER.info("fileName" + fileName);
|
|
|
456 |
LOGGER.info("fileNames" + fileNames);
|
|
|
457 |
List<CSVRecord> records = FileUtil.readFile(file);
|
| 29250 |
tejbeer |
458 |
|
| 32050 |
tejbeer |
459 |
List<ProviderTatModel> providerTatList = new ArrayList<>();
|
|
|
460 |
for (CSVRecord record : records) {
|
|
|
461 |
ProviderTatModel sgr = createProviderTat(record);
|
|
|
462 |
providerTatList.add(sgr);
|
| 29250 |
tejbeer |
463 |
|
| 32050 |
tejbeer |
464 |
}
|
|
|
465 |
if (!providerTatList.isEmpty()) {
|
| 29222 |
tejbeer |
466 |
|
| 32050 |
tejbeer |
467 |
for (ProviderTatModel pt : providerTatList) {
|
| 29222 |
tejbeer |
468 |
|
| 32050 |
tejbeer |
469 |
Provider provider = providerRepository.selectByName(pt.getProviderName());
|
| 29222 |
tejbeer |
470 |
|
| 32050 |
tejbeer |
471 |
if (provider == null) {
|
|
|
472 |
throw new ProfitMandiBusinessException("Uploaded File", "", "Provider is not Available");
|
|
|
473 |
}
|
| 29222 |
tejbeer |
474 |
|
| 32050 |
tejbeer |
475 |
Map<String, Integer> warehouseMap = ProfitMandiConstants.WAREHOUSE_NAME_MAP;
|
|
|
476 |
ProviderTat providerTat = providerTatRepository.selectByProviderId(provider.getId(), warehouseMap.get(pt.getWarehouseName()), pt.getPincode());
|
| 29222 |
tejbeer |
477 |
|
| 32050 |
tejbeer |
478 |
LOGGER.info("providerTat" + providerTat);
|
|
|
479 |
if (providerTat == null) {
|
|
|
480 |
LOGGER.info("providerTat" + providerTat);
|
|
|
481 |
providerTat = new ProviderTat();
|
|
|
482 |
providerTat.setDestinationPin(pt.getPincode());
|
|
|
483 |
providerTat.setProviderId(provider.getId());
|
|
|
484 |
providerTat.setWarehouseLocation(warehouseMap.get(pt.getWarehouseName()));
|
|
|
485 |
providerTat.setDeliveryTime(pt.getTat());
|
|
|
486 |
providerTatRepository.persist(providerTat);
|
|
|
487 |
} else {
|
|
|
488 |
LOGGER.info("providerTat else" + providerTat);
|
|
|
489 |
providerTat.setDeliveryTime(pt.getTat());
|
|
|
490 |
}
|
| 29222 |
tejbeer |
491 |
|
| 32050 |
tejbeer |
492 |
}
|
|
|
493 |
}
|
|
|
494 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
|
|
495 |
return "response";
|
| 29222 |
tejbeer |
496 |
|
| 32050 |
tejbeer |
497 |
}
|
| 29222 |
tejbeer |
498 |
|
| 32050 |
tejbeer |
499 |
private ProviderTatModel createProviderTat(CSVRecord record) {
|
|
|
500 |
ProviderTatModel ptm = new ProviderTatModel();
|
|
|
501 |
ptm.setProviderName(record.get(0));
|
|
|
502 |
ptm.setWarehouseName(record.get(1));
|
|
|
503 |
ptm.setPincode(record.get(2));
|
|
|
504 |
ptm.setTat(Integer.parseInt(record.get(3)));
|
| 29222 |
tejbeer |
505 |
|
| 32050 |
tejbeer |
506 |
return ptm;
|
|
|
507 |
}
|
| 29222 |
tejbeer |
508 |
|
| 32050 |
tejbeer |
509 |
@RequestMapping(value = "/publicProviderHolidays", method = RequestMethod.GET)
|
|
|
510 |
public String publicProviderHolidays(HttpServletRequest request, Model model) throws Exception {
|
| 29222 |
tejbeer |
511 |
|
| 32050 |
tejbeer |
512 |
List<PublicHolidays> publicHolidays = publicHolidaysRepository.selectAllByDate(LocalDate.of(LocalDate.now().getYear(), 1, 1));
|
| 29222 |
tejbeer |
513 |
|
| 32050 |
tejbeer |
514 |
model.addAttribute("publicHolidays", publicHolidays);
|
|
|
515 |
return "public-provider-holiday";
|
| 29222 |
tejbeer |
516 |
|
| 32050 |
tejbeer |
517 |
}
|
| 29222 |
tejbeer |
518 |
|
| 32050 |
tejbeer |
519 |
@RequestMapping(value = "/createPublicHoliday", method = RequestMethod.POST)
|
|
|
520 |
public String createPublicHoliday(HttpServletRequest request, @RequestParam LocalDate date, @RequestParam String occassion, Model model) throws Exception {
|
| 29222 |
tejbeer |
521 |
|
| 32050 |
tejbeer |
522 |
PublicHolidays ph = new PublicHolidays();
|
|
|
523 |
ph.setDate(date);
|
|
|
524 |
ph.setHolidayDate(LocalDate.now().atStartOfDay());
|
|
|
525 |
ph.setOccasion(occassion);
|
|
|
526 |
publicHolidaysRepository.persist(ph);
|
| 29222 |
tejbeer |
527 |
|
| 32050 |
tejbeer |
528 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
|
|
529 |
return "response";
|
|
|
530 |
}
|
| 29222 |
tejbeer |
531 |
|
| 32050 |
tejbeer |
532 |
@RequestMapping(value = "/downloadUploadShippingTemplate", method = RequestMethod.GET)
|
|
|
533 |
public ResponseEntity<?> downloadUploadShippingTemplate(HttpServletRequest request, @RequestParam int warehouseId) throws Exception {
|
| 29222 |
tejbeer |
534 |
|
| 32050 |
tejbeer |
535 |
List<List<?>> rows = new ArrayList<>();
|
| 29222 |
tejbeer |
536 |
|
| 32050 |
tejbeer |
537 |
List<Order> orders = orderRepository.selectAllByWarehouseAndStatus(warehouseId, OrderStatus.BILLED);
|
| 29222 |
tejbeer |
538 |
|
| 32050 |
tejbeer |
539 |
if (orders.isEmpty()) {
|
|
|
540 |
throw new ProfitMandiBusinessException("Template File", "", "No order has been billed");
|
| 29222 |
tejbeer |
541 |
|
| 32050 |
tejbeer |
542 |
}
|
|
|
543 |
Set<String> invoiceNumbers = orders.stream().map(x -> x.getInvoiceNumber()).collect(Collectors.toSet());
|
| 29222 |
tejbeer |
544 |
|
| 32050 |
tejbeer |
545 |
for (String invoiceNumber : invoiceNumbers) {
|
|
|
546 |
rows.add(Arrays.asList(invoiceNumber));
|
| 29222 |
tejbeer |
547 |
|
| 32050 |
tejbeer |
548 |
}
|
| 32603 |
raveendra. |
549 |
//rkb
|
|
|
550 |
org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("Invoice Number", "Provider", "AWB", "Weight(Kg)", "Shipping Date(dd-MM-yyyy HH:mm:ss)"), rows);
|
| 29222 |
tejbeer |
551 |
|
| 32050 |
tejbeer |
552 |
final HttpHeaders headers = new HttpHeaders();
|
|
|
553 |
headers.set("Content-Type", "text/csv");
|
|
|
554 |
headers.set("Content-disposition", "inline; filename=upload-shipping-template.csv");
|
|
|
555 |
headers.setContentLength(baos.toByteArray().length);
|
| 29222 |
tejbeer |
556 |
|
| 32050 |
tejbeer |
557 |
final InputStream inputStream = new ByteArrayInputStream(baos.toByteArray());
|
|
|
558 |
final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
|
|
|
559 |
return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
|
| 29222 |
tejbeer |
560 |
|
| 32050 |
tejbeer |
561 |
}
|
| 29222 |
tejbeer |
562 |
|
| 32050 |
tejbeer |
563 |
private Map<Integer, String> getWarehouses(Set<CustomRetailer> positionRetailers) {
|
|
|
564 |
Map<Integer, String> warehouses = new HashMap<>();
|
|
|
565 |
positionRetailers.stream().forEach(x -> {
|
|
|
566 |
if (x.getWarehouseId() != 0) {
|
|
|
567 |
warehouses.put(x.getWarehouseId(), ProfitMandiConstants.WAREHOUSE_MAP.get(x.getWarehouseId()));
|
|
|
568 |
}
|
|
|
569 |
});
|
|
|
570 |
return warehouses;
|
| 29222 |
tejbeer |
571 |
|
| 32050 |
tejbeer |
572 |
}
|
| 29222 |
tejbeer |
573 |
|
| 32050 |
tejbeer |
574 |
@RequestMapping(value = "/downloadProviderTatTemplate", method = RequestMethod.GET)
|
|
|
575 |
public ResponseEntity<?> downloadProviderTatTemplate(HttpServletRequest request) throws Exception {
|
|
|
576 |
List<List<?>> rows = new ArrayList<>();
|
|
|
577 |
Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
|
|
|
578 |
for (Entry<Integer, String> warehouse : warehouseMap.entrySet()) {
|
|
|
579 |
rows.add(Arrays.asList("Delhivery", warehouse.getValue(), "110018", "-"));
|
|
|
580 |
}
|
|
|
581 |
org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(
|
|
|
582 |
Arrays.asList("Provider Name", "Source Warehouse", "Destination Pincode", "TAT in days"), rows);
|
| 29222 |
tejbeer |
583 |
|
| 32050 |
tejbeer |
584 |
final HttpHeaders headers = new HttpHeaders();
|
|
|
585 |
headers.set("Content-Type", "text/csv");
|
|
|
586 |
headers.set("Content-disposition", "inline; filename=provider-tat-template.csv");
|
|
|
587 |
headers.setContentLength(baos.toByteArray().length);
|
| 29222 |
tejbeer |
588 |
|
| 32050 |
tejbeer |
589 |
final InputStream inputStream = new ByteArrayInputStream(baos.toByteArray());
|
|
|
590 |
final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
|
|
|
591 |
return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
|
| 29222 |
tejbeer |
592 |
|
| 32050 |
tejbeer |
593 |
}
|
| 29222 |
tejbeer |
594 |
|
| 32050 |
tejbeer |
595 |
@RequestMapping(value = "/downloadDelayDayTemplate", method = RequestMethod.GET)
|
|
|
596 |
public ResponseEntity<?> downloadDelayDayTemplate(HttpServletRequest request) throws Exception {
|
|
|
597 |
List<List<?>> rows = new ArrayList<>();
|
|
|
598 |
rows.add(Arrays.asList("-", "-", "Vehicle Delay"));
|
|
|
599 |
rows.add(Arrays.asList("-", "-", "Vehicle Breakdown"));
|
| 29250 |
tejbeer |
600 |
|
| 32050 |
tejbeer |
601 |
org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("AirwayBillNumber", "Delay Day", "Reason"), rows);
|
| 29250 |
tejbeer |
602 |
|
| 32050 |
tejbeer |
603 |
final HttpHeaders headers = new HttpHeaders();
|
|
|
604 |
headers.set("Content-Type", "text/csv");
|
|
|
605 |
headers.set("Content-disposition", "inline; filename=delay-day-template.csv");
|
|
|
606 |
headers.setContentLength(baos.toByteArray().length);
|
| 29250 |
tejbeer |
607 |
|
| 32050 |
tejbeer |
608 |
final InputStream inputStream = new ByteArrayInputStream(baos.toByteArray());
|
|
|
609 |
final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
|
|
|
610 |
return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
|
| 29250 |
tejbeer |
611 |
|
| 32050 |
tejbeer |
612 |
}
|
| 29250 |
tejbeer |
613 |
|
| 32050 |
tejbeer |
614 |
@RequestMapping(value = "/delayDayFileUpload", method = RequestMethod.POST)
|
|
|
615 |
public String delayDayFileUpload(HttpServletRequest request, Model model, HttpServletResponse response, @RequestPart MultipartFile file) throws Throwable {
|
| 29250 |
tejbeer |
616 |
|
| 32050 |
tejbeer |
617 |
List<CSVRecord> records = FileUtil.readFile(file);
|
| 29250 |
tejbeer |
618 |
|
| 32050 |
tejbeer |
619 |
List<DelayDayModel> delayDayList = new ArrayList<>();
|
|
|
620 |
for (CSVRecord record : records) {
|
|
|
621 |
DelayDayModel ddm = createDelayDay(record);
|
|
|
622 |
delayDayList.add(ddm);
|
| 29250 |
tejbeer |
623 |
|
| 32050 |
tejbeer |
624 |
}
|
| 29250 |
tejbeer |
625 |
|
| 32050 |
tejbeer |
626 |
if (!delayDayList.isEmpty()) {
|
| 29250 |
tejbeer |
627 |
|
| 32050 |
tejbeer |
628 |
List<Order> vorders = orderRepository.selectByAirwayBillNumber(
|
|
|
629 |
delayDayList.stream().map(x -> x.getAirwayBIllNumber()).collect(Collectors.toList()));
|
| 29250 |
tejbeer |
630 |
|
| 32050 |
tejbeer |
631 |
List<Order> filteredorders = vorders.stream().filter(x -> x.getStatus() != (OrderStatus.SHIPPED_FROM_WH)).collect(Collectors.toList());
|
| 29250 |
tejbeer |
632 |
|
| 32050 |
tejbeer |
633 |
if (!filteredorders.isEmpty()) {
|
|
|
634 |
throw new ProfitMandiBusinessException("Upload File", String.join(",", filteredorders.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList())), "Order status should be shipped from warehouse");
|
| 29250 |
tejbeer |
635 |
|
| 32050 |
tejbeer |
636 |
}
|
| 29250 |
tejbeer |
637 |
|
| 32050 |
tejbeer |
638 |
Map<String, List<Order>> airwayBillOrderMap = vorders.stream().collect(Collectors.groupingBy(Order::getAirwayBillNumber));
|
| 29250 |
tejbeer |
639 |
|
| 32050 |
tejbeer |
640 |
for (DelayDayModel ddm : delayDayList) {
|
|
|
641 |
List<Order> orders = airwayBillOrderMap.get(ddm.getAirwayBIllNumber());
|
| 29250 |
tejbeer |
642 |
|
| 32050 |
tejbeer |
643 |
if (!orders.isEmpty()) {
|
| 29250 |
tejbeer |
644 |
|
| 32050 |
tejbeer |
645 |
Double totalAmount = orders.stream().mapToDouble(x -> x.getTotalAmount()).sum();
|
| 29250 |
tejbeer |
646 |
|
| 32050 |
tejbeer |
647 |
List<String> invoiceNumbers = orders.stream().map(x -> x.getInvoiceNumber()).collect(Collectors.toList());
|
| 29250 |
tejbeer |
648 |
|
| 32050 |
tejbeer |
649 |
int totalQty = orders.stream().mapToInt(x -> x.getLineItem().getQuantity()).sum();
|
| 29250 |
tejbeer |
650 |
|
| 32050 |
tejbeer |
651 |
Order order = orders.get(0);
|
|
|
652 |
ProviderTat pt = providerTatRepository.selectByProviderId(order.getLogisticsProviderId(), order.getWarehouseId(), order.getRetailerPinCode());
|
| 29250 |
tejbeer |
653 |
|
| 32050 |
tejbeer |
654 |
LocalDate deliveryDate = logisticsService.calculateDeliveryTimeline(
|
|
|
655 |
order.getShippingTimestamp().toLocalDate(), pt, ddm.getDelayDay());
|
| 29250 |
tejbeer |
656 |
|
| 32050 |
tejbeer |
657 |
orders.forEach(x -> x.setExpectedDeliveryTime(deliveryDate.atStartOfDay()));
|
| 30989 |
tejbeer |
658 |
|
| 32050 |
tejbeer |
659 |
String title = "Order Update";
|
|
|
660 |
String message = String.format("Dear partner, your items with Invoice Number " + String.join(",", invoiceNumbers) + " worth Rs." + totalAmount + " and qty " + totalQty + " has been shipped through " + providerRepository.selectById(order.getLogisticsProviderId()).getName() + " via your track id " + ddm.getAirwayBIllNumber() + " has been delayed due to " + ddm.getReason() + " and will be delivered by " + deliveryDate.format(DateTimeFormatter.ofPattern("dd-MM-yyyy"))) + ".";
|
| 30989 |
tejbeer |
661 |
|
| 32050 |
tejbeer |
662 |
com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(order.getRetailerId());
|
| 30989 |
tejbeer |
663 |
|
| 32050 |
tejbeer |
664 |
Address address = addressRepository.selectById(user.getAddressId());
|
| 30989 |
tejbeer |
665 |
|
| 32050 |
tejbeer |
666 |
SendNotificationModel sendNotificationModel = new SendNotificationModel();
|
|
|
667 |
sendNotificationModel.setCampaignName("Order Update");
|
|
|
668 |
sendNotificationModel.setTitle(title);
|
|
|
669 |
sendNotificationModel.setMessage(message);
|
|
|
670 |
sendNotificationModel.setType("url");
|
|
|
671 |
sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/notifications");
|
|
|
672 |
sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(1));
|
|
|
673 |
sendNotificationModel.setMessageType(MessageType.notification);
|
|
|
674 |
int userId = userAccountRepository.selectUserIdByRetailerId(order.getRetailerId());
|
|
|
675 |
sendNotificationModel.setUserIds(Arrays.asList(userId));
|
|
|
676 |
notificationService.sendNotification(sendNotificationModel);
|
| 32777 |
amit.gupta |
677 |
//TODO-Whatsapp
|
|
|
678 |
//notificationService.sendWhatsappMessage(message, title, address.getPhoneNumber());
|
| 32050 |
tejbeer |
679 |
} else {
|
|
|
680 |
throw new ProfitMandiBusinessException("Upload File", "", "No order available for " + ddm.getAirwayBIllNumber() + " airwaybill Number");
|
| 29250 |
tejbeer |
681 |
|
| 32050 |
tejbeer |
682 |
}
|
|
|
683 |
}
|
|
|
684 |
}
|
|
|
685 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
|
|
686 |
return "response";
|
| 29250 |
tejbeer |
687 |
|
| 32050 |
tejbeer |
688 |
}
|
| 29250 |
tejbeer |
689 |
|
| 32050 |
tejbeer |
690 |
private DelayDayModel createDelayDay(CSVRecord record) {
|
|
|
691 |
DelayDayModel ddm = new DelayDayModel();
|
|
|
692 |
ddm.setAirwayBIllNumber(record.get(0));
|
|
|
693 |
ddm.setDelayDay(Integer.parseInt(record.get(1)));
|
|
|
694 |
ddm.setReason(record.get(2));
|
|
|
695 |
return ddm;
|
|
|
696 |
}
|
| 29250 |
tejbeer |
697 |
|
| 32050 |
tejbeer |
698 |
@RequestMapping(value = "/downloadMarkDeliveredTemplate", method = RequestMethod.GET)
|
|
|
699 |
public ResponseEntity<?> downloadMarkDeliveredTemplate(HttpServletRequest request) throws Exception {
|
|
|
700 |
List<List<?>> rows = new ArrayList<>();
|
| 29250 |
tejbeer |
701 |
|
| 32050 |
tejbeer |
702 |
org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("AirwayBillNumber", "Delivered On", "Delivered By"), rows);
|
| 29250 |
tejbeer |
703 |
|
| 32050 |
tejbeer |
704 |
final HttpHeaders headers = new HttpHeaders();
|
|
|
705 |
headers.set("Content-Type", "text/csv");
|
|
|
706 |
headers.set("Content-disposition", "inline; filename=mark-delivered-template.csv");
|
|
|
707 |
headers.setContentLength(baos.toByteArray().length);
|
| 29250 |
tejbeer |
708 |
|
| 32050 |
tejbeer |
709 |
final InputStream inputStream = new ByteArrayInputStream(baos.toByteArray());
|
|
|
710 |
final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
|
|
|
711 |
return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
|
| 29250 |
tejbeer |
712 |
|
| 32050 |
tejbeer |
713 |
}
|
| 29250 |
tejbeer |
714 |
|
| 32050 |
tejbeer |
715 |
@RequestMapping(value = "/markDeliveredFileUpload", method = RequestMethod.POST)
|
|
|
716 |
public String markDeliveredFileUpload(HttpServletRequest request, Model model, HttpServletResponse response, @RequestPart MultipartFile file) throws Throwable {
|
| 29250 |
tejbeer |
717 |
|
| 32050 |
tejbeer |
718 |
List<CSVRecord> records = FileUtil.readFile(file);
|
| 29250 |
tejbeer |
719 |
|
| 32050 |
tejbeer |
720 |
List<MarkDeliveredModel> deliveredList = new ArrayList<>();
|
|
|
721 |
for (CSVRecord record : records) {
|
|
|
722 |
MarkDeliveredModel ddm = createMarkDeliveredModel(record);
|
|
|
723 |
deliveredList.add(ddm);
|
| 29250 |
tejbeer |
724 |
|
| 32050 |
tejbeer |
725 |
}
|
| 29250 |
tejbeer |
726 |
|
| 33910 |
amit.gupta |
727 |
Map<Pair<String, String>, MarkDeliveredModel> markDeliveredModelMap = deliveredList.stream().collect(Collectors.toMap(x -> Pair.of(x.getAirwayBillNumber(), x.getDeliveredBy()), x -> x));
|
|
|
728 |
|
| 32050 |
tejbeer |
729 |
if (!deliveredList.isEmpty()) {
|
| 29250 |
tejbeer |
730 |
|
| 32050 |
tejbeer |
731 |
List<Order> vorders = orderRepository.selectByAirwayBillNumber(
|
|
|
732 |
deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));
|
| 29250 |
tejbeer |
733 |
|
| 32576 |
amit.gupta |
734 |
List<Order> filteredOrders = vorders.stream().filter(x -> (!x.getStatus().equals(OrderStatus.SHIPPED_FROM_WH))).collect(Collectors.toList());
|
| 29250 |
tejbeer |
735 |
|
| 32576 |
amit.gupta |
736 |
if (!filteredOrders.isEmpty()) {
|
| 33910 |
amit.gupta |
737 |
for (Order filteredOrder : filteredOrders) {
|
|
|
738 |
int logisticsProviderId = filteredOrder.getLogisticsProviderId();
|
|
|
739 |
Provider provider = providerRepository.selectById(logisticsProviderId);
|
|
|
740 |
if (markDeliveredModelMap.containsKey(Pair.of(filteredOrder.getAirwayBillNumber(), provider.getName()))) {
|
|
|
741 |
throw new ProfitMandiBusinessException("Upload File", String.join(",", filteredOrders.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList())), "Order status should be shipped from warehouse");
|
|
|
742 |
}
|
|
|
743 |
}
|
| 32050 |
tejbeer |
744 |
}
|
| 29250 |
tejbeer |
745 |
|
| 32050 |
tejbeer |
746 |
Map<String, List<Order>> airwayBillOrderMap = vorders.stream().collect(Collectors.groupingBy(Order::getAirwayBillNumber));
|
| 29250 |
tejbeer |
747 |
|
| 32050 |
tejbeer |
748 |
for (MarkDeliveredModel dl : deliveredList) {
|
| 29250 |
tejbeer |
749 |
|
| 32050 |
tejbeer |
750 |
List<Order> orders = airwayBillOrderMap.get(dl.getAirwayBillNumber());
|
|
|
751 |
if (orders != null) {
|
|
|
752 |
for (Order order : orders) {
|
|
|
753 |
order.setDeliveryTimestamp(dl.getDeliveredOn());
|
|
|
754 |
order.setStatus(OrderStatus.DELIVERY_SUCCESS);
|
|
|
755 |
order.setStatusDescription("Order Delivered");
|
| 29306 |
tejbeer |
756 |
|
| 32050 |
tejbeer |
757 |
}
|
| 29250 |
tejbeer |
758 |
|
| 32883 |
amit.gupta |
759 |
//Send notification only if the case is of T + 2 days
|
| 32933 |
amit.gupta |
760 |
if (orders.get(0).getDeliveryTimestamp().toLocalDate().isBefore(LocalDate.now().plusDays(2))) {
|
| 32883 |
amit.gupta |
761 |
String title = "Order Delivered";
|
| 30989 |
tejbeer |
762 |
|
| 32883 |
amit.gupta |
763 |
SendNotificationModel sendNotificationModel = new SendNotificationModel();
|
|
|
764 |
sendNotificationModel.setCampaignName("Order Delivered");
|
|
|
765 |
sendNotificationModel.setTitle(title);
|
| 33910 |
amit.gupta |
766 |
sendNotificationModel.setMessage(String.format("Dear partner, your SmartDukaan Shipment " + dl.getAirwayBillNumber() + " has been delivered on" + dl.getDeliveredOn().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + " to you in a safe, sealed bag by " + dl.getDeliveredBy() + "."));
|
| 32883 |
amit.gupta |
767 |
sendNotificationModel.setType("url");
|
|
|
768 |
sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/notifications");
|
|
|
769 |
sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(1));
|
|
|
770 |
sendNotificationModel.setMessageType(MessageType.notification);
|
|
|
771 |
int userId = userAccountRepository.selectUserIdByRetailerId(orders.get(0).getRetailerId());
|
|
|
772 |
sendNotificationModel.setUserIds(Arrays.asList(userId));
|
|
|
773 |
notificationService.sendNotification(sendNotificationModel);
|
|
|
774 |
}
|
| 30989 |
tejbeer |
775 |
|
| 32575 |
amit.gupta |
776 |
//String message = String.format("Dear partner, Your SmartDukaan Order " + dl.getAirwayBillNumber() + " has been delivered to you in a safe sealed bag.");
|
|
|
777 |
//notificationService.sendWhatsappMessage(message, title, address.getPhoneNumber());
|
| 30989 |
tejbeer |
778 |
|
| 32050 |
tejbeer |
779 |
} else {
|
|
|
780 |
throw new ProfitMandiBusinessException("Upload File", "", "No order available for " + dl.getAirwayBillNumber() + " airwaybill Number");
|
| 29250 |
tejbeer |
781 |
|
| 32050 |
tejbeer |
782 |
}
|
|
|
783 |
}
|
|
|
784 |
}
|
|
|
785 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
|
|
786 |
return "response";
|
| 29250 |
tejbeer |
787 |
|
| 32050 |
tejbeer |
788 |
}
|
| 29250 |
tejbeer |
789 |
|
| 32050 |
tejbeer |
790 |
private MarkDeliveredModel createMarkDeliveredModel(CSVRecord record) {
|
|
|
791 |
MarkDeliveredModel mdm = new MarkDeliveredModel();
|
|
|
792 |
mdm.setAirwayBillNumber(record.get(0));
|
|
|
793 |
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
|
|
|
794 |
LOGGER.info(record.get(1));
|
|
|
795 |
LocalDate dateTime = LocalDate.parse(record.get(1), formatter);
|
|
|
796 |
mdm.setDeliveredOn(dateTime.atStartOfDay());
|
|
|
797 |
mdm.setDeliveredBy(record.get(2));
|
|
|
798 |
return mdm;
|
|
|
799 |
}
|
| 29250 |
tejbeer |
800 |
|
| 32050 |
tejbeer |
801 |
@RequestMapping(value = "/delayBillingTemplate", method = RequestMethod.GET)
|
|
|
802 |
public ResponseEntity<?> delayBillingTemplate(HttpServletRequest request) throws Exception {
|
|
|
803 |
List<List<?>> rows = new ArrayList<>();
|
| 29342 |
tejbeer |
804 |
|
| 32050 |
tejbeer |
805 |
rows.add(Arrays.asList("-", "Shipment on hold, low invoice value, please ensure order value of minimum Rs. 40,000."));
|
| 29440 |
tejbeer |
806 |
|
| 32050 |
tejbeer |
807 |
rows.add(Arrays.asList("-", "Order Billed,Shipping will be done tomorrow."));
|
| 29440 |
tejbeer |
808 |
|
| 32050 |
tejbeer |
809 |
org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("Invoice Number", "Reason"), rows);
|
| 29346 |
tejbeer |
810 |
|
| 32050 |
tejbeer |
811 |
final HttpHeaders headers = new HttpHeaders();
|
|
|
812 |
headers.set("Content-Type", "text/csv");
|
|
|
813 |
headers.set("Content-disposition", "inline; filename=delay-billing-template.csv");
|
|
|
814 |
headers.setContentLength(baos.toByteArray().length);
|
| 29346 |
tejbeer |
815 |
|
| 32050 |
tejbeer |
816 |
final InputStream inputStream = new ByteArrayInputStream(baos.toByteArray());
|
|
|
817 |
final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
|
|
|
818 |
return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
|
| 29346 |
tejbeer |
819 |
|
| 32050 |
tejbeer |
820 |
}
|
| 29346 |
tejbeer |
821 |
|
| 32050 |
tejbeer |
822 |
@RequestMapping(value = "/getDelayBillingFileUploader", method = RequestMethod.POST)
|
|
|
823 |
public String getDelayBillingFileUploader(HttpServletRequest request, Model model, HttpServletResponse response, @RequestPart MultipartFile file) throws Throwable {
|
| 29346 |
tejbeer |
824 |
|
| 32050 |
tejbeer |
825 |
LOGGER.info("file" + file.toString());
|
|
|
826 |
String fileName = file.getName();
|
| 29346 |
tejbeer |
827 |
|
| 32050 |
tejbeer |
828 |
String fileNames = file.getOriginalFilename();
|
| 29346 |
tejbeer |
829 |
|
| 32050 |
tejbeer |
830 |
LOGGER.info("fileName" + fileName);
|
|
|
831 |
LOGGER.info("fileNames" + fileNames);
|
| 29346 |
tejbeer |
832 |
|
| 32050 |
tejbeer |
833 |
List<CSVRecord> records = FileUtil.readFile(file);
|
| 29346 |
tejbeer |
834 |
|
| 32050 |
tejbeer |
835 |
List<DelayBillingModel> delayBillingModel = new ArrayList<DelayBillingModel>();
|
|
|
836 |
for (CSVRecord record : records) {
|
|
|
837 |
DelayBillingModel dbm = new DelayBillingModel();
|
|
|
838 |
dbm.setInvoiceNumber(record.get(0));
|
|
|
839 |
dbm.setReason(record.get(1));
|
|
|
840 |
delayBillingModel.add(dbm);
|
| 29346 |
tejbeer |
841 |
|
| 32050 |
tejbeer |
842 |
}
|
| 29346 |
tejbeer |
843 |
|
| 32050 |
tejbeer |
844 |
if (!delayBillingModel.isEmpty()) {
|
|
|
845 |
for (DelayBillingModel delayBilling : delayBillingModel) {
|
| 29346 |
tejbeer |
846 |
|
| 32050 |
tejbeer |
847 |
List<Order> orders = orderRepository.selectByInvoiceNumber(delayBilling.getInvoiceNumber());
|
| 29346 |
tejbeer |
848 |
|
| 32050 |
tejbeer |
849 |
for (Order order : orders) {
|
|
|
850 |
order.setDelayReasonText(delayBilling.getReason());
|
| 29346 |
tejbeer |
851 |
|
| 32050 |
tejbeer |
852 |
if (!order.getStatus().equals(OrderStatus.BILLED)) {
|
|
|
853 |
throw new ProfitMandiBusinessException("Upload File", "", "Order" + order.getInvoiceNumber() + "status should be Billed");
|
| 29346 |
tejbeer |
854 |
|
| 32050 |
tejbeer |
855 |
}
|
|
|
856 |
}
|
| 29346 |
tejbeer |
857 |
|
| 32050 |
tejbeer |
858 |
SendNotificationModel sendNotificationModel = new SendNotificationModel();
|
|
|
859 |
sendNotificationModel.setCampaignName("Order Hold");
|
|
|
860 |
sendNotificationModel.setTitle("Order Hold");
|
|
|
861 |
sendNotificationModel.setMessage(
|
|
|
862 |
String.format("Dear partner, your SmartDukaan order " + delayBilling.getInvoiceNumber() + " has been delayed due to" + delayBilling.getReason() + "."));
|
|
|
863 |
sendNotificationModel.setType("url");
|
|
|
864 |
sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/notifications");
|
|
|
865 |
sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(1));
|
|
|
866 |
sendNotificationModel.setMessageType(MessageType.notification);
|
|
|
867 |
int userId = userAccountRepository.selectUserIdByRetailerId(orders.get(0).getRetailerId());
|
|
|
868 |
sendNotificationModel.setUserIds(Arrays.asList(userId));
|
|
|
869 |
notificationService.sendNotification(sendNotificationModel);
|
|
|
870 |
}
|
|
|
871 |
}
|
|
|
872 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
| 29346 |
tejbeer |
873 |
|
| 32050 |
tejbeer |
874 |
return "response";
|
|
|
875 |
}
|
| 29346 |
tejbeer |
876 |
|
| 32050 |
tejbeer |
877 |
@RequestMapping(value = "/getAwbNumber", method = RequestMethod.GET)
|
|
|
878 |
public String getAwbNumber(HttpServletRequest request, Model model) throws Exception {
|
| 31043 |
tejbeer |
879 |
|
| 32050 |
tejbeer |
880 |
List<Order> orders = orderRepository.selectByInvoiceNumber("NSLCK7931");
|
| 31043 |
tejbeer |
881 |
|
| 32050 |
tejbeer |
882 |
// blueDartService.getAirwayBillNo(orders.2);
|
|
|
883 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
| 31043 |
tejbeer |
884 |
|
| 32050 |
tejbeer |
885 |
return "response";
|
|
|
886 |
}
|
| 29222 |
tejbeer |
887 |
}
|