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