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