| 21577 |
ashik.ali |
1 |
package com.spice.profitmandi.web.controller;
|
|
|
2 |
|
| 30039 |
tejbeer |
3 |
import com.fasterxml.jackson.databind.ObjectMapper;
|
| 21987 |
kshitij.so |
4 |
import com.google.gson.Gson;
|
| 25698 |
tejbeer |
5 |
import com.spice.profitmandi.common.enumuration.MessageType;
|
| 21577 |
ashik.ali |
6 |
import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
|
| 30827 |
amit.gupta |
7 |
import com.spice.profitmandi.common.model.*;
|
| 22472 |
ashik.ali |
8 |
import com.spice.profitmandi.common.util.ExcelUtils;
|
| 25140 |
amit.gupta |
9 |
import com.spice.profitmandi.common.util.PdfUtils;
|
| 28084 |
amit.gupta |
10 |
import com.spice.profitmandi.common.util.Utils;
|
|
|
11 |
import com.spice.profitmandi.common.util.Utils.Attachment;
|
| 28701 |
tejbeer |
12 |
import com.spice.profitmandi.dao.entity.auth.AuthUser;
|
| 30827 |
amit.gupta |
13 |
import com.spice.profitmandi.dao.entity.catalog.*;
|
| 28701 |
tejbeer |
14 |
import com.spice.profitmandi.dao.entity.cs.Position;
|
| 30596 |
tejbeer |
15 |
import com.spice.profitmandi.dao.entity.dtr.WebOffer;
|
| 25140 |
amit.gupta |
16 |
import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
|
| 24917 |
tejbeer |
17 |
import com.spice.profitmandi.dao.entity.fofo.FofoStore;
|
| 24465 |
tejbeer |
18 |
import com.spice.profitmandi.dao.entity.fofo.InventoryItem;
|
|
|
19 |
import com.spice.profitmandi.dao.entity.fofo.LiveDemoSerialNumber;
|
| 30827 |
amit.gupta |
20 |
import com.spice.profitmandi.dao.entity.transaction.*;
|
| 30989 |
tejbeer |
21 |
import com.spice.profitmandi.dao.entity.user.Address;
|
| 28701 |
tejbeer |
22 |
import com.spice.profitmandi.dao.enumuration.catalog.ByPassRequestStatus;
|
|
|
23 |
import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
|
| 30827 |
amit.gupta |
24 |
import com.spice.profitmandi.dao.model.*;
|
| 28701 |
tejbeer |
25 |
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
|
| 30827 |
amit.gupta |
26 |
import com.spice.profitmandi.dao.repository.catalog.*;
|
| 28701 |
tejbeer |
27 |
import com.spice.profitmandi.dao.repository.cs.CsService;
|
|
|
28 |
import com.spice.profitmandi.dao.repository.cs.PositionRepository;
|
| 24465 |
tejbeer |
29 |
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
|
| 26482 |
tejbeer |
30 |
import com.spice.profitmandi.dao.repository.dtr.Mongo;
|
| 24917 |
tejbeer |
31 |
import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
|
| 30596 |
tejbeer |
32 |
import com.spice.profitmandi.dao.repository.dtr.WebOfferRepository;
|
| 30827 |
amit.gupta |
33 |
import com.spice.profitmandi.dao.repository.fofo.*;
|
| 24917 |
tejbeer |
34 |
import com.spice.profitmandi.dao.repository.inventory.NotifyStatus;
|
| 30827 |
amit.gupta |
35 |
import com.spice.profitmandi.dao.repository.transaction.*;
|
| 30989 |
tejbeer |
36 |
import com.spice.profitmandi.dao.repository.user.AddressRepository;
|
|
|
37 |
import com.spice.profitmandi.dao.repository.user.UserRepository;
|
| 27723 |
tejbeer |
38 |
import com.spice.profitmandi.dao.repository.warehouse.WarehousePurchaseOrderRepository;
|
|
|
39 |
import com.spice.profitmandi.dao.repository.warehouse.WarehouseScanRepository;
|
| 25851 |
amit.gupta |
40 |
import com.spice.profitmandi.service.NotificationService;
|
| 30683 |
tejbeer |
41 |
import com.spice.profitmandi.service.inventory.Combo;
|
| 22927 |
ashik.ali |
42 |
import com.spice.profitmandi.service.inventory.InventoryService;
|
| 30683 |
tejbeer |
43 |
import com.spice.profitmandi.service.inventory.MappedComboModel;
|
| 27516 |
amit.gupta |
44 |
import com.spice.profitmandi.service.order.OrderService;
|
| 24465 |
tejbeer |
45 |
import com.spice.profitmandi.service.user.RetailerService;
|
| 22139 |
amit.gupta |
46 |
import com.spice.profitmandi.web.model.LoginDetails;
|
| 22069 |
ashik.ali |
47 |
import com.spice.profitmandi.web.util.CookiesProcessor;
|
| 24106 |
tejbeer |
48 |
import com.spice.profitmandi.web.util.MVCResponseSender;
|
| 24658 |
tejbeer |
49 |
import in.shop2020.model.v1.order.OrderStatus;
|
| 24739 |
tejbeer |
50 |
import in.shop2020.model.v1.order.TransactionServiceException;
|
| 30827 |
amit.gupta |
51 |
import org.apache.commons.csv.CSVFormat;
|
|
|
52 |
import org.apache.commons.csv.CSVParser;
|
|
|
53 |
import org.apache.commons.csv.CSVRecord;
|
|
|
54 |
import org.apache.commons.io.FileUtils;
|
|
|
55 |
import org.apache.commons.lang3.StringUtils;
|
|
|
56 |
import org.apache.logging.log4j.LogManager;
|
|
|
57 |
import org.apache.logging.log4j.Logger;
|
|
|
58 |
import org.apache.thrift.TException;
|
|
|
59 |
import org.json.JSONObject;
|
|
|
60 |
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
61 |
import org.springframework.beans.factory.annotation.Qualifier;
|
|
|
62 |
import org.springframework.beans.factory.annotation.Value;
|
|
|
63 |
import org.springframework.core.io.ByteArrayResource;
|
|
|
64 |
import org.springframework.core.io.ClassPathResource;
|
|
|
65 |
import org.springframework.core.io.InputStreamResource;
|
|
|
66 |
import org.springframework.http.HttpHeaders;
|
|
|
67 |
import org.springframework.http.HttpStatus;
|
|
|
68 |
import org.springframework.http.MediaType;
|
|
|
69 |
import org.springframework.http.ResponseEntity;
|
|
|
70 |
import org.springframework.mail.javamail.JavaMailSender;
|
|
|
71 |
import org.springframework.stereotype.Controller;
|
|
|
72 |
import org.springframework.transaction.annotation.Transactional;
|
|
|
73 |
import org.springframework.ui.Model;
|
|
|
74 |
import org.springframework.web.bind.annotation.*;
|
|
|
75 |
import org.springframework.web.multipart.MultipartFile;
|
| 24658 |
tejbeer |
76 |
|
| 30827 |
amit.gupta |
77 |
import javax.servlet.http.HttpServletRequest;
|
|
|
78 |
import javax.servlet.http.HttpServletResponse;
|
|
|
79 |
import java.io.*;
|
|
|
80 |
import java.net.URISyntaxException;
|
|
|
81 |
import java.time.LocalDate;
|
|
|
82 |
import java.time.LocalDateTime;
|
|
|
83 |
import java.time.YearMonth;
|
|
|
84 |
import java.time.format.DateTimeFormatter;
|
|
|
85 |
import java.time.temporal.ChronoUnit;
|
|
|
86 |
import java.util.*;
|
|
|
87 |
import java.util.stream.Collectors;
|
|
|
88 |
import java.util.stream.Stream;
|
|
|
89 |
|
| 21577 |
ashik.ali |
90 |
@Controller
|
| 24123 |
tejbeer |
91 |
@Transactional(rollbackFor = Throwable.class)
|
| 21577 |
ashik.ali |
92 |
public class InventoryController {
|
| 21987 |
kshitij.so |
93 |
|
| 23568 |
govind |
94 |
private static final Logger LOGGER = LogManager.getLogger(InventoryController.class);
|
| 26482 |
tejbeer |
95 |
|
| 26292 |
amit.gupta |
96 |
private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M/d/yyyy H:m:s");
|
| 21987 |
kshitij.so |
97 |
|
| 27583 |
tejbeer |
98 |
private static final List<String> imeis = Arrays.asList("351030944216680", "351030944217183", "351030944217886",
|
|
|
99 |
"351030944507286", "351081710231270", "351081710238713", "351081710238796", "351081710241279",
|
|
|
100 |
"351081710244737", "355777112655976");
|
|
|
101 |
|
| 28701 |
tejbeer |
102 |
List<EscalationType> esclationType = Arrays.asList(EscalationType.L3, EscalationType.L4);
|
|
|
103 |
|
|
|
104 |
List<String> emails = Arrays.asList("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com");
|
|
|
105 |
|
| 21577 |
ashik.ali |
106 |
@Autowired
|
| 22927 |
ashik.ali |
107 |
private CookiesProcessor cookiesProcessor;
|
| 24123 |
tejbeer |
108 |
|
| 22354 |
ashik.ali |
109 |
@Autowired
|
| 23784 |
ashik.ali |
110 |
@Qualifier("fofoInventoryService")
|
| 22927 |
ashik.ali |
111 |
private InventoryService inventoryService;
|
| 24465 |
tejbeer |
112 |
|
| 24203 |
amit.gupta |
113 |
@Autowired
|
| 24950 |
tejbeer |
114 |
TagListingRepository tagListingRepository;
|
|
|
115 |
|
|
|
116 |
@Autowired
|
| 24203 |
amit.gupta |
117 |
private CurrentInventorySnapshotRepository currentInventorySnapshotRepository;
|
| 24123 |
tejbeer |
118 |
|
| 24106 |
tejbeer |
119 |
@Autowired
|
|
|
120 |
private TagRankingRepository tagRankingRepository;
|
| 24123 |
tejbeer |
121 |
|
| 24106 |
tejbeer |
122 |
@Autowired
|
| 24465 |
tejbeer |
123 |
private InventoryItemRepository inventoryItemRepository;
|
|
|
124 |
|
|
|
125 |
@Autowired
|
|
|
126 |
private LiveDemoBillingRespository liveDemoBillingRespository;
|
|
|
127 |
|
|
|
128 |
@Autowired
|
| 24123 |
tejbeer |
129 |
private ItemRepository itemRepository;
|
|
|
130 |
|
|
|
131 |
@Autowired
|
| 26512 |
amit.gupta |
132 |
private Gson gson;
|
|
|
133 |
|
|
|
134 |
@Autowired
|
| 24465 |
tejbeer |
135 |
private RetailerService retailerService;
|
|
|
136 |
|
|
|
137 |
@Autowired
|
| 24106 |
tejbeer |
138 |
private MVCResponseSender mvcResponseSender;
|
| 24123 |
tejbeer |
139 |
|
| 24465 |
tejbeer |
140 |
@Autowired
|
|
|
141 |
FofoStoreRepository fofoStoreRepository;
|
|
|
142 |
|
| 24658 |
tejbeer |
143 |
@Autowired
|
|
|
144 |
private OrderRepository orderRepository;
|
|
|
145 |
|
| 24739 |
tejbeer |
146 |
@Autowired
|
| 24917 |
tejbeer |
147 |
private NotifyItemRepository notifyItemRepository;
|
| 24739 |
tejbeer |
148 |
|
| 24917 |
tejbeer |
149 |
@Autowired
|
|
|
150 |
private NotifyColorChangeRepository notifyColorChangeRepository;
|
|
|
151 |
|
|
|
152 |
@Autowired
|
|
|
153 |
private NotifyOrderRespository notifyOrderRespository;
|
|
|
154 |
|
|
|
155 |
@Autowired
|
| 25851 |
amit.gupta |
156 |
private NotificationService notificationService;
|
|
|
157 |
|
|
|
158 |
@Autowired
|
| 25066 |
tejbeer |
159 |
private NotifyMessageRepository notifyMessageRepository;
|
|
|
160 |
|
|
|
161 |
@Autowired
|
| 24917 |
tejbeer |
162 |
private UserAccountRepository userAccountRepository;
|
|
|
163 |
|
| 27516 |
amit.gupta |
164 |
@Autowired
|
|
|
165 |
private OrderService orderService;
|
| 27583 |
tejbeer |
166 |
|
| 21987 |
kshitij.so |
167 |
@Value("${saholic.api.host}")
|
|
|
168 |
private String host;
|
| 23786 |
amit.gupta |
169 |
|
| 21987 |
kshitij.so |
170 |
@Value("${saholic.api.port}")
|
|
|
171 |
private int port;
|
| 23786 |
amit.gupta |
172 |
|
| 21987 |
kshitij.so |
173 |
@Value("${saholic.api.webapp}")
|
|
|
174 |
private String webapp;
|
|
|
175 |
|
| 24917 |
tejbeer |
176 |
@Autowired
|
|
|
177 |
JavaMailSender mailSender;
|
|
|
178 |
|
| 26031 |
tejbeer |
179 |
@Autowired
|
|
|
180 |
private NotifyCancelOrderRepository notifyCancelOrderRepository;
|
|
|
181 |
|
| 26482 |
tejbeer |
182 |
@Autowired
|
| 27723 |
tejbeer |
183 |
private WarehousePurchaseOrderRepository warehousePurchaseOrderRepository;
|
|
|
184 |
|
|
|
185 |
@Autowired
|
|
|
186 |
private WarehouseScanRepository warehouseScanRepository;
|
|
|
187 |
|
|
|
188 |
@Autowired
|
|
|
189 |
private FofoOrderRepository fofoOrderRepository;
|
|
|
190 |
@Autowired
|
| 26482 |
tejbeer |
191 |
private Mongo mongoClient;
|
|
|
192 |
|
| 28701 |
tejbeer |
193 |
@Autowired
|
|
|
194 |
private FocusedModelByPassRepository focusedModelByPassRepository;
|
|
|
195 |
|
|
|
196 |
@Autowired
|
|
|
197 |
private CsService csService;
|
|
|
198 |
|
|
|
199 |
@Autowired
|
|
|
200 |
AuthRepository authRepository;
|
|
|
201 |
|
|
|
202 |
@Autowired
|
|
|
203 |
PositionRepository positionRepository;
|
|
|
204 |
|
| 28754 |
tejbeer |
205 |
@Autowired
|
| 30456 |
amit.gupta |
206 |
ActivatedImeiRepository activatedImeiRepository;
|
|
|
207 |
|
|
|
208 |
@Autowired
|
| 28754 |
tejbeer |
209 |
HighDemandItemsRepository highDemandItemsRepository;
|
|
|
210 |
|
| 30596 |
tejbeer |
211 |
@Autowired
|
|
|
212 |
WebOfferRepository webOfferRepository;
|
|
|
213 |
|
| 30683 |
tejbeer |
214 |
@Autowired
|
|
|
215 |
ComboModelRepository comboModelRepository;
|
|
|
216 |
|
|
|
217 |
@Autowired
|
|
|
218 |
ComboMappedModelRepository comboMappedModelRepository;
|
|
|
219 |
|
| 30989 |
tejbeer |
220 |
@Autowired
|
|
|
221 |
private UserRepository userUserRepository;
|
|
|
222 |
|
|
|
223 |
@Autowired
|
|
|
224 |
private AddressRepository addressRepository;
|
|
|
225 |
|
| 23786 |
amit.gupta |
226 |
@RequestMapping(value = "/getCurrentInventorySnapshot")
|
|
|
227 |
public String getCurrentAvailability(HttpServletRequest request,
|
| 30565 |
tejbeer |
228 |
@RequestParam(name = "offset", defaultValue = "0") int offset,
|
|
|
229 |
@RequestParam(name = "limit", defaultValue = "10") int limit,
|
|
|
230 |
@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
|
| 23786 |
amit.gupta |
231 |
throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
232 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 23786 |
amit.gupta |
233 |
Map<String, Object> map = inventoryService.getCurrentInventorySnapshot(loginDetails.getFofoId(), offset, limit,
|
|
|
234 |
searchTerm);
|
| 22927 |
ashik.ali |
235 |
model.addAllAttributes(map);
|
| 21987 |
kshitij.so |
236 |
return "inventory-snapshot";
|
| 21612 |
ashik.ali |
237 |
}
|
| 21987 |
kshitij.so |
238 |
|
| 23786 |
amit.gupta |
239 |
@RequestMapping(value = "/getBadInventorySnapshot")
|
|
|
240 |
public String getBadAvailability(HttpServletRequest request,
|
|
|
241 |
@RequestParam(name = "offset", defaultValue = "0") int offset,
|
|
|
242 |
@RequestParam(name = "limit", defaultValue = "10") int limit,
|
|
|
243 |
@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
|
|
|
244 |
throws ProfitMandiBusinessException {
|
| 24123 |
tejbeer |
245 |
if (searchTerm == null) {
|
|
|
246 |
searchTerm = "";
|
| 24052 |
amit.gupta |
247 |
}
|
| 22927 |
ashik.ali |
248 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 23786 |
amit.gupta |
249 |
Map<String, Object> map = inventoryService.getBadInventorySnapshot(loginDetails.getFofoId(), offset, limit,
|
|
|
250 |
searchTerm);
|
| 22927 |
ashik.ali |
251 |
model.addAllAttributes(map);
|
| 21987 |
kshitij.so |
252 |
return "bad-inventory-snapshot";
|
|
|
253 |
}
|
|
|
254 |
|
| 23786 |
amit.gupta |
255 |
@RequestMapping(value = "/getPaginatedCurrentInventorySnapshot")
|
|
|
256 |
public String getPaginatedCurrentInventorySnapshot(HttpServletRequest request,
|
|
|
257 |
@RequestParam(name = "offset", defaultValue = "0") int offset,
|
|
|
258 |
@RequestParam(name = "limit", defaultValue = "10") int limit,
|
|
|
259 |
@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
|
|
|
260 |
throws ProfitMandiBusinessException {
|
| 24123 |
tejbeer |
261 |
if (searchTerm == null) {
|
|
|
262 |
searchTerm = "";
|
| 24052 |
amit.gupta |
263 |
}
|
| 22927 |
ashik.ali |
264 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 23786 |
amit.gupta |
265 |
Map<String, Object> map = inventoryService.getPaginatedCurrentInventorySnapshot(loginDetails.getFofoId(),
|
|
|
266 |
offset, limit, searchTerm);
|
| 22927 |
ashik.ali |
267 |
model.addAllAttributes(map);
|
| 21987 |
kshitij.so |
268 |
return "inventory-snapshot-paginated";
|
|
|
269 |
}
|
| 23786 |
amit.gupta |
270 |
|
|
|
271 |
@RequestMapping(value = "/getCatalog")
|
|
|
272 |
public String getCatalog(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset,
|
| 27583 |
tejbeer |
273 |
@RequestParam(name = "limit", defaultValue = "20") int limit,
|
|
|
274 |
@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm,
|
| 27618 |
tejbeer |
275 |
@RequestParam(name = "itemId", required = false, defaultValue = "0") int itemId,
|
|
|
276 |
@RequestParam(name = "accesories", required = false, defaultValue = "0") boolean accesories,
|
| 27596 |
tejbeer |
277 |
|
| 27618 |
tejbeer |
278 |
@RequestParam(name = "brand", required = false, defaultValue = "") String brand, Model model)
|
|
|
279 |
|
| 23786 |
amit.gupta |
280 |
throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
281 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 24123 |
tejbeer |
282 |
if (searchTerm == null) {
|
|
|
283 |
searchTerm = "";
|
| 24052 |
amit.gupta |
284 |
}
|
| 24739 |
tejbeer |
285 |
|
| 27583 |
tejbeer |
286 |
Map<String, Object> map = inventoryService.getCatalog(loginDetails.getFofoId(), offset, limit, searchTerm,
|
| 27618 |
tejbeer |
287 |
itemId, brand, accesories);
|
| 22927 |
ashik.ali |
288 |
model.addAllAttributes(map);
|
| 24203 |
amit.gupta |
289 |
model.addAttribute("hasGift", hasGift(loginDetails.getFofoId()));
|
| 24658 |
tejbeer |
290 |
|
| 21987 |
kshitij.so |
291 |
return "catalog";
|
|
|
292 |
}
|
| 23786 |
amit.gupta |
293 |
|
| 30596 |
tejbeer |
294 |
@RequestMapping(value = "/getWebOfferByCatalogId")
|
|
|
295 |
public String getCatalog(HttpServletRequest request, @RequestParam int catalogItemId, Model model)
|
|
|
296 |
|
|
|
297 |
throws ProfitMandiBusinessException {
|
|
|
298 |
|
|
|
299 |
List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(catalogItemId);
|
|
|
300 |
|
|
|
301 |
model.addAttribute("webOffers", webOffers);
|
|
|
302 |
|
|
|
303 |
return "web-offer-model";
|
|
|
304 |
}
|
|
|
305 |
|
| 24465 |
tejbeer |
306 |
// This method is currently hardcoded to faciliate watches sold as gift.
|
| 24203 |
amit.gupta |
307 |
private boolean hasGift(int fofoId) {
|
|
|
308 |
try {
|
| 24465 |
tejbeer |
309 |
return currentInventorySnapshotRepository.selectByItemIdAndFofoId(ProfitMandiConstants.GIFT_ID, fofoId)
|
|
|
310 |
.getAvailability() > 0;
|
| 24203 |
amit.gupta |
311 |
} catch (ProfitMandiBusinessException e) {
|
|
|
312 |
return false;
|
|
|
313 |
}
|
|
|
314 |
}
|
|
|
315 |
|
| 23786 |
amit.gupta |
316 |
@RequestMapping(value = "/getPaginatedCatalog")
|
|
|
317 |
public String getCatalogPaginated(HttpServletRequest request,
|
|
|
318 |
@RequestParam(name = "offset", defaultValue = "0") int offset,
|
| 27583 |
tejbeer |
319 |
@RequestParam(name = "limit", defaultValue = "20") int limit,
|
|
|
320 |
@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm,
|
| 27596 |
tejbeer |
321 |
@RequestParam(name = "itemId", required = false, defaultValue = "0") int itemId,
|
| 27618 |
tejbeer |
322 |
@RequestParam(name = "accesories", required = false, defaultValue = "0") boolean accesories,
|
|
|
323 |
@RequestParam(name = "brand", required = false, defaultValue = "") String brand, Model model)
|
| 23786 |
amit.gupta |
324 |
throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
325 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 24123 |
tejbeer |
326 |
if (searchTerm == null) {
|
|
|
327 |
searchTerm = "";
|
| 24052 |
amit.gupta |
328 |
}
|
| 23786 |
amit.gupta |
329 |
Map<String, Object> map = inventoryService.getPaginatedCatalog(loginDetails.getFofoId(), offset, limit,
|
| 27618 |
tejbeer |
330 |
searchTerm, itemId, brand, accesories);
|
| 22927 |
ashik.ali |
331 |
model.addAllAttributes(map);
|
| 21987 |
kshitij.so |
332 |
return "catalog-paginated";
|
|
|
333 |
}
|
|
|
334 |
|
| 23786 |
amit.gupta |
335 |
@RequestMapping(value = "/checkItemAvailability")
|
|
|
336 |
public String getItemAvailability(HttpServletRequest request,
|
|
|
337 |
@RequestParam(name = ProfitMandiConstants.ITEM_ID) int itemId, Model model)
|
|
|
338 |
throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
339 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 23786 |
amit.gupta |
340 |
CustomCurrentInventorySnapshot customCurrentInventorySnapshot = inventoryService.checkItemAvailability(itemId,
|
|
|
341 |
loginDetails.getFofoId());
|
| 25812 |
amit.gupta |
342 |
/*
|
|
|
343 |
* customCurrentInventorySnapshot
|
|
|
344 |
* .setIconUrl(Utils.getIconUrl(customCurrentInventorySnapshot.getCatalogItemId(
|
|
|
345 |
* ), host, port, webapp));
|
|
|
346 |
*/
|
| 22927 |
ashik.ali |
347 |
model.addAttribute("currentInventorySnapshot", new Gson().toJson(customCurrentInventorySnapshot));
|
|
|
348 |
return "current-item-availability";
|
| 23786 |
amit.gupta |
349 |
|
| 21577 |
ashik.ali |
350 |
}
|
| 23786 |
amit.gupta |
351 |
|
| 23192 |
ashik.ali |
352 |
@RequestMapping(value = "/cart", method = RequestMethod.POST)
|
| 23786 |
amit.gupta |
353 |
public String addToCart(HttpServletRequest request, @RequestParam(name = "cartData") String cartData, Model model)
|
|
|
354 |
throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
355 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 23786 |
amit.gupta |
356 |
|
| 22927 |
ashik.ali |
357 |
Map<String, Object> map = inventoryService.addToCart(cartData, loginDetails.getFofoId());
|
|
|
358 |
model.addAllAttributes(map);
|
| 21987 |
kshitij.so |
359 |
return "cart";
|
|
|
360 |
}
|
| 23786 |
amit.gupta |
361 |
|
| 23192 |
ashik.ali |
362 |
@RequestMapping(value = "/validate-cart", method = RequestMethod.POST)
|
| 23786 |
amit.gupta |
363 |
public String validateCart(HttpServletRequest request, HttpServletResponse response,
|
|
|
364 |
@RequestParam(name = "cartData") String cartData, Model model) throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
365 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 23786 |
amit.gupta |
366 |
|
| 22927 |
ashik.ali |
367 |
Map<String, Object> map = inventoryService.validateCart(cartData, loginDetails.getFofoId());
|
|
|
368 |
model.addAllAttributes(map);
|
| 21987 |
kshitij.so |
369 |
return "validate-cart";
|
|
|
370 |
}
|
|
|
371 |
|
| 23786 |
amit.gupta |
372 |
@RequestMapping(value = "/grnHistory")
|
| 24123 |
tejbeer |
373 |
public String getGrnHistory(HttpServletRequest request, @RequestParam(required = false) LocalDateTime startTime,
|
| 23886 |
amit.gupta |
374 |
@RequestParam(required = false) LocalDateTime endTime,
|
| 23786 |
amit.gupta |
375 |
@RequestParam(name = "offset", defaultValue = "0") int offset,
|
|
|
376 |
@RequestParam(name = "limit", defaultValue = "10") int limit,
|
|
|
377 |
@RequestParam(name = ProfitMandiConstants.PURCHASE_REFERENCE, defaultValue = "") String purchaseReference,
|
|
|
378 |
@RequestParam(name = "searchType", defaultValue = "") String searchType, Model model)
|
|
|
379 |
throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
380 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 24123 |
tejbeer |
381 |
Map<String, Object> map = inventoryService.getGrnHistory(loginDetails.getFofoId(), startTime, endTime, offset,
|
|
|
382 |
limit, purchaseReference, searchType);
|
| 22927 |
ashik.ali |
383 |
model.addAllAttributes(map);
|
| 21987 |
kshitij.so |
384 |
return "grn-history";
|
| 21636 |
ashik.ali |
385 |
}
|
| 21987 |
kshitij.so |
386 |
|
| 25140 |
amit.gupta |
387 |
@RequestMapping(value = "/downloadPurchaseInvoices")
|
|
|
388 |
public ResponseEntity<?> downloadPurchaseInvoices(HttpServletRequest request,
|
|
|
389 |
@RequestParam(required = false) LocalDateTime startTime,
|
|
|
390 |
@RequestParam(required = false) LocalDateTime endTime,
|
|
|
391 |
@RequestParam(name = "offset", defaultValue = "0") int offset,
|
|
|
392 |
@RequestParam(name = "limit", defaultValue = "10") int limit,
|
|
|
393 |
@RequestParam(name = ProfitMandiConstants.PURCHASE_REFERENCE, defaultValue = "") String purchaseReference,
|
|
|
394 |
@RequestParam(name = "searchType", defaultValue = "") String searchType, Model model)
|
|
|
395 |
throws ProfitMandiBusinessException {
|
|
|
396 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
|
|
397 |
Map<String, Object> map = inventoryService.getGrnHistory(loginDetails.getFofoId(), startTime, endTime, offset,
|
|
|
398 |
limit, purchaseReference, searchType);
|
|
|
399 |
|
|
|
400 |
List<FofoOrder> fofoOrders = (List<FofoOrder>) map.get("saleHistories");
|
|
|
401 |
|
|
|
402 |
if (fofoOrders.size() == 0) {
|
|
|
403 |
throw new ProfitMandiBusinessException("Search criteria", "", "No orders found for criteria");
|
|
|
404 |
}
|
|
|
405 |
|
|
|
406 |
final HttpHeaders headers = new HttpHeaders();
|
|
|
407 |
headers.setContentType(MediaType.APPLICATION_PDF);
|
|
|
408 |
headers.set("Content-disposition", "inline; filename=invoices.pdf");
|
|
|
409 |
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
|
| 30323 |
amit.gupta |
410 |
List<InvoicePdfModel> pdfModels = new ArrayList<>();
|
| 25140 |
amit.gupta |
411 |
PdfUtils.generateAndWrite(pdfModels, byteArrayOutputStream);
|
|
|
412 |
headers.setContentLength(byteArrayOutputStream.toByteArray().length);
|
|
|
413 |
final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
|
|
|
414 |
final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
|
|
|
415 |
return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
|
|
|
416 |
}
|
|
|
417 |
|
| 23786 |
amit.gupta |
418 |
@RequestMapping(value = "/getPaginatedGrnHistory")
|
|
|
419 |
public String getPaginatedGrnHistory(HttpServletRequest request,
|
| 23886 |
amit.gupta |
420 |
@RequestParam(required = false) LocalDateTime startTime,
|
|
|
421 |
@RequestParam(required = false) LocalDateTime endTime,
|
| 23786 |
amit.gupta |
422 |
@RequestParam(name = "offset", defaultValue = "0") int offset,
|
|
|
423 |
@RequestParam(name = "limit", defaultValue = "10") int limit,
|
|
|
424 |
@RequestParam(name = ProfitMandiConstants.PURCHASE_REFERENCE, defaultValue = "") String purchaseReference,
|
|
|
425 |
@RequestParam(name = "searchType", defaultValue = "") String searchType, Model model)
|
|
|
426 |
throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
427 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 24123 |
tejbeer |
428 |
Map<String, Object> map = inventoryService.getPaginatedGrnHistory(loginDetails.getFofoId(), startTime, endTime,
|
|
|
429 |
offset, limit);
|
| 22927 |
ashik.ali |
430 |
model.addAllAttributes(map);
|
| 21987 |
kshitij.so |
431 |
return "grn-history-paginated";
|
|
|
432 |
}
|
|
|
433 |
|
| 23786 |
amit.gupta |
434 |
@RequestMapping(value = "/grnHistoryDetailByPurchaseId")
|
|
|
435 |
public String grnHistoryByPurchaseId(HttpServletRequest request,
|
|
|
436 |
@RequestParam(name = ProfitMandiConstants.PURCHASE_ID) int purchaseId, Model model)
|
|
|
437 |
throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
438 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 23786 |
amit.gupta |
439 |
Map<String, Object> map = inventoryService.getGrnHistoryDetail(loginDetails.getFofoId(), purchaseId, host, port,
|
|
|
440 |
webapp);
|
| 22927 |
ashik.ali |
441 |
model.addAllAttributes(map);
|
| 21987 |
kshitij.so |
442 |
return "grn-details";
|
| 21636 |
ashik.ali |
443 |
}
|
| 21987 |
kshitij.so |
444 |
|
| 23786 |
amit.gupta |
445 |
@RequestMapping(value = "/grnHistoryDetailByPurchaseReference")
|
|
|
446 |
public String grnHistoryByPurchaseReference(HttpServletRequest request,
|
|
|
447 |
@RequestParam(name = ProfitMandiConstants.PURCHASE_REFERENCE) String purchaseReference, Model model)
|
|
|
448 |
throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
449 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 23786 |
amit.gupta |
450 |
Map<String, Object> map = inventoryService.getGrnHistoryDetail(loginDetails.getFofoId(), purchaseReference,
|
|
|
451 |
host, port, webapp);
|
| 22927 |
ashik.ali |
452 |
model.addAllAttributes(map);
|
| 21987 |
kshitij.so |
453 |
return "grn-details";
|
| 21654 |
ashik.ali |
454 |
}
|
| 23786 |
amit.gupta |
455 |
|
| 26248 |
amit.gupta |
456 |
@RequestMapping(value = "/activatedImeis")
|
|
|
457 |
public String activatedImeis(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
|
|
458 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
|
|
459 |
|
|
|
460 |
List<InventoryItem> inventoryItems = inventoryItemRepository.selectByActivatedNotSold(loginDetails.getFofoId());
|
|
|
461 |
inventoryItems.stream().forEach(x -> {
|
|
|
462 |
try {
|
|
|
463 |
x.setItem(itemRepository.selectById(x.getItemId()));
|
|
|
464 |
} catch (Exception e) {
|
|
|
465 |
e.printStackTrace();
|
|
|
466 |
}
|
|
|
467 |
});
|
|
|
468 |
model.addAttribute("inventoryItems", inventoryItems);
|
|
|
469 |
return "activated-imeis";
|
|
|
470 |
}
|
| 27583 |
tejbeer |
471 |
|
| 30456 |
amit.gupta |
472 |
@RequestMapping(value = "/activated-imeis-grn-pending")
|
| 30565 |
tejbeer |
473 |
public String activatedImeisGrnPending(HttpServletRequest request, Model model)
|
|
|
474 |
throws ProfitMandiBusinessException {
|
| 30456 |
amit.gupta |
475 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
|
|
476 |
|
| 30565 |
tejbeer |
477 |
List<Order> openOrders = orderRepository.selectGrnTimestampNull(loginDetails.getFofoId(),
|
|
|
478 |
Arrays.asList(OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERY_SUCCESS));
|
|
|
479 |
List<ImeiActivationTimestampModel> imeiActivationTimestampModels = activatedImeiRepository
|
|
|
480 |
.selectActivatedImeisByOrders(openOrders.stream().map(x -> x.getId()).collect(Collectors.toList()));
|
| 30456 |
amit.gupta |
481 |
Map<Integer, Order> ordersMap = openOrders.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
|
|
|
482 |
model.addAttribute("ordersMap", ordersMap);
|
|
|
483 |
model.addAttribute("imeiActivationTimestampModels", imeiActivationTimestampModels);
|
|
|
484 |
return "activated-imeis-grn-pending";
|
|
|
485 |
}
|
|
|
486 |
|
| 27516 |
amit.gupta |
487 |
@RequestMapping(value = "/view-invoices")
|
|
|
488 |
public String viewInvoices(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
|
|
489 |
return "view-dummy-invoices";
|
|
|
490 |
}
|
| 27583 |
tejbeer |
491 |
|
| 27516 |
amit.gupta |
492 |
@RequestMapping(value = "/dummy-invoices")
|
| 27583 |
tejbeer |
493 |
public ResponseEntity<?> downloadInvoices(HttpServletRequest request, @RequestParam String serialNumber,
|
| 30565 |
tejbeer |
494 |
Model model) throws ProfitMandiBusinessException {
|
| 27544 |
amit.gupta |
495 |
byte[] bytes = null;
|
| 27583 |
tejbeer |
496 |
if (!imeis.contains(serialNumber)) {
|
|
|
497 |
|
| 30323 |
amit.gupta |
498 |
InvoicePdfModel pdfModel = orderService.getDummyPdfModel(serialNumber);
|
| 27544 |
amit.gupta |
499 |
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
|
|
|
500 |
PdfUtils.generateAndWrite(Arrays.asList(pdfModel), byteArrayOutputStream);
|
|
|
501 |
bytes = byteArrayOutputStream.toByteArray();
|
|
|
502 |
} else {
|
|
|
503 |
ClassPathResource resource = new ClassPathResource("/META-INF/" + serialNumber + ".pdf");
|
|
|
504 |
try {
|
|
|
505 |
bytes = FileUtils.readFileToByteArray(resource.getFile());
|
| 27583 |
tejbeer |
506 |
} catch (Exception e) {
|
|
|
507 |
|
| 27544 |
amit.gupta |
508 |
}
|
|
|
509 |
}
|
| 27516 |
amit.gupta |
510 |
final HttpHeaders headers = new HttpHeaders();
|
|
|
511 |
headers.setContentType(MediaType.APPLICATION_PDF);
|
| 27544 |
amit.gupta |
512 |
headers.set("Content-disposition", "inline; filename=invoice-" + serialNumber + ".pdf");
|
|
|
513 |
headers.setContentLength(bytes.length);
|
|
|
514 |
final InputStream inputStream = new ByteArrayInputStream(bytes);
|
| 27516 |
amit.gupta |
515 |
final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
|
|
|
516 |
return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
|
|
|
517 |
}
|
| 28714 |
tejbeer |
518 |
|
| 28084 |
amit.gupta |
519 |
@RequestMapping(value = "/dummy-invoices-bulk")
|
|
|
520 |
public ResponseEntity<?> downloadInvoicesBulk(HttpServletRequest request, @RequestParam List<String> serialNumbers,
|
|
|
521 |
Model model) throws Exception {
|
|
|
522 |
byte[] bytes = null;
|
| 28701 |
tejbeer |
523 |
List<Attachment> attachments = new ArrayList<>();
|
|
|
524 |
for (String serialNumber : serialNumbers) {
|
| 28084 |
amit.gupta |
525 |
if (!imeis.contains(serialNumber)) {
|
| 30323 |
amit.gupta |
526 |
InvoicePdfModel pdfModel = null;
|
| 28088 |
amit.gupta |
527 |
try {
|
|
|
528 |
pdfModel = orderService.getDummyPdfModel(serialNumber);
|
| 28701 |
tejbeer |
529 |
} catch (Exception e) {
|
| 28088 |
amit.gupta |
530 |
continue;
|
|
|
531 |
}
|
| 28084 |
amit.gupta |
532 |
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
|
|
|
533 |
PdfUtils.generateAndWrite(Arrays.asList(pdfModel), byteArrayOutputStream);
|
|
|
534 |
bytes = byteArrayOutputStream.toByteArray();
|
|
|
535 |
} else {
|
|
|
536 |
ClassPathResource resource = new ClassPathResource("/META-INF/" + serialNumber + ".pdf");
|
|
|
537 |
try {
|
|
|
538 |
bytes = FileUtils.readFileToByteArray(resource.getFile());
|
|
|
539 |
} catch (Exception e) {
|
| 28088 |
amit.gupta |
540 |
continue;
|
| 28084 |
amit.gupta |
541 |
}
|
|
|
542 |
}
|
|
|
543 |
attachments.add(new Attachment("invoice-" + serialNumber + ".pdf", new ByteArrayResource(bytes)));
|
|
|
544 |
}
|
| 28109 |
tejbeer |
545 |
|
|
|
546 |
Utils.sendMailWithAttachments(mailSender, new String[] { "kuldeep.kumar@smartdukaan.com" }, null,
|
|
|
547 |
"Invoices List", "PFA", attachments.toArray(new Attachment[attachments.size()]));
|
| 28084 |
amit.gupta |
548 |
return new ResponseEntity<Boolean>(true, HttpStatus.OK);
|
|
|
549 |
}
|
| 26248 |
amit.gupta |
550 |
|
| 22472 |
ashik.ali |
551 |
@RequestMapping(value = "/getInventoryItemAgingByInterval", method = RequestMethod.POST)
|
| 23786 |
amit.gupta |
552 |
public String getInventoryItemAgingByInterval(HttpServletRequest request, @RequestBody List<Integer> intervals,
|
|
|
553 |
Model model, @RequestParam(name = "searchContent", defaultValue = "") String searchContent,
|
|
|
554 |
@RequestParam(name = "offset", defaultValue = "0") int offset,
|
|
|
555 |
@RequestParam(name = "limit", defaultValue = "10") int limit) throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
556 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 23786 |
amit.gupta |
557 |
Map<String, Object> map = inventoryService.getPaginatedItemAgingByInterval(loginDetails.getFofoId(), intervals,
|
|
|
558 |
searchContent, offset, limit);
|
| 22927 |
ashik.ali |
559 |
model.addAllAttributes(map);
|
| 22523 |
ashik.ali |
560 |
return "item-aging";
|
|
|
561 |
}
|
| 23786 |
amit.gupta |
562 |
|
| 22523 |
ashik.ali |
563 |
@RequestMapping(value = "/downloadInventoryItemAgingByInterval", method = RequestMethod.POST)
|
| 23786 |
amit.gupta |
564 |
public ResponseEntity<?> downloadInventoryItemAgingByInterval(HttpServletRequest request,
|
|
|
565 |
@RequestBody List<Integer> intervals, Model model) throws ProfitMandiBusinessException {
|
| 22927 |
ashik.ali |
566 |
LOGGER.info("Request received at url{} with body {}", request.getRequestURI(), intervals);
|
|
|
567 |
LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
|
| 23786 |
amit.gupta |
568 |
|
|
|
569 |
List<InventoryItemAgingModel> inventoryItemAgingModels = inventoryService
|
|
|
570 |
.getItemAgingByInterval(fofoDetails.getFofoId(), intervals);
|
|
|
571 |
|
| 22486 |
ashik.ali |
572 |
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
|
|
|
573 |
ExcelUtils.writeInventoryItemAgingModels(inventoryItemAgingModels, intervals, byteArrayOutputStream);
|
| 23786 |
amit.gupta |
574 |
|
|
|
575 |
final HttpHeaders headers = new HttpHeaders();
|
|
|
576 |
// private static final String CONTENT_TYPE_XLSX =
|
|
|
577 |
// "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
|
|
|
578 |
headers.set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
|
|
579 |
// headers.set("Content-Type", "application/vnd.ms-excel");
|
| 22486 |
ashik.ali |
580 |
headers.set("Content-disposition", "inline; filename=InventoryItemAging.xlsx");
|
| 23786 |
amit.gupta |
581 |
headers.setContentLength(byteArrayOutputStream.toByteArray().length);
|
|
|
582 |
final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
|
|
|
583 |
final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
|
|
|
584 |
return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
|
| 22472 |
ashik.ali |
585 |
}
|
| 27583 |
tejbeer |
586 |
|
| 26968 |
amit.gupta |
587 |
@RequestMapping(value = "/aging-report", method = RequestMethod.GET)
|
| 27583 |
tejbeer |
588 |
public ResponseEntity<?> downloadInventoryItemAgingByInterval(HttpServletRequest request)
|
|
|
589 |
throws ProfitMandiBusinessException {
|
|
|
590 |
|
|
|
591 |
List<Integer> intervals = Arrays.asList(5, 15, 30, 45);
|
| 26961 |
amit.gupta |
592 |
List<InventoryItemAgingModel> inventoryItemAgingModels = inventoryService.getItemAgingByInterval(intervals)
|
| 26979 |
amit.gupta |
593 |
.values().stream().flatMap(Collection::stream).collect(Collectors.toList());
|
|
|
594 |
LOGGER.info("Fofo Id {}", inventoryItemAgingModels.get(0).getFofoId());
|
| 26961 |
amit.gupta |
595 |
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
|
|
|
596 |
ExcelUtils.writeInventoryItemAgingModels(inventoryItemAgingModels, intervals, byteArrayOutputStream);
|
| 27583 |
tejbeer |
597 |
|
| 26961 |
amit.gupta |
598 |
final HttpHeaders headers = new HttpHeaders();
|
|
|
599 |
// private static final String CONTENT_TYPE_XLSX =
|
|
|
600 |
// "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
|
|
|
601 |
headers.set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
|
|
602 |
// headers.set("Content-Type", "application/vnd.ms-excel");
|
|
|
603 |
headers.set("Content-disposition", "inline; filename=InventoryItemAging.xlsx");
|
|
|
604 |
headers.setContentLength(byteArrayOutputStream.toByteArray().length);
|
|
|
605 |
final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
|
|
|
606 |
final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
|
|
|
607 |
return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
|
|
|
608 |
}
|
| 24123 |
tejbeer |
609 |
|
| 24106 |
tejbeer |
610 |
@RequestMapping(value = "/featurePanel", method = RequestMethod.GET)
|
| 25371 |
tejbeer |
611 |
public String FeaturePanel(HttpServletRequest request, Model model) throws Exception {
|
| 21987 |
kshitij.so |
612 |
|
| 24106 |
tejbeer |
613 |
List<TagRanking> tagRanking = null;
|
| 25362 |
tejbeer |
614 |
tagRanking = tagRankingRepository.getAllTagRanking();
|
| 24106 |
tejbeer |
615 |
LOGGER.info("tagRanking" + tagRanking);
|
|
|
616 |
if (!tagRanking.isEmpty()) {
|
| 25371 |
tejbeer |
617 |
Set<Integer> catalogIds = tagRanking.stream().map(x -> x.getCatalogItemId()).collect(Collectors.toSet());
|
| 24798 |
tejbeer |
618 |
List<Item> items = itemRepository.selectAllByCatalogIds(catalogIds);
|
|
|
619 |
Map<Integer, String> catalogDescription = items.stream().collect(Collectors.toMap(x -> x.getCatalogItemId(),
|
|
|
620 |
x -> x.getItemDescription(), (description1, description2) -> description1));
|
|
|
621 |
|
|
|
622 |
LOGGER.info("catalogDescription" + catalogDescription);
|
| 24465 |
tejbeer |
623 |
model.addAttribute("tagRanking", tagRanking);
|
| 24798 |
tejbeer |
624 |
model.addAttribute("catalogDescription", catalogDescription);
|
| 24106 |
tejbeer |
625 |
|
|
|
626 |
} else {
|
|
|
627 |
model.addAttribute("tagRanking", tagRanking);
|
| 25362 |
tejbeer |
628 |
|
| 24106 |
tejbeer |
629 |
}
|
|
|
630 |
|
|
|
631 |
return "feature";
|
|
|
632 |
|
|
|
633 |
}
|
| 24123 |
tejbeer |
634 |
|
| 26279 |
amit.gupta |
635 |
@PostMapping(value = "/imei/upload")
|
| 26294 |
amit.gupta |
636 |
public String uploadContent(HttpServletRequest request, @RequestPart("file") MultipartFile file, Model model)
|
| 26279 |
amit.gupta |
637 |
throws Exception {
|
| 26482 |
tejbeer |
638 |
/*
|
|
|
639 |
* if(brand==null) { throw new
|
|
|
640 |
* ProfitMandiBusinessException("Please select brand", "Brand empty",
|
|
|
641 |
* "Brand required"); }
|
|
|
642 |
*/
|
| 26279 |
amit.gupta |
643 |
List<CSVRecord> masterDataList = readFile(file);
|
|
|
644 |
|
| 26482 |
tejbeer |
645 |
Map<String, LocalDateTime> imeisActivationMap = masterDataList.stream()
|
|
|
646 |
.collect(Collectors.toMap(x -> x.get(0).trim(), x -> {
|
|
|
647 |
if (!StringUtils.isEmpty(x.get(1).trim())) {
|
|
|
648 |
return LocalDateTime.parse((String) (x.get(1).trim()), formatter);
|
| 26299 |
amit.gupta |
649 |
} else {
|
|
|
650 |
return null;
|
|
|
651 |
}
|
|
|
652 |
}));
|
|
|
653 |
inventoryService.addActivatedImeis(imeisActivationMap);
|
|
|
654 |
model.addAttribute("response", true);
|
| 26294 |
amit.gupta |
655 |
return "response";
|
| 26279 |
amit.gupta |
656 |
}
|
|
|
657 |
|
|
|
658 |
private List<CSVRecord> readFile(MultipartFile file) throws Exception {
|
|
|
659 |
List<CSVRecord> records = null;
|
|
|
660 |
try (CSVParser parser = new CSVParser(new InputStreamReader(file.getInputStream()), CSVFormat.DEFAULT)) {
|
|
|
661 |
records = parser.getRecords();
|
|
|
662 |
if (records.size() < 2) {
|
|
|
663 |
throw new ProfitMandiBusinessException("Uploaded File", "", "No records Found");
|
|
|
664 |
}
|
|
|
665 |
records.remove(0);
|
| 26482 |
tejbeer |
666 |
} catch (Exception e) {
|
| 26279 |
amit.gupta |
667 |
throw new ProfitMandiBusinessException("Parsing Failed", "parse failed", "file parse failed");
|
|
|
668 |
}
|
|
|
669 |
return records;
|
|
|
670 |
}
|
|
|
671 |
|
| 24106 |
tejbeer |
672 |
@RequestMapping(value = "/itemfeature", method = RequestMethod.POST)
|
| 24123 |
tejbeer |
673 |
public String Itemfeature(HttpServletRequest request, @RequestBody ItemFeatureDataModel itemFeatureDatatModel,
|
|
|
674 |
Model model) throws Exception {
|
| 25371 |
tejbeer |
675 |
TagRanking tagRanking = tagRankingRepository.selectBycatalogItemId(itemFeatureDatatModel.getCatalogItemId());
|
|
|
676 |
LOGGER.info("tagRanking" + tagRanking);
|
|
|
677 |
if (tagRanking == null) {
|
|
|
678 |
tagRanking = new TagRanking();
|
|
|
679 |
tagRanking.setCatalogItemId(itemFeatureDatatModel.getCatalogItemId());
|
| 25363 |
tejbeer |
680 |
}
|
| 24106 |
tejbeer |
681 |
tagRanking.setFeature(itemFeatureDatatModel.getFeature());
|
| 25363 |
tejbeer |
682 |
tagRanking.setRankPoints(itemFeatureDatatModel.getRankPoints());
|
| 25371 |
tejbeer |
683 |
|
| 24123 |
tejbeer |
684 |
tagRankingRepository.persist(tagRanking);
|
| 24106 |
tejbeer |
685 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
686 |
return "response";
|
|
|
687 |
}
|
|
|
688 |
|
| 24798 |
tejbeer |
689 |
@RequestMapping(value = "/removeFeature", method = RequestMethod.DELETE)
|
|
|
690 |
public String removeTagRankingEnteries(HttpServletRequest request,
|
|
|
691 |
@RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
|
| 24917 |
tejbeer |
692 |
|
| 24798 |
tejbeer |
693 |
tagRankingRepository.deleteById(id);
|
|
|
694 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
695 |
return "response";
|
|
|
696 |
}
|
|
|
697 |
|
| 24465 |
tejbeer |
698 |
@RequestMapping(value = "/getDemolistbyfofoId", method = RequestMethod.GET)
|
|
|
699 |
public String DemoListbyFofoId(HttpServletRequest request,
|
|
|
700 |
@RequestParam(required = false, defaultValue = "0") int fofoId, Model model) throws Exception {
|
|
|
701 |
|
|
|
702 |
List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId())
|
|
|
703 |
.collect(Collectors.toList());
|
| 30426 |
tejbeer |
704 |
|
|
|
705 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
|
|
|
706 |
Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
|
|
|
707 |
.filter(x -> x != null).collect(Collectors.toList()).stream()
|
|
|
708 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
| 24465 |
tejbeer |
709 |
String customRetailers = JSONObject.valueToString(customRetailersMap.values());
|
|
|
710 |
List<String> serailNumberList = liveDemoBillingRespository.selectAllSerialNumber();
|
|
|
711 |
LOGGER.info("serailNumberList" + serailNumberList);
|
|
|
712 |
List<InventoryItem> inventoryItem = null;
|
|
|
713 |
List<InventoryItem> inventoryItem1 = new ArrayList<>();
|
|
|
714 |
if (fofoId > 0) {
|
|
|
715 |
List<Item> items = itemRepository.selectAllByBrand("Live Demo");
|
|
|
716 |
Set<Integer> itemIds = new HashSet<>();
|
|
|
717 |
for (Item Item : items) {
|
|
|
718 |
itemIds.add(Item.getId());
|
|
|
719 |
}
|
|
|
720 |
inventoryItem = inventoryItemRepository.selectByFofoIdItemIds(fofoId, itemIds);
|
|
|
721 |
|
|
|
722 |
Set<String> serial = new HashSet<>();
|
|
|
723 |
for (InventoryItem invItem : inventoryItem) {
|
| 24658 |
tejbeer |
724 |
if (!serailNumberList.contains(invItem.getSerialNumber())) {
|
| 24465 |
tejbeer |
725 |
inventoryItem1.add(invItem);
|
| 25371 |
tejbeer |
726 |
|
| 24465 |
tejbeer |
727 |
}
|
|
|
728 |
|
|
|
729 |
}
|
|
|
730 |
|
|
|
731 |
LOGGER.info("inventoyItem" + inventoryItem1);
|
|
|
732 |
model.addAttribute("customRetailers", customRetailers);
|
| 25371 |
tejbeer |
733 |
|
| 24465 |
tejbeer |
734 |
model.addAttribute("liveDemo", inventoryItem1);
|
|
|
735 |
CustomRetailer fofoIdsAndRetailerName = retailerService.getFofoRetailer(fofoId);
|
|
|
736 |
|
|
|
737 |
model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
|
|
|
738 |
|
|
|
739 |
}
|
|
|
740 |
|
|
|
741 |
else {
|
|
|
742 |
model.addAttribute("customRetailers", customRetailers);
|
|
|
743 |
model.addAttribute("liveDemo", inventoryItem1);
|
|
|
744 |
}
|
|
|
745 |
|
|
|
746 |
return "live_demo_billing";
|
|
|
747 |
|
|
|
748 |
}
|
|
|
749 |
|
|
|
750 |
@RequestMapping(value = "/enableliveDemoSerailNumber", method = RequestMethod.POST)
|
|
|
751 |
public String EnableliveDemoSerailNumber(HttpServletRequest request, @RequestParam String serial_number,
|
|
|
752 |
Model model) throws Exception {
|
|
|
753 |
|
|
|
754 |
LiveDemoSerialNumber liveDemoSerialNumber = new LiveDemoSerialNumber();
|
|
|
755 |
liveDemoSerialNumber.setSerialNumber(serial_number);
|
|
|
756 |
|
|
|
757 |
liveDemoBillingRespository.persist(liveDemoSerialNumber);
|
|
|
758 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
759 |
return "response";
|
|
|
760 |
}
|
|
|
761 |
|
| 24739 |
tejbeer |
762 |
@RequestMapping(value = "/getInProcessOrder", method = RequestMethod.GET)
|
|
|
763 |
public String getInProcessOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
|
|
764 |
|
|
|
765 |
List<com.spice.profitmandi.dao.entity.transaction.Order> inProcessorder = orderRepository
|
| 25067 |
tejbeer |
766 |
.selectAllOrder(OrderStatus.SUBMITTED_FOR_PROCESSING);
|
| 24917 |
tejbeer |
767 |
List<Integer> retailerIds = new ArrayList<>();
|
|
|
768 |
List<Integer> orderIds = new ArrayList<>();
|
|
|
769 |
if (!inProcessorder.isEmpty()) {
|
|
|
770 |
for (com.spice.profitmandi.dao.entity.transaction.Order order : inProcessorder) {
|
|
|
771 |
retailerIds.add(order.getRetailerId());
|
|
|
772 |
orderIds.add(order.getId());
|
| 24739 |
tejbeer |
773 |
|
| 24917 |
tejbeer |
774 |
}
|
| 24739 |
tejbeer |
775 |
|
| 25640 |
tejbeer |
776 |
List<NotifyOrder> notify = notifyOrderRespository.selectByorderIds(orderIds);
|
|
|
777 |
for (NotifyOrder notifyOrder : notify) {
|
| 25449 |
tejbeer |
778 |
|
| 25640 |
tejbeer |
779 |
Order orderdetail = orderRepository.selectById(notifyOrder.getOrderId());
|
| 25449 |
tejbeer |
780 |
if (!orderdetail.getStatus().equals(OrderStatus.SUBMITTED_FOR_PROCESSING)) {
|
| 25640 |
tejbeer |
781 |
notifyOrder.setStatus(NotifyStatus.rejected);
|
| 25449 |
tejbeer |
782 |
}
|
| 25640 |
tejbeer |
783 |
}
|
| 24950 |
tejbeer |
784 |
|
| 24917 |
tejbeer |
785 |
Map<Integer, Optional<NotifyOrder>> notifyOrders = notifyOrderRespository.selectByorderIds(orderIds)
|
|
|
786 |
.stream().collect(Collectors.groupingBy(NotifyOrder::getOrderId,
|
|
|
787 |
Collectors.maxBy((x1, x2) -> x1.getId() - x2.getId())));
|
| 24950 |
tejbeer |
788 |
|
| 26110 |
tejbeer |
789 |
Map<Integer, NotifyCancel> notifyCancelOrders = notifyCancelOrderRepository.selectByOrderIds(orderIds)
|
|
|
790 |
.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
|
| 24917 |
tejbeer |
791 |
Map<Integer, String> storeIdAndFofoIdMap = fofoStoreRepository.selectByRetailerIds(retailerIds).stream()
|
|
|
792 |
.collect(Collectors.toMap(FofoStore::getId, FofoStore::getCode));
|
|
|
793 |
|
|
|
794 |
model.addAttribute("inProcessorder", inProcessorder);
|
|
|
795 |
model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
|
|
|
796 |
model.addAttribute("latestNotifyOrders", notifyOrders);
|
| 26110 |
tejbeer |
797 |
model.addAttribute("notifyCancelOrders", notifyCancelOrders);
|
| 24917 |
tejbeer |
798 |
} else {
|
|
|
799 |
model.addAttribute("inProcessorder", inProcessorder);
|
|
|
800 |
}
|
| 24739 |
tejbeer |
801 |
return "review_order";
|
|
|
802 |
}
|
|
|
803 |
|
| 28109 |
tejbeer |
804 |
@RequestMapping(value = "/getPaymentPendingOrder", method = RequestMethod.GET)
|
|
|
805 |
public String getPaymentPendingOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
|
|
806 |
|
|
|
807 |
List<com.spice.profitmandi.dao.entity.transaction.Order> pendingPaymentorder = orderRepository
|
|
|
808 |
.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusMonths(3), LocalDateTime.now(),
|
|
|
809 |
OrderStatus.PAYMENT_PENDING);
|
|
|
810 |
List<com.spice.profitmandi.dao.entity.transaction.Order> failedPaymentorder = orderRepository
|
|
|
811 |
.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusMonths(3), LocalDateTime.now(),
|
|
|
812 |
OrderStatus.PAYMENT_FAILED);
|
|
|
813 |
pendingPaymentorder.addAll(failedPaymentorder);
|
|
|
814 |
model.addAttribute("pendingPaymentorder", pendingPaymentorder);
|
|
|
815 |
|
|
|
816 |
return "payment-pending-order";
|
|
|
817 |
}
|
|
|
818 |
|
| 24739 |
tejbeer |
819 |
@RequestMapping(value = "/getKeepInTabOrder", method = RequestMethod.GET)
|
|
|
820 |
public String getKeepInTabOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
|
|
821 |
|
|
|
822 |
List<com.spice.profitmandi.dao.entity.transaction.Order> keepatab = orderRepository
|
|
|
823 |
.selectAllOrder(OrderStatus.KEEP_A_TAB);
|
|
|
824 |
|
|
|
825 |
model.addAttribute("keepatab", keepatab);
|
|
|
826 |
|
|
|
827 |
return "keep-a-tab";
|
|
|
828 |
}
|
|
|
829 |
|
|
|
830 |
@RequestMapping(value = "/closeOrder", method = RequestMethod.POST)
|
|
|
831 |
public String closeOrder(HttpServletRequest request, @RequestParam int orderId, Model model) throws Exception {
|
| 24798 |
tejbeer |
832 |
|
| 24739 |
tejbeer |
833 |
Order order = orderRepository.selectById(orderId);
|
| 24798 |
tejbeer |
834 |
if (order != null) {
|
| 24739 |
tejbeer |
835 |
order.setStatus(OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY);
|
| 24798 |
tejbeer |
836 |
|
| 24739 |
tejbeer |
837 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
838 |
|
| 24798 |
tejbeer |
839 |
} else {
|
| 24739 |
tejbeer |
840 |
model.addAttribute("response", mvcResponseSender.createResponseString(false));
|
|
|
841 |
|
|
|
842 |
}
|
|
|
843 |
return "response";
|
| 24658 |
tejbeer |
844 |
}
|
|
|
845 |
|
| 25640 |
tejbeer |
846 |
@RequestMapping(value = "/getcancelOrderItems", method = RequestMethod.GET)
|
|
|
847 |
public String getcancelOrderItems(HttpServletRequest request, @RequestParam int itemId, Model model)
|
|
|
848 |
throws Exception {
|
|
|
849 |
|
|
|
850 |
List<Order> inProcessselectedOrder = orderRepository.selectByItemIdOrderStatus(itemId,
|
|
|
851 |
OrderStatus.SUBMITTED_FOR_PROCESSING);
|
|
|
852 |
|
|
|
853 |
List<Integer> retailerIds = new ArrayList<>();
|
|
|
854 |
for (com.spice.profitmandi.dao.entity.transaction.Order order : inProcessselectedOrder) {
|
|
|
855 |
retailerIds.add(order.getRetailerId());
|
|
|
856 |
|
|
|
857 |
}
|
|
|
858 |
|
|
|
859 |
Map<Integer, String> storeIdAndFofoIdMap = fofoStoreRepository.selectByRetailerIds(retailerIds).stream()
|
|
|
860 |
.collect(Collectors.toMap(FofoStore::getId, FofoStore::getCode));
|
|
|
861 |
|
|
|
862 |
model.addAttribute("inProcessCancelOrder", inProcessselectedOrder);
|
|
|
863 |
model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
|
|
|
864 |
|
|
|
865 |
return "cancel-order-modal";
|
|
|
866 |
}
|
|
|
867 |
|
| 24739 |
tejbeer |
868 |
@RequestMapping(value = "/cancelOrder", method = RequestMethod.POST)
|
| 25640 |
tejbeer |
869 |
public String cancelOrder(HttpServletRequest request, @RequestBody OrderCancellationModel orderCancellationModel,
|
|
|
870 |
Model model) throws Exception {
|
| 24739 |
tejbeer |
871 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 25640 |
tejbeer |
872 |
LOGGER.info("orderId" + orderCancellationModel.getOrderIds());
|
|
|
873 |
|
| 24739 |
tejbeer |
874 |
try {
|
| 25699 |
tejbeer |
875 |
// List<Order> orders =
|
|
|
876 |
// orderRepository.selectByOrderIds(orderCancellationModel.getOrderIds());
|
| 25640 |
tejbeer |
877 |
|
| 25699 |
tejbeer |
878 |
List<Order> orders = orderRepository.selectByOrderIdsOrdersStatus(orderCancellationModel.getOrderIds(),
|
|
|
879 |
OrderStatus.SUBMITTED_FOR_PROCESSING);
|
|
|
880 |
if (!orders.isEmpty()) {
|
|
|
881 |
for (Order order : orders) {
|
| 25640 |
tejbeer |
882 |
|
| 25699 |
tejbeer |
883 |
orderRepository.refundOrder(order.getId(), loginDetails.getEmailId(),
|
|
|
884 |
orderCancellationModel.getReason(), OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY);
|
|
|
885 |
List<NotifyOrder> notifyOrders = notifyOrderRespository.selectByOrder(order.getId());
|
|
|
886 |
for (NotifyOrder notifyOrder : notifyOrders) {
|
|
|
887 |
if (notifyOrder.getStatus() == NotifyStatus.pending) {
|
|
|
888 |
notifyOrder.setStatus(NotifyStatus.rejected);
|
|
|
889 |
}
|
| 25449 |
tejbeer |
890 |
}
|
| 25699 |
tejbeer |
891 |
sendCancellationNotificationToPartner(order, orderCancellationModel.getReason());
|
|
|
892 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
893 |
|
| 25640 |
tejbeer |
894 |
}
|
|
|
895 |
}
|
| 24739 |
tejbeer |
896 |
} catch (TransactionServiceException | TException e) {
|
|
|
897 |
model.addAttribute("response", mvcResponseSender.createResponseString(false));
|
|
|
898 |
|
|
|
899 |
}
|
| 25640 |
tejbeer |
900 |
|
| 24739 |
tejbeer |
901 |
return "response";
|
|
|
902 |
}
|
|
|
903 |
|
| 25039 |
amit.gupta |
904 |
private void sendCancellationNotificationToPartner(Order order, String reason) throws Exception {
|
|
|
905 |
Item item = itemRepository.selectById(order.getLineItem().getItemId());
|
| 25383 |
tejbeer |
906 |
|
| 30989 |
tejbeer |
907 |
String title = "Order Cancellation";
|
|
|
908 |
String message = String.format("Order %s %d(Pcs) has been cancelled", item.getItemDescription(),
|
|
|
909 |
order.getLineItem().getQuantity());
|
|
|
910 |
|
|
|
911 |
com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(order.getRetailerId());
|
|
|
912 |
|
|
|
913 |
Address address = addressRepository.selectById(user.getAddressId());
|
|
|
914 |
|
| 25851 |
amit.gupta |
915 |
SendNotificationModel sendNotificationModel = new SendNotificationModel();
|
| 30989 |
tejbeer |
916 |
sendNotificationModel.setCampaignName(title);
|
|
|
917 |
sendNotificationModel.setTitle(message);
|
| 25851 |
amit.gupta |
918 |
sendNotificationModel.setType("url");
|
|
|
919 |
sendNotificationModel.setMessage(reason);
|
| 26482 |
tejbeer |
920 |
sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/orderDetails");
|
| 25851 |
amit.gupta |
921 |
sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(2));
|
|
|
922 |
sendNotificationModel.setMessageType(MessageType.notification);
|
| 25857 |
tejbeer |
923 |
int userId = userAccountRepository.selectUserIdByRetailerId(order.getRetailerId());
|
| 25873 |
tejbeer |
924 |
sendNotificationModel.setUserIds(Arrays.asList(userId));
|
| 25851 |
amit.gupta |
925 |
notificationService.sendNotification(sendNotificationModel);
|
| 25140 |
amit.gupta |
926 |
|
| 31144 |
tejbeer |
927 |
// notificationService.sendWhatsappMessage(message, title,
|
|
|
928 |
// address.getPhoneNumber());
|
| 30989 |
tejbeer |
929 |
|
| 25039 |
amit.gupta |
930 |
}
|
|
|
931 |
|
| 24917 |
tejbeer |
932 |
@RequestMapping(value = "/getNotifyItemColor", method = RequestMethod.GET)
|
|
|
933 |
public String getNotifyItemColor(HttpServletRequest request, @RequestParam int catalogItemId,
|
|
|
934 |
@RequestParam int itemId, Model model) throws ProfitMandiBusinessException {
|
|
|
935 |
|
| 24950 |
tejbeer |
936 |
List<Item> availableColorItems = itemRepository.selectAllByCatalogItemId(catalogItemId);
|
|
|
937 |
Iterator<Item> itemsIterator = availableColorItems.iterator();
|
| 24917 |
tejbeer |
938 |
|
| 24950 |
tejbeer |
939 |
while (itemsIterator.hasNext()) {
|
|
|
940 |
Item item = itemsIterator.next();
|
|
|
941 |
TagListing itemTagListing = tagListingRepository.selectByItemId(item.getId());
|
|
|
942 |
|
|
|
943 |
if (itemTagListing == null) {
|
|
|
944 |
itemsIterator.remove();
|
|
|
945 |
|
|
|
946 |
}
|
|
|
947 |
|
|
|
948 |
else if (!itemTagListing.isActive()) {
|
|
|
949 |
itemsIterator.remove();
|
|
|
950 |
|
|
|
951 |
}
|
|
|
952 |
}
|
|
|
953 |
|
| 24917 |
tejbeer |
954 |
List<Order> inProcessselectedOrder = orderRepository.selectByItemIdOrderStatus(itemId,
|
|
|
955 |
OrderStatus.SUBMITTED_FOR_PROCESSING);
|
|
|
956 |
List<Integer> retailerIds = new ArrayList<>();
|
|
|
957 |
|
|
|
958 |
for (com.spice.profitmandi.dao.entity.transaction.Order order : inProcessselectedOrder) {
|
|
|
959 |
retailerIds.add(order.getRetailerId());
|
|
|
960 |
|
|
|
961 |
}
|
|
|
962 |
|
|
|
963 |
Map<Integer, String> storeIdAndFofoIdMap = fofoStoreRepository.selectByRetailerIds(retailerIds).stream()
|
|
|
964 |
.collect(Collectors.toMap(FofoStore::getId, FofoStore::getCode));
|
| 24950 |
tejbeer |
965 |
LOGGER.info("item" + availableColorItems);
|
|
|
966 |
model.addAttribute("item", availableColorItems);
|
| 24917 |
tejbeer |
967 |
model.addAttribute("inProcessselectedOrder", inProcessselectedOrder);
|
|
|
968 |
model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
|
|
|
969 |
|
|
|
970 |
return "notify-order-modal";
|
|
|
971 |
}
|
|
|
972 |
|
|
|
973 |
@RequestMapping(value = "/notifyOrder", method = RequestMethod.POST)
|
|
|
974 |
public String NotifyOrder(HttpServletRequest request, @RequestBody NotifyOrderModel notifyOrderModel, Model model)
|
|
|
975 |
throws Exception {
|
|
|
976 |
|
|
|
977 |
com.spice.profitmandi.dao.entity.transaction.NotifyItem notifyItem = null;
|
|
|
978 |
List<Integer> orderIds = new ArrayList<>();
|
|
|
979 |
|
|
|
980 |
NotifyColorChange notifytimestamp = new NotifyColorChange();
|
|
|
981 |
notifytimestamp.setCreated(LocalDateTime.now());
|
|
|
982 |
notifyColorChangeRepository.persist(notifytimestamp);
|
| 25066 |
tejbeer |
983 |
NotifyMessage notifyMessage = new NotifyMessage();
|
|
|
984 |
notifyMessage.setNotifyId(notifytimestamp.getId());
|
|
|
985 |
notifyMessage.setNotifyMessages(notifyOrderModel.getMessage());
|
| 25140 |
amit.gupta |
986 |
notifyMessageRepository.persist(notifyMessage);
|
| 24917 |
tejbeer |
987 |
for (NotifyItemIdModel itemid : notifyOrderModel.getItemIds()) {
|
|
|
988 |
|
|
|
989 |
notifyItem = new com.spice.profitmandi.dao.entity.transaction.NotifyItem();
|
|
|
990 |
notifyItem.setItemId(itemid.getItemId());
|
|
|
991 |
notifyItem.setResponseTime(itemid.getResponseTime());
|
|
|
992 |
notifyItem.setProcuredDate(itemid.getProcuredTime());
|
|
|
993 |
notifyItem.setNotifyColorchangeId(notifytimestamp.getId());
|
|
|
994 |
notifyItemRepository.persist(notifyItem);
|
|
|
995 |
LOGGER.info("notifyItem" + notifyItem);
|
|
|
996 |
}
|
|
|
997 |
for (NotifyOrderIdModel st : notifyOrderModel.getOrderIds()) {
|
|
|
998 |
List<NotifyOrder> existingOrder = notifyOrderRespository.selectByOrder(st.getOrderId());
|
| 24950 |
tejbeer |
999 |
if (!existingOrder.isEmpty()) {
|
| 24917 |
tejbeer |
1000 |
LOGGER.info("existingOrder" + existingOrder);
|
| 24950 |
tejbeer |
1001 |
for (NotifyOrder notifyOrder : existingOrder) {
|
|
|
1002 |
if (NotifyStatus.pending == notifyOrder.getStatus()) {
|
|
|
1003 |
notifyOrder.setStatus(NotifyStatus.rejected);
|
| 26105 |
tejbeer |
1004 |
notifyOrder.setUpdateTimestamp(LocalDateTime.now());
|
| 24950 |
tejbeer |
1005 |
}
|
| 24917 |
tejbeer |
1006 |
}
|
|
|
1007 |
}
|
|
|
1008 |
NotifyOrder orderStatus = new NotifyOrder();
|
|
|
1009 |
orderStatus.setOrderId(st.getOrderId());
|
|
|
1010 |
orderStatus.setNotifyId(notifytimestamp.getId());
|
|
|
1011 |
orderStatus.setItemId(st.getOlditemId());
|
|
|
1012 |
Order id = orderRepository.selectById(st.getOrderId());
|
|
|
1013 |
orderStatus.setFofoId(id.getRetailerId());
|
|
|
1014 |
orderStatus.setStatus(NotifyStatus.pending);
|
|
|
1015 |
notifyOrderRespository.persist(orderStatus);
|
|
|
1016 |
|
|
|
1017 |
LOGGER.info("itemStatus" + orderStatus);
|
|
|
1018 |
orderIds.add(st.getOrderId());
|
|
|
1019 |
}
|
|
|
1020 |
|
|
|
1021 |
LOGGER.info("orderIds" + orderIds);
|
|
|
1022 |
List<Order> orders = orderRepository.selectByOrderIds(orderIds);
|
|
|
1023 |
for (Order order : orders) {
|
|
|
1024 |
LOGGER.info("order" + order.getId());
|
|
|
1025 |
|
| 30989 |
tejbeer |
1026 |
String title = "Alert!";
|
|
|
1027 |
|
| 25140 |
amit.gupta |
1028 |
NotifyMessage message = notifyMessageRepository.selectByNotifyId(notifytimestamp.getId());
|
|
|
1029 |
|
| 30989 |
tejbeer |
1030 |
com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(order.getRetailerId());
|
|
|
1031 |
|
|
|
1032 |
Address address = addressRepository.selectById(user.getAddressId());
|
|
|
1033 |
|
| 25851 |
amit.gupta |
1034 |
SendNotificationModel sendNotificationModel = new SendNotificationModel();
|
|
|
1035 |
sendNotificationModel.setCampaignName("Notify Partner");
|
|
|
1036 |
sendNotificationModel.setMessage(message.getNotifyMessages());
|
|
|
1037 |
sendNotificationModel.setType("url");
|
|
|
1038 |
sendNotificationModel.setTitle("Alert");
|
| 26959 |
tejbeer |
1039 |
sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/notifyOrder");
|
| 25851 |
amit.gupta |
1040 |
sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(2));
|
|
|
1041 |
sendNotificationModel.setMessageType(MessageType.notification);
|
| 25857 |
tejbeer |
1042 |
int userId = userAccountRepository.selectUserIdByRetailerId(order.getRetailerId());
|
| 25873 |
tejbeer |
1043 |
|
|
|
1044 |
sendNotificationModel.setUserIds(Arrays.asList(userId));
|
| 25851 |
amit.gupta |
1045 |
notificationService.sendNotification(sendNotificationModel);
|
| 25140 |
amit.gupta |
1046 |
|
| 31144 |
tejbeer |
1047 |
// notificationService.sendWhatsappMessage(message.getNotifyMessages(), title,
|
|
|
1048 |
// address.getPhoneNumber());
|
| 30989 |
tejbeer |
1049 |
|
| 24917 |
tejbeer |
1050 |
}
|
|
|
1051 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
1052 |
return "response";
|
|
|
1053 |
}
|
|
|
1054 |
|
|
|
1055 |
@RequestMapping(value = "/getAllNotifyOrder", method = RequestMethod.GET)
|
|
|
1056 |
public String getAllNotifyOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
| 24950 |
tejbeer |
1057 |
List<NotifyOrder> notifyOrders = null;
|
| 24917 |
tejbeer |
1058 |
List<com.spice.profitmandi.dao.entity.transaction.Order> inProcessorder = orderRepository
|
| 25067 |
tejbeer |
1059 |
.selectAllOrder(OrderStatus.SUBMITTED_FOR_PROCESSING);
|
| 24950 |
tejbeer |
1060 |
|
| 24917 |
tejbeer |
1061 |
List<Integer> orderIds = new ArrayList<>();
|
| 24950 |
tejbeer |
1062 |
if (!inProcessorder.isEmpty()) {
|
| 24917 |
tejbeer |
1063 |
for (com.spice.profitmandi.dao.entity.transaction.Order order : inProcessorder) {
|
| 24950 |
tejbeer |
1064 |
|
| 24917 |
tejbeer |
1065 |
orderIds.add(order.getId());
|
|
|
1066 |
|
| 24950 |
tejbeer |
1067 |
}
|
|
|
1068 |
notifyOrders = notifyOrderRespository.selectByorderIds(orderIds);
|
|
|
1069 |
Set<Integer> oldItemIds = new HashSet<>();
|
|
|
1070 |
List<Integer> fofoIds = new ArrayList<>();
|
|
|
1071 |
List<Integer> notifyIds = new ArrayList<>();
|
|
|
1072 |
if (!notifyOrders.isEmpty()) {
|
|
|
1073 |
for (NotifyOrder notifyOrder : notifyOrders) {
|
|
|
1074 |
oldItemIds.add(notifyOrder.getItemId());
|
|
|
1075 |
fofoIds.add(notifyOrder.getFofoId());
|
|
|
1076 |
notifyIds.add(notifyOrder.getNotifyId());
|
| 24917 |
tejbeer |
1077 |
}
|
|
|
1078 |
|
| 24950 |
tejbeer |
1079 |
List<NotifyColorChange> notifyColorChanges = notifyColorChangeRepository.selectByNotifyId(notifyIds);
|
|
|
1080 |
Map<Integer, NotifyColorChange> notifyIdNotifyColorMap = this
|
|
|
1081 |
.notifyOrdersToNotifyId(notifyColorChanges);
|
| 30426 |
tejbeer |
1082 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
|
| 30565 |
tejbeer |
1083 |
Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().distinct()
|
| 30426 |
tejbeer |
1084 |
.map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream()
|
|
|
1085 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
| 24950 |
tejbeer |
1086 |
Map<Integer, String> itemdescription = inventoryService.getItemIdDescriptionMap(oldItemIds);
|
| 24917 |
tejbeer |
1087 |
|
| 24950 |
tejbeer |
1088 |
model.addAttribute("notifyOrders", notifyOrders);
|
|
|
1089 |
model.addAttribute("notifyIdNotifyColorMap", notifyIdNotifyColorMap);
|
|
|
1090 |
model.addAttribute("itemdescription", itemdescription);
|
|
|
1091 |
model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
|
| 24917 |
tejbeer |
1092 |
|
| 24950 |
tejbeer |
1093 |
} else {
|
|
|
1094 |
model.addAttribute("notifyOrders", notifyOrders);
|
|
|
1095 |
}
|
| 24917 |
tejbeer |
1096 |
} else {
|
|
|
1097 |
model.addAttribute("notifyOrders", notifyOrders);
|
| 24950 |
tejbeer |
1098 |
}
|
| 24917 |
tejbeer |
1099 |
return "notify_order";
|
|
|
1100 |
}
|
|
|
1101 |
|
|
|
1102 |
private Map<Integer, NotifyColorChange> notifyOrdersToNotifyId(List<NotifyColorChange> notifyColorChanges) {
|
|
|
1103 |
Map<Integer, NotifyColorChange> notifyIdNotifyColorMap = new HashMap<>();
|
|
|
1104 |
for (NotifyColorChange notifyColorChange : notifyColorChanges) {
|
|
|
1105 |
notifyIdNotifyColorMap.put(notifyColorChange.getId(), notifyColorChange);
|
|
|
1106 |
}
|
|
|
1107 |
return notifyIdNotifyColorMap;
|
|
|
1108 |
}
|
|
|
1109 |
|
| 26031 |
tejbeer |
1110 |
@RequestMapping(value = "/getItems", method = RequestMethod.GET)
|
|
|
1111 |
public String getItems(HttpServletRequest request, @RequestParam int catalogItemId, Model model) throws Exception {
|
|
|
1112 |
|
|
|
1113 |
Set<Integer> itemIds = itemRepository.selectAllByCatalogItemId(catalogItemId).stream().map(x -> x.getId())
|
|
|
1114 |
.collect(Collectors.toSet());
|
|
|
1115 |
|
|
|
1116 |
List<Order> notAvailableProcessingOrder = orderRepository.selectByItemIdsOrderStatus(itemIds,
|
|
|
1117 |
OrderStatus.SUBMITTED_FOR_PROCESSING);
|
|
|
1118 |
LOGGER.info("notAvailableProcessingOrder" + notAvailableProcessingOrder);
|
|
|
1119 |
|
|
|
1120 |
List<Integer> retailerIds = new ArrayList<>();
|
|
|
1121 |
for (com.spice.profitmandi.dao.entity.transaction.Order order : notAvailableProcessingOrder) {
|
|
|
1122 |
retailerIds.add(order.getRetailerId());
|
|
|
1123 |
|
|
|
1124 |
}
|
|
|
1125 |
|
|
|
1126 |
Map<Integer, String> storeIdAndFofoIdMap = fofoStoreRepository.selectByRetailerIds(retailerIds).stream()
|
|
|
1127 |
.collect(Collectors.toMap(FofoStore::getId, FofoStore::getCode));
|
|
|
1128 |
|
|
|
1129 |
model.addAttribute("notAvailableProcessingOrder", notAvailableProcessingOrder);
|
|
|
1130 |
model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
|
|
|
1131 |
|
|
|
1132 |
return "partner-cancel-order-modal";
|
|
|
1133 |
}
|
|
|
1134 |
|
|
|
1135 |
@RequestMapping(value = "/notifyCancelOrder", method = RequestMethod.POST)
|
|
|
1136 |
public String NotifyCancelOrder(HttpServletRequest request, @RequestBody NotifyOrderModel notifyOrderModel,
|
|
|
1137 |
Model model) throws Exception {
|
|
|
1138 |
for (NotifyOrderIdModel st : notifyOrderModel.getOrderIds()) {
|
|
|
1139 |
LOGGER.info("orderId" + st.getOrderId());
|
|
|
1140 |
Order order = orderRepository.selectById(st.getOrderId());
|
| 26110 |
tejbeer |
1141 |
NotifyCancel nc = notifyCancelOrderRepository.selectByOrderId(st.getOrderId());
|
|
|
1142 |
if (nc == null) {
|
|
|
1143 |
nc = new NotifyCancel();
|
|
|
1144 |
nc.setOrderId(st.getOrderId());
|
|
|
1145 |
nc.setItemId(st.getOlditemId());
|
|
|
1146 |
nc.setFofoId(order.getRetailerId());
|
|
|
1147 |
nc.setCancellation(false);
|
|
|
1148 |
nc.setCreatedTimestamp(LocalDateTime.now());
|
|
|
1149 |
nc.setUpdatedTimestamp(LocalDateTime.now());
|
|
|
1150 |
notifyCancelOrderRepository.persist(nc);
|
|
|
1151 |
} else {
|
|
|
1152 |
nc.setOrderId(st.getOrderId());
|
|
|
1153 |
nc.setItemId(st.getOlditemId());
|
|
|
1154 |
nc.setFofoId(order.getRetailerId());
|
|
|
1155 |
nc.setCancellation(false);
|
|
|
1156 |
nc.setUpdatedTimestamp(LocalDateTime.now());
|
|
|
1157 |
notifyCancelOrderRepository.persist(nc);
|
|
|
1158 |
}
|
| 26031 |
tejbeer |
1159 |
|
|
|
1160 |
SendNotificationModel sendNotificationModel = new SendNotificationModel();
|
|
|
1161 |
sendNotificationModel.setCampaignName("Notify Partner");
|
|
|
1162 |
sendNotificationModel.setMessage(notifyOrderModel.getMessage());
|
|
|
1163 |
sendNotificationModel.setType("url");
|
|
|
1164 |
sendNotificationModel.setTitle("Alert");
|
| 26482 |
tejbeer |
1165 |
sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/notifyCancelOrder");
|
| 26031 |
tejbeer |
1166 |
sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(2));
|
|
|
1167 |
sendNotificationModel.setMessageType(MessageType.notification);
|
|
|
1168 |
int userId = userAccountRepository.selectUserIdByRetailerId(order.getRetailerId());
|
|
|
1169 |
|
|
|
1170 |
sendNotificationModel.setUserIds(Arrays.asList(userId));
|
|
|
1171 |
notificationService.sendNotification(sendNotificationModel);
|
|
|
1172 |
|
|
|
1173 |
}
|
|
|
1174 |
|
|
|
1175 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
1176 |
return "response";
|
|
|
1177 |
}
|
| 26039 |
tejbeer |
1178 |
|
|
|
1179 |
@RequestMapping(value = "/getNotifiedCancelOrder", method = RequestMethod.GET)
|
|
|
1180 |
public String getNotifiedCancelOrder(HttpServletRequest request, Model model) throws Exception {
|
|
|
1181 |
|
|
|
1182 |
List<NotifyCancel> notifyCancels = notifyCancelOrderRepository.selectAllNonCancelOrder();
|
|
|
1183 |
if (!notifyCancels.isEmpty()) {
|
|
|
1184 |
List<Integer> retailerIds = new ArrayList<>();
|
|
|
1185 |
Set<Integer> itemIds = new HashSet<>();
|
|
|
1186 |
for (NotifyCancel nc : notifyCancels) {
|
|
|
1187 |
retailerIds.add(nc.getFofoId());
|
|
|
1188 |
itemIds.add(nc.getItemId());
|
|
|
1189 |
}
|
|
|
1190 |
|
| 30426 |
tejbeer |
1191 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
|
| 26039 |
tejbeer |
1192 |
|
| 30426 |
tejbeer |
1193 |
Map<Integer, CustomRetailer> fofoIdsAndRetailerName = retailerIds.stream()
|
|
|
1194 |
.map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream()
|
|
|
1195 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
| 26039 |
tejbeer |
1196 |
Map<Integer, String> itemdescription = inventoryService.getItemIdDescriptionMap(itemIds);
|
|
|
1197 |
model.addAttribute("notifyCancels", notifyCancels);
|
|
|
1198 |
model.addAttribute("itemdescription", itemdescription);
|
|
|
1199 |
model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
|
|
|
1200 |
} else {
|
|
|
1201 |
|
|
|
1202 |
model.addAttribute("notifyCancels", notifyCancels);
|
|
|
1203 |
|
|
|
1204 |
}
|
|
|
1205 |
return "notify_cancel";
|
|
|
1206 |
}
|
|
|
1207 |
|
|
|
1208 |
@RequestMapping(value = "/getNotifyItems", method = RequestMethod.GET)
|
|
|
1209 |
public String getNotifyItems(HttpServletRequest request, @RequestParam int itemId, Model model) throws Exception {
|
|
|
1210 |
Item item = itemRepository.selectById(itemId);
|
|
|
1211 |
|
|
|
1212 |
List<Integer> itemIds = itemRepository.selectAllByCatalogItemId(item.getCatalogItemId()).stream()
|
|
|
1213 |
.map(x -> x.getId()).collect(Collectors.toList());
|
|
|
1214 |
|
|
|
1215 |
List<NotifyCancel> ncs = notifyCancelOrderRepository.selectByItemIdsAndStatus(itemIds);
|
|
|
1216 |
List<Integer> retailerIds = new ArrayList<>();
|
|
|
1217 |
Map<Integer, Object> orders = new HashMap<>();
|
|
|
1218 |
for (NotifyCancel nc : ncs) {
|
|
|
1219 |
retailerIds.add(nc.getFofoId());
|
|
|
1220 |
Order od = orderRepository.selectById(nc.getOrderId());
|
|
|
1221 |
orders.put(nc.getOrderId(), od);
|
|
|
1222 |
}
|
|
|
1223 |
|
|
|
1224 |
Map<Integer, String> storeIdAndFofoIdMap = fofoStoreRepository.selectByRetailerIds(retailerIds).stream()
|
|
|
1225 |
.collect(Collectors.toMap(FofoStore::getId, FofoStore::getCode));
|
|
|
1226 |
|
|
|
1227 |
model.addAttribute("notifyItems", ncs);
|
|
|
1228 |
model.addAttribute("orders", orders);
|
|
|
1229 |
model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
|
|
|
1230 |
|
|
|
1231 |
return "notify_cancel_order_modal";
|
|
|
1232 |
}
|
|
|
1233 |
|
|
|
1234 |
@RequestMapping(value = "/changeNotifyCancelRequest", method = RequestMethod.POST)
|
|
|
1235 |
public String changeNotifyCancelRequest(HttpServletRequest request, @RequestBody NotifyOrderModel notifyOrderModel,
|
|
|
1236 |
Model model) throws Exception {
|
|
|
1237 |
List<Integer> orderIds = notifyOrderModel.getOrderIds().stream().map(x -> x.getOrderId())
|
|
|
1238 |
.collect(Collectors.toList());
|
|
|
1239 |
|
|
|
1240 |
List<NotifyCancel> ncs = notifyCancelOrderRepository.selectByOrderIds(orderIds);
|
|
|
1241 |
for (NotifyCancel nc : ncs) {
|
|
|
1242 |
nc.setCancellation(true);
|
|
|
1243 |
}
|
|
|
1244 |
|
|
|
1245 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
1246 |
return "response";
|
|
|
1247 |
}
|
| 26482 |
tejbeer |
1248 |
|
|
|
1249 |
@RequestMapping(value = "/getProducts", method = RequestMethod.GET)
|
|
|
1250 |
public String getProducts(HttpServletRequest request, Model model)
|
|
|
1251 |
throws ProfitMandiBusinessException, URISyntaxException, IOException {
|
|
|
1252 |
|
|
|
1253 |
return "product-detail";
|
|
|
1254 |
}
|
|
|
1255 |
|
|
|
1256 |
@RequestMapping(value = "/getProductInfo", method = RequestMethod.GET)
|
|
|
1257 |
public String getProductInfo(HttpServletRequest request, long catalogId, Model model) throws Exception {
|
|
|
1258 |
ContentPojo cp = mongoClient.getEntityById(catalogId);
|
| 26493 |
tejbeer |
1259 |
model.addAttribute("cp", cp);
|
|
|
1260 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| 26482 |
tejbeer |
1261 |
return "product-info";
|
|
|
1262 |
}
|
| 26493 |
tejbeer |
1263 |
|
|
|
1264 |
@RequestMapping(value = "/getProductCompareInfo", method = RequestMethod.GET)
|
| 26512 |
amit.gupta |
1265 |
public String getProductCompareInfo(HttpServletRequest request, @RequestParam List<Long> catalogIds, Model model)
|
| 26493 |
tejbeer |
1266 |
throws Exception {
|
|
|
1267 |
List<ContentPojo> cps = new ArrayList<>();
|
| 27583 |
tejbeer |
1268 |
Set<Integer> cataogIds = catalogIds.stream().mapToInt(Long::intValue).boxed().collect(Collectors.toSet());
|
| 27596 |
tejbeer |
1269 |
LOGGER.info("tagListingMOP" + cataogIds);
|
| 26512 |
amit.gupta |
1270 |
for (Long cId : catalogIds) {
|
|
|
1271 |
ContentPojo cp = mongoClient.getEntityById(cId);
|
| 26959 |
tejbeer |
1272 |
if (cp.getName() == null) {
|
| 26512 |
amit.gupta |
1273 |
cp.setName(itemRepository.selectAllByCatalogItemId(cId.intValue()).get(0).getItemDescriptionNoColor());
|
|
|
1274 |
}
|
| 27583 |
tejbeer |
1275 |
List<Item> items = itemRepository.selectAllByCatalogItemId(cId.intValue());
|
| 27596 |
tejbeer |
1276 |
LOGGER.info("itemsMop" + items);
|
| 27618 |
tejbeer |
1277 |
int i = 0;
|
|
|
1278 |
for (Item item : items) {
|
|
|
1279 |
TagListing tagListing = tagListingRepository.selectByItemId(items.get(i).getId());
|
|
|
1280 |
|
|
|
1281 |
if (tagListing != null) {
|
|
|
1282 |
cp.setPrice(tagListing.getMop());
|
|
|
1283 |
|
|
|
1284 |
LOGGER.info("tagListingMOP" + tagListing);
|
|
|
1285 |
|
|
|
1286 |
break;
|
|
|
1287 |
|
|
|
1288 |
}
|
|
|
1289 |
i++;
|
| 27596 |
tejbeer |
1290 |
}
|
| 27618 |
tejbeer |
1291 |
cps.add(cp);
|
| 27583 |
tejbeer |
1292 |
|
| 26493 |
tejbeer |
1293 |
}
|
| 26959 |
tejbeer |
1294 |
|
| 26498 |
amit.gupta |
1295 |
List<Map<String, String>> entityList = new ArrayList<>();
|
| 26959 |
tejbeer |
1296 |
for (ContentPojo cp : cps) {
|
| 26498 |
amit.gupta |
1297 |
Map<String, String> specsMap = new HashMap<>();
|
| 26959 |
tejbeer |
1298 |
for (SpecificationGroup sg : cp.getDetailedSpecs()) {
|
| 26498 |
amit.gupta |
1299 |
String title = sg.getTitle();
|
| 26959 |
tejbeer |
1300 |
for (Specification s : sg.getSpecs()) {
|
| 26498 |
amit.gupta |
1301 |
String key = title + s.getName();
|
|
|
1302 |
specsMap.put(key, String.join(", ", s.getValues()));
|
|
|
1303 |
}
|
|
|
1304 |
}
|
|
|
1305 |
entityList.add(specsMap);
|
| 27723 |
tejbeer |
1306 |
|
| 26498 |
amit.gupta |
1307 |
}
|
| 26959 |
tejbeer |
1308 |
|
| 26493 |
tejbeer |
1309 |
LOGGER.info("cps" + cps);
|
| 26959 |
tejbeer |
1310 |
model.addAttribute("cps", cps);
|
|
|
1311 |
model.addAttribute("catalogIds", gson.toJson(catalogIds, List.class));
|
|
|
1312 |
model.addAttribute("entityList", entityList);
|
| 26493 |
tejbeer |
1313 |
return "product-compare";
|
|
|
1314 |
}
|
| 27723 |
tejbeer |
1315 |
|
|
|
1316 |
@RequestMapping(value = "/inventory", method = RequestMethod.GET)
|
|
|
1317 |
public String Inventory(HttpServletRequest request,
|
|
|
1318 |
@RequestParam(name = "warehouseIds", required = true, defaultValue = "0") List<Integer> warehouseIds,
|
|
|
1319 |
Model model) throws Exception {
|
|
|
1320 |
model.addAttribute("warehouseId", warehouseIds);
|
|
|
1321 |
LOGGER.info("warehouseIds" + warehouseIds);
|
|
|
1322 |
|
|
|
1323 |
Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
|
|
|
1324 |
if (warehouseIds.contains(0)) {
|
|
|
1325 |
warehouseIds.addAll(warehouseMap.keySet());
|
|
|
1326 |
}
|
|
|
1327 |
|
| 27739 |
tejbeer |
1328 |
long poTodayValue = 0;
|
|
|
1329 |
long poThreedaysValue = 0;
|
|
|
1330 |
long poSevendaysValue = 0;
|
|
|
1331 |
long poTodayQty = 0;
|
|
|
1332 |
long poThreedaysQty = 0;
|
|
|
1333 |
long poSevendaysQty = 0;
|
|
|
1334 |
|
| 30827 |
amit.gupta |
1335 |
List<OpenPoModel> openPO = warehousePurchaseOrderRepository.selectOpenPo(warehouseIds);
|
| 27739 |
tejbeer |
1336 |
for (OpenPoModel po : openPO) {
|
|
|
1337 |
poTodayValue += po.getTodayValue();
|
|
|
1338 |
poThreedaysValue += po.getThreedaysValue();
|
|
|
1339 |
poSevendaysValue += po.getSevendaysValue();
|
|
|
1340 |
poTodayQty += po.getTodayQty();
|
|
|
1341 |
poThreedaysQty += po.getThreedaysQty();
|
|
|
1342 |
poSevendaysQty += po.getSevendaysQty();
|
|
|
1343 |
}
|
|
|
1344 |
OpenPoModel poModel = new OpenPoModel();
|
|
|
1345 |
poModel.setBrand("Total Values");
|
|
|
1346 |
poModel.setTodayValue(poTodayValue);
|
|
|
1347 |
poModel.setThreedaysValue(poThreedaysValue);
|
|
|
1348 |
poModel.setSevendaysValue(poSevendaysValue);
|
|
|
1349 |
poModel.setSevendaysQty(poSevendaysQty);
|
|
|
1350 |
poModel.setThreedaysQty(poThreedaysQty);
|
|
|
1351 |
poModel.setTodayQty(poTodayQty);
|
|
|
1352 |
openPO.add(poModel);
|
|
|
1353 |
|
|
|
1354 |
long purtodayValue = 0;
|
|
|
1355 |
long purthreedaysValue = 0;
|
| 27749 |
tejbeer |
1356 |
long purlmsValue = 0;
|
| 27739 |
tejbeer |
1357 |
long purmtd = 0;
|
|
|
1358 |
long purtodayQty = 0;
|
|
|
1359 |
long purthreedaysQty = 0;
|
| 27749 |
tejbeer |
1360 |
long purlmsQty = 0;
|
| 27739 |
tejbeer |
1361 |
long purmtdQty = 0;
|
|
|
1362 |
|
| 27723 |
tejbeer |
1363 |
List<OurPurchaseModel> purchase = warehouseScanRepository.selectOurPurchase(warehouseIds);
|
| 27739 |
tejbeer |
1364 |
|
|
|
1365 |
for (OurPurchaseModel pm : purchase) {
|
|
|
1366 |
purtodayValue += pm.getTodayValue();
|
|
|
1367 |
purthreedaysValue += pm.getThreedaysValue();
|
| 27749 |
tejbeer |
1368 |
purlmsValue += pm.getLms();
|
| 27739 |
tejbeer |
1369 |
purmtd += pm.getMtd();
|
|
|
1370 |
purtodayQty += pm.getTodayQty();
|
| 27749 |
tejbeer |
1371 |
purthreedaysQty += pm.getThreedaysQty();
|
|
|
1372 |
purlmsQty += pm.getLmsQty();
|
| 27739 |
tejbeer |
1373 |
purmtdQty += pm.getMtdQty();
|
|
|
1374 |
}
|
|
|
1375 |
OurPurchaseModel omp = new OurPurchaseModel();
|
|
|
1376 |
omp.setBrand("Total Values");
|
|
|
1377 |
omp.setTodayValue(purtodayValue);
|
|
|
1378 |
omp.setThreedaysValue(purthreedaysValue);
|
| 27749 |
tejbeer |
1379 |
omp.setLms(purlmsValue);
|
| 27739 |
tejbeer |
1380 |
omp.setMtd(purmtd);
|
|
|
1381 |
omp.setTodayQty(purtodayQty);
|
|
|
1382 |
omp.setThreedaysQty(purthreedaysQty);
|
| 27749 |
tejbeer |
1383 |
omp.setLmsQty(purlmsQty);
|
| 27739 |
tejbeer |
1384 |
omp.setMtdQty(purmtdQty);
|
|
|
1385 |
purchase.add(omp);
|
| 27749 |
tejbeer |
1386 |
|
| 27723 |
tejbeer |
1387 |
List<BrandWiseTertiaryModel> tertiary = fofoOrderRepository.selectGroupByBrandPartnerTertiary(warehouseIds);
|
| 27739 |
tejbeer |
1388 |
long tertodayValue = 0;
|
|
|
1389 |
long terthreedaysValue = 0;
|
|
|
1390 |
long termtd = 0;
|
|
|
1391 |
long terlmtd = 0;
|
| 27749 |
tejbeer |
1392 |
long terlms = 0;
|
| 27739 |
tejbeer |
1393 |
long tertodayQty = 0;
|
|
|
1394 |
long terthreedaysQty = 0;
|
|
|
1395 |
long termtdQty = 0;
|
|
|
1396 |
long terlmtdQty = 0;
|
| 27749 |
tejbeer |
1397 |
long terlmsQty = 0;
|
| 27739 |
tejbeer |
1398 |
for (BrandWiseTertiaryModel btm : tertiary) {
|
|
|
1399 |
tertodayValue += btm.getTodayValue();
|
|
|
1400 |
terthreedaysValue += btm.getThreedaysValue();
|
|
|
1401 |
termtd += btm.getMtd();
|
|
|
1402 |
terlmtd += btm.getLmtd();
|
| 27749 |
tejbeer |
1403 |
terlms += btm.getLms();
|
| 27739 |
tejbeer |
1404 |
tertodayQty += btm.getTodayQty();
|
|
|
1405 |
terthreedaysQty += btm.getThreedaysQty();
|
|
|
1406 |
termtdQty += btm.getMtdQty();
|
|
|
1407 |
terlmtdQty += btm.getLmtdQty();
|
| 27749 |
tejbeer |
1408 |
terlmsQty += btm.getLmsQty();
|
| 27739 |
tejbeer |
1409 |
}
|
|
|
1410 |
BrandWiseTertiaryModel bwt = new BrandWiseTertiaryModel();
|
|
|
1411 |
bwt.setBrand("Total Values");
|
|
|
1412 |
bwt.setTodayValue(tertodayValue);
|
|
|
1413 |
bwt.setThreedaysValue(terthreedaysValue);
|
|
|
1414 |
bwt.setMtd(termtd);
|
|
|
1415 |
bwt.setLmtd(terlmtd);
|
| 27749 |
tejbeer |
1416 |
bwt.setLms(terlms);
|
| 27739 |
tejbeer |
1417 |
bwt.setTodayQty(tertodayQty);
|
|
|
1418 |
bwt.setThreedaysQty(terthreedaysQty);
|
|
|
1419 |
bwt.setMtdQty(termtdQty);
|
|
|
1420 |
bwt.setLmtdQty(terlmtdQty);
|
| 27749 |
tejbeer |
1421 |
bwt.setLmsQty(terlmsQty);
|
| 27739 |
tejbeer |
1422 |
tertiary.add(bwt);
|
| 27749 |
tejbeer |
1423 |
|
| 27723 |
tejbeer |
1424 |
List<SecondaryOrderBillingModel> billing = orderRepository.selectAllBilledOrderGroupByBrand(warehouseIds);
|
| 27739 |
tejbeer |
1425 |
long sectodayValue = 0;
|
|
|
1426 |
long secthreedaysValue = 0;
|
|
|
1427 |
long secmtd = 0;
|
|
|
1428 |
long seclmtd = 0;
|
| 27749 |
tejbeer |
1429 |
long seclms = 0;
|
| 27739 |
tejbeer |
1430 |
long sectodayQty = 0;
|
|
|
1431 |
long secthreedaysQty = 0;
|
|
|
1432 |
long secmtdQty = 0;
|
|
|
1433 |
long seclmtdQty = 0;
|
| 27749 |
tejbeer |
1434 |
long seclmsQty = 0;
|
| 27739 |
tejbeer |
1435 |
for (SecondaryOrderBillingModel sbm : billing) {
|
|
|
1436 |
sectodayValue += sbm.getTodayValue();
|
|
|
1437 |
secthreedaysValue += sbm.getThreedaysValue();
|
|
|
1438 |
secmtd += sbm.getMtd();
|
|
|
1439 |
seclmtd += sbm.getLmtd();
|
| 27749 |
tejbeer |
1440 |
seclms += sbm.getLms();
|
| 27739 |
tejbeer |
1441 |
sectodayQty += sbm.getTodayQty();
|
|
|
1442 |
secthreedaysQty += sbm.getThreedaysQty();
|
|
|
1443 |
secmtdQty += sbm.getMtdQty();
|
|
|
1444 |
seclmtdQty += sbm.getLmtdQty();
|
| 27749 |
tejbeer |
1445 |
seclmsQty += sbm.getLmsQty();
|
| 27739 |
tejbeer |
1446 |
}
|
|
|
1447 |
|
|
|
1448 |
SecondaryOrderBillingModel som = new SecondaryOrderBillingModel();
|
|
|
1449 |
som.setBrand("Total Values");
|
|
|
1450 |
som.setTodayValue(sectodayValue);
|
|
|
1451 |
som.setThreedaysValue(secthreedaysValue);
|
|
|
1452 |
som.setMtd(secmtd);
|
|
|
1453 |
som.setLmtd(seclmtd);
|
| 27749 |
tejbeer |
1454 |
som.setLms(seclms);
|
| 27739 |
tejbeer |
1455 |
som.setTodayQty(sectodayQty);
|
|
|
1456 |
som.setThreedaysQty(secthreedaysQty);
|
|
|
1457 |
som.setMtdQty(secmtdQty);
|
|
|
1458 |
som.setLmtdQty(seclmtdQty);
|
| 27749 |
tejbeer |
1459 |
som.setLmsQty(seclmsQty);
|
| 27739 |
tejbeer |
1460 |
billing.add(som);
|
| 27723 |
tejbeer |
1461 |
LOGGER.info("openPO" + openPO);
|
|
|
1462 |
LOGGER.info("purchase" + purchase);
|
|
|
1463 |
LOGGER.info("tertiary" + tertiary);
|
|
|
1464 |
LOGGER.info("billing" + billing);
|
|
|
1465 |
|
|
|
1466 |
LOGGER.info("warehouseIds" + warehouseIds);
|
|
|
1467 |
model.addAttribute("warehouseMap", warehouseMap);
|
|
|
1468 |
model.addAttribute("openPO", openPO);
|
|
|
1469 |
model.addAttribute("purchase", purchase);
|
|
|
1470 |
model.addAttribute("tertiary", tertiary);
|
|
|
1471 |
model.addAttribute("billing", billing);
|
|
|
1472 |
|
|
|
1473 |
return "inventory-listing";
|
|
|
1474 |
|
|
|
1475 |
}
|
| 27738 |
tejbeer |
1476 |
|
|
|
1477 |
@RequestMapping(value = "/getOpenPoItemByBrand", method = RequestMethod.GET)
|
|
|
1478 |
public String Inventory(HttpServletRequest request,
|
|
|
1479 |
@RequestParam(name = "warehouseIds", required = true, defaultValue = "0") List<Integer> warehouseIds,
|
| 27749 |
tejbeer |
1480 |
@RequestParam(name = "brand", required = true, defaultValue = "") List<String> brand, int timeValue,
|
|
|
1481 |
Model model) throws Exception {
|
| 27738 |
tejbeer |
1482 |
model.addAttribute("warehouseId", warehouseIds);
|
|
|
1483 |
LOGGER.info("warehouseIds" + warehouseIds);
|
|
|
1484 |
|
|
|
1485 |
Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
|
|
|
1486 |
if (warehouseIds.contains(0)) {
|
|
|
1487 |
warehouseIds.addAll(warehouseMap.keySet());
|
|
|
1488 |
}
|
| 27749 |
tejbeer |
1489 |
LOGGER.info("brand" + brand);
|
|
|
1490 |
|
|
|
1491 |
if (brand.contains("Total Values")) {
|
| 30827 |
amit.gupta |
1492 |
List<String> poBrands = warehousePurchaseOrderRepository.selectOpenPo(warehouseIds).stream()
|
| 27749 |
tejbeer |
1493 |
.map(x -> x.getBrand()).collect(Collectors.toList());
|
|
|
1494 |
|
|
|
1495 |
brand.addAll(poBrands);
|
|
|
1496 |
}
|
|
|
1497 |
|
|
|
1498 |
LOGGER.info("brand" + brand);
|
| 27738 |
tejbeer |
1499 |
LocalDateTime curDate = LocalDate.now().atStartOfDay();
|
|
|
1500 |
List<OpenPoItemModel> openPOItem = null;
|
|
|
1501 |
if (timeValue != 0) {
|
|
|
1502 |
openPOItem = warehousePurchaseOrderRepository.selectOpenPoItem(warehouseIds, brand,
|
|
|
1503 |
curDate.minusDays(timeValue), curDate);
|
|
|
1504 |
} else {
|
|
|
1505 |
openPOItem = warehousePurchaseOrderRepository.selectTodayOpenPoItem(warehouseIds, brand, curDate);
|
|
|
1506 |
}
|
|
|
1507 |
LOGGER.info("openPOItem" + openPOItem);
|
|
|
1508 |
|
|
|
1509 |
model.addAttribute("openPOItem", openPOItem);
|
|
|
1510 |
|
|
|
1511 |
return "inventory-listing-po-item";
|
|
|
1512 |
|
|
|
1513 |
}
|
|
|
1514 |
|
|
|
1515 |
@RequestMapping(value = "/getOurPurchaseItemByBrand", method = RequestMethod.GET)
|
|
|
1516 |
public String getOurPurchaseItemByBrand(HttpServletRequest request,
|
|
|
1517 |
@RequestParam(name = "warehouseIds", required = true, defaultValue = "0") List<Integer> warehouseIds,
|
| 27749 |
tejbeer |
1518 |
@RequestParam(name = "brand", required = true, defaultValue = "") List<String> brand, int timeValue,
|
|
|
1519 |
Model model) throws Exception {
|
| 27738 |
tejbeer |
1520 |
model.addAttribute("warehouseId", warehouseIds);
|
|
|
1521 |
LOGGER.info("warehouseIds" + warehouseIds);
|
|
|
1522 |
|
|
|
1523 |
Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
|
|
|
1524 |
if (warehouseIds.contains(0)) {
|
|
|
1525 |
warehouseIds.addAll(warehouseMap.keySet());
|
|
|
1526 |
}
|
|
|
1527 |
LocalDateTime curDate = LocalDate.now().atStartOfDay();
|
| 27749 |
tejbeer |
1528 |
|
|
|
1529 |
if (brand.contains("Total Values")) {
|
|
|
1530 |
List<String> purchasebrands = warehouseScanRepository.selectOurPurchase(warehouseIds).stream()
|
|
|
1531 |
.map(x -> x.getBrand()).collect(Collectors.toList());
|
|
|
1532 |
|
|
|
1533 |
brand.addAll(purchasebrands);
|
|
|
1534 |
}
|
| 27738 |
tejbeer |
1535 |
List<OurPurchaseItemModel> ourPurchaseItem = null;
|
|
|
1536 |
if (timeValue != 0) {
|
| 27749 |
tejbeer |
1537 |
if (timeValue == 1) {
|
| 27738 |
tejbeer |
1538 |
ourPurchaseItem = warehouseScanRepository.selectOurPurchaseItemByBrand(warehouseIds, brand,
|
| 27749 |
tejbeer |
1539 |
curDate.withDayOfMonth(1), curDate.plusDays(1));
|
|
|
1540 |
|
|
|
1541 |
} else if (timeValue == -1) {
|
|
|
1542 |
|
|
|
1543 |
ourPurchaseItem = warehouseScanRepository.selectOurPurchaseItemByBrand(warehouseIds, brand,
|
|
|
1544 |
curDate.minusMonths(1).withDayOfMonth(1), curDate.withDayOfMonth(1));
|
|
|
1545 |
|
| 27738 |
tejbeer |
1546 |
} else {
|
|
|
1547 |
ourPurchaseItem = warehouseScanRepository.selectOurPurchaseItemByBrand(warehouseIds, brand,
|
| 27749 |
tejbeer |
1548 |
curDate.minusDays(timeValue), curDate);
|
|
|
1549 |
|
| 27738 |
tejbeer |
1550 |
}
|
|
|
1551 |
} else {
|
|
|
1552 |
ourPurchaseItem = warehouseScanRepository.selectTodayOurPurchaseItemByBrand(warehouseIds, brand, curDate);
|
|
|
1553 |
}
|
|
|
1554 |
LOGGER.info("ourPurchaseItem" + ourPurchaseItem);
|
|
|
1555 |
|
|
|
1556 |
model.addAttribute("ourPurchaseItem", ourPurchaseItem);
|
| 27749 |
tejbeer |
1557 |
model.addAttribute("warehouseMap", warehouseMap);
|
| 27738 |
tejbeer |
1558 |
|
|
|
1559 |
return "inventory-listing-purchase-item";
|
|
|
1560 |
|
|
|
1561 |
}
|
|
|
1562 |
|
| 27867 |
tejbeer |
1563 |
@RequestMapping(value = "/getWarehouseWiseSecondaryBillingByBrand", method = RequestMethod.GET)
|
|
|
1564 |
public String getWarehouseWiseSecondaryBillingByBrand(HttpServletRequest request,
|
|
|
1565 |
@RequestParam(name = "brand", required = true, defaultValue = "") String brand, int timeValue, Model model)
|
|
|
1566 |
throws Exception {
|
| 27738 |
tejbeer |
1567 |
|
|
|
1568 |
LocalDateTime curDate = LocalDate.now().atStartOfDay();
|
| 27749 |
tejbeer |
1569 |
int dayOfMonth = curDate.getDayOfMonth();
|
|
|
1570 |
LocalDateTime startOfMonth = curDate.withDayOfMonth(1);
|
|
|
1571 |
int lengthOfMonth = YearMonth.from(startOfMonth.minusMonths(1)).lengthOfMonth();
|
|
|
1572 |
|
| 27867 |
tejbeer |
1573 |
Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
|
|
|
1574 |
SecondaeryOrderDateRange sr = null;
|
|
|
1575 |
if (brand.equals("Total Values")) {
|
|
|
1576 |
brand = null;
|
| 27749 |
tejbeer |
1577 |
}
|
| 27738 |
tejbeer |
1578 |
if (timeValue != 0) {
|
|
|
1579 |
if (timeValue == 1) {
|
|
|
1580 |
|
| 27867 |
tejbeer |
1581 |
sr = getSecondaryModel(brand, curDate.withDayOfMonth(1), curDate.plusDays(1));
|
|
|
1582 |
|
| 27738 |
tejbeer |
1583 |
} else if (timeValue == 2) {
|
| 27749 |
tejbeer |
1584 |
LOGGER.info("curDate" + curDate.withDayOfMonth(1).minusMonths(1));
|
|
|
1585 |
LOGGER.info("curDate" + curDate.minusMonths(1).plusDays(Math.min(dayOfMonth, lengthOfMonth)));
|
|
|
1586 |
|
| 27867 |
tejbeer |
1587 |
sr = getSecondaryModel(brand, curDate.withDayOfMonth(1).minusMonths(1),
|
| 27749 |
tejbeer |
1588 |
startOfMonth.minusMonths(1).plusDays(Math.min(dayOfMonth, lengthOfMonth)));
|
| 27867 |
tejbeer |
1589 |
|
| 27749 |
tejbeer |
1590 |
} else if (timeValue == -1) {
|
| 27867 |
tejbeer |
1591 |
|
|
|
1592 |
sr = getSecondaryModel(brand, curDate.minusMonths(1).withDayOfMonth(1), startOfMonth);
|
|
|
1593 |
|
| 27749 |
tejbeer |
1594 |
} else {
|
| 27738 |
tejbeer |
1595 |
|
| 27867 |
tejbeer |
1596 |
sr = getSecondaryModel(brand, curDate.minusDays(timeValue), curDate);
|
| 27738 |
tejbeer |
1597 |
}
|
|
|
1598 |
|
|
|
1599 |
} else {
|
| 27867 |
tejbeer |
1600 |
sr = getSecondaryModel(brand, curDate, curDate.plusDays(1));
|
| 27738 |
tejbeer |
1601 |
}
|
|
|
1602 |
|
| 27867 |
tejbeer |
1603 |
Map<BrandRegionModel, Map<LocalDate, SecondaryWarehouseWiseOrderBilllingModel>> brandWarehouseOrderMap = sr
|
|
|
1604 |
.getSecondaryModel().stream()
|
|
|
1605 |
.collect(Collectors.groupingBy(x -> new BrandRegionModel(x.getWarehouseId(), x.getBrand()),
|
|
|
1606 |
Collectors.collectingAndThen(Collectors.toList(),
|
|
|
1607 |
x -> x.stream().collect(Collectors.toMap(y -> y.getBillingTimestamp(), y -> y)))));
|
| 27738 |
tejbeer |
1608 |
|
| 27893 |
tejbeer |
1609 |
Map<LocalDate, Integer> dateWiseTotal = sr.getSecondaryModel().stream().collect(
|
|
|
1610 |
Collectors.groupingBy(x -> x.getBillingTimestamp(), Collectors.summingInt(x -> (int) x.getValue())));
|
|
|
1611 |
|
|
|
1612 |
Map<LocalDate, Integer> dateWiseQtyTotal = sr.getSecondaryModel().stream().collect(
|
|
|
1613 |
Collectors.groupingBy(x -> x.getBillingTimestamp(), Collectors.summingInt(x -> (int) x.getQty())));
|
|
|
1614 |
|
|
|
1615 |
LOGGER.info("dateWiseTotal" + dateWiseTotal);
|
|
|
1616 |
|
| 27867 |
tejbeer |
1617 |
brandWarehouseOrderMap.entrySet().stream().forEach(x -> {
|
| 27893 |
tejbeer |
1618 |
x.getKey().setTotal(x.getValue().entrySet().stream()
|
|
|
1619 |
.collect(Collectors.summingInt(y -> (int) y.getValue().getValue())));
|
| 27867 |
tejbeer |
1620 |
});
|
|
|
1621 |
|
| 27893 |
tejbeer |
1622 |
brandWarehouseOrderMap.entrySet().stream().forEach(x -> {
|
|
|
1623 |
x.getKey().setQty(
|
|
|
1624 |
x.getValue().entrySet().stream().collect(Collectors.summingInt(y -> (int) y.getValue().getQty())));
|
|
|
1625 |
});
|
| 27867 |
tejbeer |
1626 |
LOGGER.info("brandWarehouseOrderMap" + brandWarehouseOrderMap);
|
|
|
1627 |
|
|
|
1628 |
model.addAttribute("brandWarehouseOrderMap", brandWarehouseOrderMap);
|
| 27893 |
tejbeer |
1629 |
model.addAttribute("dateWiseTotal", dateWiseTotal);
|
|
|
1630 |
model.addAttribute("dateWiseQtyTotal", dateWiseQtyTotal);
|
| 27867 |
tejbeer |
1631 |
model.addAttribute("dateRange", sr.getDateRange());
|
|
|
1632 |
model.addAttribute("warehouseMap", warehouseMap);
|
|
|
1633 |
return "secondary-warehouse-billing-order";
|
|
|
1634 |
|
|
|
1635 |
}
|
|
|
1636 |
|
|
|
1637 |
public SecondaeryOrderDateRange getSecondaryModel(String brand, LocalDateTime startDate, LocalDateTime endDate) {
|
|
|
1638 |
|
|
|
1639 |
SecondaeryOrderDateRange sr = new SecondaeryOrderDateRange();
|
|
|
1640 |
List<SecondaryWarehouseWiseOrderBilllingModel> secondaryOrderbilling = orderRepository
|
|
|
1641 |
.selectAllBilledOrderGroupByBrandWarehouse(brand, startDate, endDate).stream()
|
|
|
1642 |
.sorted(Comparator.comparing(SecondaryWarehouseWiseOrderBilllingModel::getBillingTimestamp))
|
|
|
1643 |
.collect(Collectors.toList());
|
|
|
1644 |
long noOfDaysBetween = ChronoUnit.DAYS.between(startDate, endDate);
|
|
|
1645 |
|
|
|
1646 |
List<LocalDate> dateRange = Stream.iterate(startDate.toLocalDate(), date -> date.plusDays(1))
|
|
|
1647 |
.limit(noOfDaysBetween).collect(Collectors.toList());
|
|
|
1648 |
|
|
|
1649 |
sr.setDateRange(dateRange);
|
|
|
1650 |
sr.setSecondaryModel(secondaryOrderbilling);
|
|
|
1651 |
|
|
|
1652 |
return sr;
|
|
|
1653 |
|
|
|
1654 |
}
|
|
|
1655 |
|
|
|
1656 |
@RequestMapping(value = "/getSecondaryBillingItemByBrand", method = RequestMethod.GET)
|
|
|
1657 |
public String getSecondaryBillingItemByBrand(HttpServletRequest request,
|
|
|
1658 |
@RequestParam(name = "warehouseId", required = true, defaultValue = "0") int warehouseId,
|
|
|
1659 |
@RequestParam(name = "brand", required = true, defaultValue = "") String brand,
|
| 27893 |
tejbeer |
1660 |
@RequestParam List<LocalDate> date, Model model) throws Exception {
|
| 27867 |
tejbeer |
1661 |
|
|
|
1662 |
List<SecondaryOrderItemBillingModel> orderItemBilling = orderRepository
|
|
|
1663 |
.selectAllBilledOrderItemByBrand(warehouseId, brand, date);
|
|
|
1664 |
|
|
|
1665 |
LOGGER.info("orderItemBilling" + orderItemBilling);
|
|
|
1666 |
model.addAttribute("billedItem", orderItemBilling);
|
|
|
1667 |
model.addAttribute("date", date);
|
|
|
1668 |
model.addAttribute("brand", brand);
|
| 27738 |
tejbeer |
1669 |
return "inventory-listing-billing-item";
|
|
|
1670 |
|
|
|
1671 |
}
|
|
|
1672 |
|
|
|
1673 |
@RequestMapping(value = "/getPartnerTertiaryItemByBrand", method = RequestMethod.GET)
|
|
|
1674 |
public String getPartnerTertiaryItemByBrand(HttpServletRequest request,
|
|
|
1675 |
@RequestParam(name = "warehouseIds", required = true, defaultValue = "0") List<Integer> warehouseIds,
|
| 27749 |
tejbeer |
1676 |
@RequestParam(name = "brand", required = true, defaultValue = "") List<String> brand, int timeValue,
|
|
|
1677 |
Model model) throws Exception {
|
| 27738 |
tejbeer |
1678 |
model.addAttribute("warehouseId", warehouseIds);
|
|
|
1679 |
LOGGER.info("warehouseIds" + warehouseIds);
|
|
|
1680 |
|
|
|
1681 |
Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
|
|
|
1682 |
if (warehouseIds.contains(0)) {
|
|
|
1683 |
warehouseIds.addAll(warehouseMap.keySet());
|
|
|
1684 |
}
|
|
|
1685 |
LocalDateTime curDate = LocalDate.now().atStartOfDay();
|
|
|
1686 |
int dayOfMonth = curDate.getDayOfMonth();
|
|
|
1687 |
LocalDateTime startOfMonth = curDate.withDayOfMonth(1);
|
| 27749 |
tejbeer |
1688 |
int lengthOfMonth = YearMonth.from(startOfMonth.minusMonths(1)).lengthOfMonth();
|
|
|
1689 |
if (brand.contains("Total Values")) {
|
|
|
1690 |
List<String> tertiaryBrands = fofoOrderRepository.selectGroupByBrandPartnerTertiary(warehouseIds).stream()
|
|
|
1691 |
.map(x -> x.getBrand()).collect(Collectors.toList());
|
| 27738 |
tejbeer |
1692 |
|
| 27749 |
tejbeer |
1693 |
brand.addAll(tertiaryBrands);
|
|
|
1694 |
}
|
| 27738 |
tejbeer |
1695 |
List<BrandItemWiseTertiaryModel> tertiaryItem = null;
|
|
|
1696 |
if (timeValue != 0) {
|
|
|
1697 |
if (timeValue == 1) {
|
| 27749 |
tejbeer |
1698 |
|
| 27738 |
tejbeer |
1699 |
tertiaryItem = fofoOrderRepository.selectItemPartnerTertiaryByBrand(warehouseIds, brand,
|
|
|
1700 |
curDate.withDayOfMonth(1), curDate.plusDays(1));
|
|
|
1701 |
|
|
|
1702 |
} else if (timeValue == 2) {
|
| 27749 |
tejbeer |
1703 |
LOGGER.info("curDate" + startOfMonth.minusMonths(1));
|
|
|
1704 |
LOGGER.info("curDate" + startOfMonth.minusMonths(1).plusDays(Math.min(dayOfMonth, lengthOfMonth)));
|
| 27738 |
tejbeer |
1705 |
|
|
|
1706 |
tertiaryItem = fofoOrderRepository.selectItemPartnerTertiaryByBrand(warehouseIds, brand,
|
| 27749 |
tejbeer |
1707 |
startOfMonth.minusMonths(1),
|
| 27738 |
tejbeer |
1708 |
startOfMonth.minusMonths(1).plusDays(Math.min(dayOfMonth, lengthOfMonth)));
|
|
|
1709 |
|
| 27749 |
tejbeer |
1710 |
} else if (timeValue == -1) {
|
|
|
1711 |
LOGGER.info("date" + curDate.minusMonths(1).withDayOfMonth(1));
|
|
|
1712 |
LOGGER.info("date" + curDate.minusMonths(1).withDayOfMonth(lengthOfMonth).plusDays(1));
|
|
|
1713 |
|
|
|
1714 |
tertiaryItem = fofoOrderRepository.selectItemPartnerTertiaryByBrand(warehouseIds, brand,
|
|
|
1715 |
curDate.minusMonths(1).withDayOfMonth(1), startOfMonth);
|
| 27738 |
tejbeer |
1716 |
} else {
|
|
|
1717 |
tertiaryItem = fofoOrderRepository.selectItemPartnerTertiaryByBrand(warehouseIds, brand,
|
|
|
1718 |
curDate.minusDays(timeValue), curDate);
|
|
|
1719 |
}
|
|
|
1720 |
|
|
|
1721 |
} else {
|
|
|
1722 |
tertiaryItem = fofoOrderRepository.selectTodayItemPartnerTertiaryByBrand(warehouseIds, brand, curDate);
|
|
|
1723 |
}
|
|
|
1724 |
LOGGER.info("tertiaryItem" + tertiaryItem);
|
|
|
1725 |
|
|
|
1726 |
model.addAttribute("tertiaryItem", tertiaryItem);
|
|
|
1727 |
|
|
|
1728 |
return "inventory-item-tertiary-item";
|
|
|
1729 |
|
|
|
1730 |
}
|
| 28701 |
tejbeer |
1731 |
|
|
|
1732 |
@RequestMapping(value = "/planogram")
|
|
|
1733 |
public String Planogram(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
|
|
1734 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
|
|
1735 |
String email = loginDetails.getEmailId();
|
|
|
1736 |
AuthUser authUser = authRepository.selectByEmailOrMobile(email);
|
|
|
1737 |
List<FocusedModelByPassRequest> byPassRequest = null;
|
|
|
1738 |
Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
|
|
|
1739 |
|
|
|
1740 |
Set<Integer> authfofoIds = null;
|
|
|
1741 |
|
|
|
1742 |
List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
|
|
|
1743 |
|
|
|
1744 |
if (emails.contains(authUser.getEmailId())) {
|
|
|
1745 |
authfofoIds = storeGuyMap.get("tarun.verma@smartdukaan.com");
|
|
|
1746 |
LOGGER.info("fofoIds" + authfofoIds);
|
|
|
1747 |
} else {
|
|
|
1748 |
|
|
|
1749 |
for (Position ps : positions) {
|
|
|
1750 |
if (esclationType.contains(ps.getEscalationType())) {
|
|
|
1751 |
authfofoIds = storeGuyMap.get(email);
|
|
|
1752 |
break;
|
|
|
1753 |
}
|
|
|
1754 |
|
|
|
1755 |
}
|
|
|
1756 |
}
|
|
|
1757 |
if (authfofoIds != null) {
|
|
|
1758 |
byPassRequest = focusedModelByPassRepository.selectByStatusAndFofoIds(new ArrayList<>(authfofoIds),
|
|
|
1759 |
ByPassRequestStatus.PENDING);
|
|
|
1760 |
}
|
|
|
1761 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
|
|
|
1762 |
model.addAttribute("customRetailerMap", customRetailerMap);
|
|
|
1763 |
model.addAttribute("byPassRequest", byPassRequest);
|
|
|
1764 |
return "planogram";
|
|
|
1765 |
}
|
|
|
1766 |
|
|
|
1767 |
@RequestMapping(value = "/byPassRequestAction", method = RequestMethod.PUT)
|
|
|
1768 |
public String addAmountToWalletRequestRejected(HttpServletRequest request,
|
|
|
1769 |
@RequestParam(name = "id", defaultValue = "0") int id, @RequestParam ByPassRequestStatus status,
|
| 30244 |
tejbeer |
1770 |
@RequestParam(name = "reason", required = false) String reason, Model model) throws Exception {
|
| 28701 |
tejbeer |
1771 |
|
|
|
1772 |
FocusedModelByPassRequest byPassRequest = focusedModelByPassRepository.selectById(id);
|
|
|
1773 |
if (status.equals(ByPassRequestStatus.APPROVED)) {
|
|
|
1774 |
byPassRequest.setByPass(true);
|
|
|
1775 |
byPassRequest.setStatus(ByPassRequestStatus.APPROVED);
|
|
|
1776 |
byPassRequest.setUpdatedTimestamp(LocalDateTime.now());
|
| 29707 |
tejbeer |
1777 |
byPassRequest.setReason(reason);
|
| 28701 |
tejbeer |
1778 |
} else if (status.equals(ByPassRequestStatus.REJECTED)) {
|
|
|
1779 |
byPassRequest.setByPass(false);
|
|
|
1780 |
byPassRequest.setStatus(ByPassRequestStatus.REJECTED);
|
|
|
1781 |
byPassRequest.setUpdatedTimestamp(LocalDateTime.now());
|
| 29707 |
tejbeer |
1782 |
byPassRequest.setReason(reason);
|
| 28701 |
tejbeer |
1783 |
}
|
|
|
1784 |
|
| 30989 |
tejbeer |
1785 |
com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(byPassRequest.getFofoId());
|
|
|
1786 |
|
|
|
1787 |
Address address = addressRepository.selectById(user.getAddressId());
|
|
|
1788 |
|
|
|
1789 |
String title = "Billing Request";
|
|
|
1790 |
|
|
|
1791 |
String message = String.format("Your Billing Request is " + status
|
|
|
1792 |
+ ". Please ensure to order the missing focus models as soon as possible.");
|
|
|
1793 |
|
| 28701 |
tejbeer |
1794 |
SendNotificationModel sendNotificationModel = new SendNotificationModel();
|
| 28714 |
tejbeer |
1795 |
sendNotificationModel.setCampaignName("Billing Request");
|
| 30989 |
tejbeer |
1796 |
sendNotificationModel.setTitle(title);
|
|
|
1797 |
sendNotificationModel.setMessage(message);
|
| 28701 |
tejbeer |
1798 |
sendNotificationModel.setType("url");
|
|
|
1799 |
sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/notifications");
|
|
|
1800 |
sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(1));
|
|
|
1801 |
sendNotificationModel.setMessageType(MessageType.notification);
|
|
|
1802 |
sendNotificationModel
|
|
|
1803 |
.setUserIds(Arrays.asList(userAccountRepository.selectUserIdByRetailerId(byPassRequest.getFofoId())));
|
|
|
1804 |
|
|
|
1805 |
notificationService.sendNotification(sendNotificationModel);
|
|
|
1806 |
|
| 30989 |
tejbeer |
1807 |
notificationService.sendWhatsappMessage(message, title, address.getPhoneNumber());
|
|
|
1808 |
|
| 28701 |
tejbeer |
1809 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
1810 |
return "response";
|
|
|
1811 |
}
|
|
|
1812 |
|
| 28754 |
tejbeer |
1813 |
@RequestMapping(value = "/highDemandItem", method = RequestMethod.GET)
|
|
|
1814 |
public String highDemandItem(HttpServletRequest request, Model model) throws Exception {
|
|
|
1815 |
List<HighDemandItem> hdis = highDemandItemsRepository.selectAll();
|
|
|
1816 |
if (!hdis.isEmpty()) {
|
|
|
1817 |
Map<Integer, Item> itemMap = this.getItemByCatalogId(hdis);
|
|
|
1818 |
model.addAttribute("itemMap", itemMap);
|
|
|
1819 |
}
|
|
|
1820 |
|
|
|
1821 |
model.addAttribute("hdis", hdis);
|
|
|
1822 |
|
|
|
1823 |
return "high_demand_item";
|
|
|
1824 |
}
|
|
|
1825 |
|
|
|
1826 |
private Map<Integer, Item> getItemByCatalogId(List<HighDemandItem> hdis) {
|
|
|
1827 |
Map<Integer, Item> itemMap = new HashMap<>();
|
|
|
1828 |
for (HighDemandItem hdi : hdis) {
|
|
|
1829 |
List<Item> items = itemRepository.selectAllByCatalogItemId(hdi.getCatalogId());
|
|
|
1830 |
itemMap.put(items.get(0).getCatalogItemId(), items.get(0));
|
|
|
1831 |
}
|
|
|
1832 |
|
|
|
1833 |
return itemMap;
|
|
|
1834 |
}
|
|
|
1835 |
|
|
|
1836 |
@RequestMapping(value = "/addHighDemandItem", method = RequestMethod.POST)
|
|
|
1837 |
public String addHighDemandItem(HttpServletRequest request, @RequestParam int catalogId, @RequestParam int qty,
|
|
|
1838 |
Model model) throws Exception {
|
|
|
1839 |
HighDemandItem hdi = highDemandItemsRepository.selectByFofoIdAndCatalogId(catalogId);
|
|
|
1840 |
|
|
|
1841 |
if (hdi == null) {
|
|
|
1842 |
hdi = new HighDemandItem();
|
|
|
1843 |
hdi.setCatalogId(catalogId);
|
|
|
1844 |
hdi.setQty(qty);
|
|
|
1845 |
hdi.setCreateTimestamp(LocalDateTime.now());
|
|
|
1846 |
hdi.setUpdateTimestamp(LocalDateTime.now());
|
|
|
1847 |
highDemandItemsRepository.persist(hdi);
|
|
|
1848 |
}
|
|
|
1849 |
|
|
|
1850 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
1851 |
return "response";
|
|
|
1852 |
}
|
|
|
1853 |
|
|
|
1854 |
@RequestMapping(value = "/removeHighDemandItem", method = RequestMethod.DELETE)
|
|
|
1855 |
public String removeHighDemandItem(HttpServletRequest request,
|
|
|
1856 |
@RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
|
|
|
1857 |
highDemandItemsRepository.deleteById(id);
|
|
|
1858 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
1859 |
return "response";
|
|
|
1860 |
}
|
|
|
1861 |
|
| 28795 |
tejbeer |
1862 |
@GetMapping(value = "/imei")
|
|
|
1863 |
public String getImei(HttpServletRequest request, Model model, @RequestParam int fofoId, @RequestParam String query)
|
|
|
1864 |
throws Exception {
|
|
|
1865 |
|
|
|
1866 |
List<String> serialNumber = inventoryItemRepository.selectAllByFofoId(fofoId, query).stream()
|
|
|
1867 |
.map(x -> x.getSerialNumber()).collect(Collectors.toList());
|
|
|
1868 |
LOGGER.info("serialNumber" + serialNumber);
|
|
|
1869 |
LOGGER.info("query" + query);
|
|
|
1870 |
|
|
|
1871 |
model.addAttribute("response", mvcResponseSender.createResponseString(serialNumber));
|
|
|
1872 |
|
|
|
1873 |
return "response";
|
|
|
1874 |
}
|
|
|
1875 |
|
| 30039 |
tejbeer |
1876 |
@Autowired
|
|
|
1877 |
private ObjectMapper objectMapper;
|
|
|
1878 |
|
|
|
1879 |
@RequestMapping(value = "/imei/validate", method = RequestMethod.GET)
|
| 30040 |
tejbeer |
1880 |
public String validateImei(HttpServletRequest request, @RequestParam String imei, Model model) throws Exception {
|
| 30039 |
tejbeer |
1881 |
boolean isImei = false;
|
|
|
1882 |
|
| 30041 |
tejbeer |
1883 |
try {
|
| 30040 |
tejbeer |
1884 |
InventoryItem inventoryItem = inventoryItemRepository.selectBySerialNumber(imei);
|
| 30244 |
tejbeer |
1885 |
|
| 30041 |
tejbeer |
1886 |
isImei = true;
|
| 30039 |
tejbeer |
1887 |
|
| 30041 |
tejbeer |
1888 |
} catch (Exception e) {
|
|
|
1889 |
isImei = false;
|
| 30039 |
tejbeer |
1890 |
}
|
|
|
1891 |
|
|
|
1892 |
model.addAttribute("response", objectMapper.writeValueAsString(isImei));
|
|
|
1893 |
return "response";
|
|
|
1894 |
}
|
|
|
1895 |
|
| 30683 |
tejbeer |
1896 |
@RequestMapping(value = "/createCombo", method = RequestMethod.GET)
|
|
|
1897 |
public String createCombo(HttpServletRequest request, Model model) throws Exception {
|
|
|
1898 |
|
|
|
1899 |
Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
|
|
|
1900 |
|
|
|
1901 |
List<ComboModel> comboModels = comboModelRepository.selectAll();
|
|
|
1902 |
|
|
|
1903 |
model.addAttribute("warehouseMap", warehouseMap);
|
|
|
1904 |
model.addAttribute("comboModels", comboModels);
|
|
|
1905 |
return "create-combo";
|
|
|
1906 |
}
|
|
|
1907 |
|
|
|
1908 |
@RequestMapping(value = "/addCombo", method = RequestMethod.POST)
|
|
|
1909 |
public String addCombo(HttpServletRequest request, @RequestBody Combo combo, Model model) throws Exception {
|
|
|
1910 |
|
|
|
1911 |
for (Integer warehouseId : combo.getWarehouseId()) {
|
|
|
1912 |
|
|
|
1913 |
ComboModel comboModel = comboModelRepository.selectByCatalogIdWarehouseIdAndQty(combo.getCatalogId(),
|
|
|
1914 |
warehouseId, combo.getQty());
|
|
|
1915 |
if (comboModel != null) {
|
|
|
1916 |
List<ComboMappedModel> comboMappedModels = comboMappedModelRepository
|
|
|
1917 |
.selectByComboId(comboModel.getId());
|
|
|
1918 |
for (ComboMappedModel comboMappedModel : comboMappedModels) {
|
|
|
1919 |
comboMappedModelRepository.delete(comboMappedModel);
|
|
|
1920 |
}
|
|
|
1921 |
|
|
|
1922 |
comboModelRepository.delete(comboModel);
|
|
|
1923 |
}
|
|
|
1924 |
ComboModel cm = new ComboModel();
|
|
|
1925 |
cm.setCatalogId(combo.getCatalogId());
|
|
|
1926 |
cm.setQty(combo.getQty());
|
|
|
1927 |
cm.setWarehouseId(warehouseId);
|
|
|
1928 |
comboModelRepository.persist(cm);
|
|
|
1929 |
|
|
|
1930 |
LOGGER.info("cm" + cm);
|
|
|
1931 |
|
|
|
1932 |
for (MappedComboModel mcc : combo.getMappedComboModel()) {
|
|
|
1933 |
ComboMappedModel cmm = new ComboMappedModel();
|
|
|
1934 |
cmm.setComboCatalogId(mcc.getCatalogId());
|
|
|
1935 |
cmm.setComboQty(mcc.getQty());
|
|
|
1936 |
cmm.setComboId(cm.getId());
|
|
|
1937 |
comboMappedModelRepository.persist(cmm);
|
|
|
1938 |
|
|
|
1939 |
}
|
|
|
1940 |
|
|
|
1941 |
}
|
|
|
1942 |
|
|
|
1943 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
1944 |
|
|
|
1945 |
return "response";
|
|
|
1946 |
|
|
|
1947 |
}
|
|
|
1948 |
|
|
|
1949 |
@RequestMapping(value = "/combo/remove", method = RequestMethod.POST)
|
|
|
1950 |
public String removeCombo(HttpServletRequest request, @RequestParam int id, Model model) throws Exception {
|
|
|
1951 |
comboMappedModelRepository.deleteByEquals(id);
|
|
|
1952 |
comboModelRepository.deleteById(id);
|
|
|
1953 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
|
|
1954 |
|
|
|
1955 |
return "response";
|
|
|
1956 |
|
|
|
1957 |
}
|
| 27867 |
tejbeer |
1958 |
}
|