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