| Line 48... |
Line 48... |
| 48 |
import com.spice.profitmandi.dao.repository.fofo.SchemeInOutRepository;
|
48 |
import com.spice.profitmandi.dao.repository.fofo.SchemeInOutRepository;
|
| 49 |
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
|
49 |
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
|
| 50 |
import com.spice.profitmandi.dao.repository.transaction.ReturnOrderRepository;
|
50 |
import com.spice.profitmandi.dao.repository.transaction.ReturnOrderRepository;
|
| 51 |
import com.spice.profitmandi.dao.repository.transaction.UserWalletHistoryRepository;
|
51 |
import com.spice.profitmandi.dao.repository.transaction.UserWalletHistoryRepository;
|
| 52 |
import com.spice.profitmandi.dao.repository.transaction.UserWalletRepository;
|
52 |
import com.spice.profitmandi.dao.repository.transaction.UserWalletRepository;
|
| - |
|
53 |
import com.spice.profitmandi.service.order.OrderService;
|
| 53 |
import com.spice.profitmandi.service.user.RetailerService;
|
54 |
import com.spice.profitmandi.service.user.RetailerService;
|
| 54 |
|
55 |
|
| 55 |
import in.shop2020.model.v1.order.OrderStatus;
|
56 |
import in.shop2020.model.v1.order.OrderStatus;
|
| 56 |
import in.shop2020.model.v1.order.WalletReferenceType;
|
57 |
import in.shop2020.model.v1.order.WalletReferenceType;
|
| 57 |
|
58 |
|
| Line 66... |
Line 67... |
| 66 |
|
67 |
|
| 67 |
@Autowired
|
68 |
@Autowired
|
| 68 |
private PurchaseRepository purchaseRepository;
|
69 |
private PurchaseRepository purchaseRepository;
|
| 69 |
|
70 |
|
| 70 |
@Autowired
|
71 |
@Autowired
|
| - |
|
72 |
private OrderService orderService;
|
| - |
|
73 |
|
| - |
|
74 |
@Autowired
|
| 71 |
private FofoOrderItemRepository fofoOrderItemRepository;
|
75 |
private FofoOrderItemRepository fofoOrderItemRepository;
|
| 72 |
@Autowired
|
76 |
@Autowired
|
| 73 |
private FofoLineItemRepository fofoLineItemRepository;
|
77 |
private FofoLineItemRepository fofoLineItemRepository;
|
| 74 |
@Autowired
|
78 |
@Autowired
|
| 75 |
private UserWalletRepository userWalletRepository;
|
79 |
private UserWalletRepository userWalletRepository;
|
| Line 309... |
Line 313... |
| 309 |
.filter(x -> x.getType().equals(ScanType.SALE)).sorted((x1,x2)->x1.getId() - x2.getId()).collect(Collectors.toList()).get(0);
|
313 |
.filter(x -> x.getType().equals(ScanType.SALE)).sorted((x1,x2)->x1.getId() - x2.getId()).collect(Collectors.toList()).get(0);
|
| 310 |
if (outRecord.getCreateTimestamp().isAfter(scheme.getExpireTimestamp())) {
|
314 |
if (outRecord.getCreateTimestamp().isAfter(scheme.getExpireTimestamp())) {
|
| 311 |
InventoryItem ii = inventoryItemRepository.selectById(outRecord.getInventoryItemId());
|
315 |
InventoryItem ii = inventoryItemRepository.selectById(outRecord.getInventoryItemId());
|
| 312 |
FofoOrder fofoOrder;
|
316 |
FofoOrder fofoOrder;
|
| 313 |
if(outRecord.getOrderId()==0) {
|
317 |
if(outRecord.getOrderId()==0) {
|
| 314 |
LOGGER.info("Order Id found 0 {}", outRecord.getCreateTimestamp());
|
318 |
fofoOrder = orderService.getOrderByInventoryItemId(ii.getId());
|
| 315 |
continue;
|
- |
|
| 316 |
} else {
|
319 |
} else {
|
| 317 |
fofoOrder = fofoOrderRepository.selectByOrderId(outRecord.getOrderId());
|
320 |
fofoOrder = fofoOrderRepository.selectByOrderId(outRecord.getOrderId());
|
| 318 |
if(fofoOrder==null) {
|
321 |
if(fofoOrder==null) {
|
| 319 |
LOGGER.info("Order id does not exits - {}", outRecord.getOrderId());
|
322 |
LOGGER.info("Order id does not exits - {}", outRecord.getOrderId());
|
| 320 |
continue;
|
323 |
continue;
|