| Line 29... |
Line 29... |
| 29 |
import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
|
29 |
import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
|
| 30 |
import com.spice.profitmandi.dao.entity.fofo.FofoOrderItem;
|
30 |
import com.spice.profitmandi.dao.entity.fofo.FofoOrderItem;
|
| 31 |
import com.spice.profitmandi.dao.entity.fofo.HygieneData;
|
31 |
import com.spice.profitmandi.dao.entity.fofo.HygieneData;
|
| 32 |
import com.spice.profitmandi.dao.repository.catalog.HygieneDataModel;
|
32 |
import com.spice.profitmandi.dao.repository.catalog.HygieneDataModel;
|
| 33 |
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
|
33 |
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
|
| - |
|
34 |
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
|
| 34 |
import com.spice.profitmandi.dao.repository.fofo.CustomerAddressRepository;
|
35 |
import com.spice.profitmandi.dao.repository.fofo.CustomerAddressRepository;
|
| 35 |
import com.spice.profitmandi.dao.repository.fofo.FofoOrderItemRepository;
|
36 |
import com.spice.profitmandi.dao.repository.fofo.FofoOrderItemRepository;
|
| 36 |
import com.spice.profitmandi.dao.repository.fofo.FofoOrderRepository;
|
37 |
import com.spice.profitmandi.dao.repository.fofo.FofoOrderRepository;
|
| 37 |
import com.spice.profitmandi.dao.repository.fofo.HygieneDataRepository;
|
38 |
import com.spice.profitmandi.dao.repository.fofo.HygieneDataRepository;
|
| 38 |
import com.spice.profitmandi.service.user.RetailerService;
|
39 |
import com.spice.profitmandi.service.user.RetailerService;
|
| Line 57... |
Line 58... |
| 57 |
@Autowired
|
58 |
@Autowired
|
| 58 |
private HygieneDataRepository hygieneDataRepository;
|
59 |
private HygieneDataRepository hygieneDataRepository;
|
| 59 |
|
60 |
|
| 60 |
@Autowired
|
61 |
@Autowired
|
| 61 |
private ItemRepository itemRepository;
|
62 |
private ItemRepository itemRepository;
|
| - |
|
63 |
|
| - |
|
64 |
@Autowired
|
| - |
|
65 |
private RetailerService reatilerService;
|
| - |
|
66 |
|
| - |
|
67 |
@Autowired
|
| - |
|
68 |
private FofoStoreRepository fofotSoreRepository;
|
| 62 |
@Autowired
|
69 |
@Autowired
|
| 63 |
private MVCResponseSender mvcResponseSender;
|
70 |
private MVCResponseSender mvcResponseSender;
|
| 64 |
private static final Logger LOGGER = LogManager.getLogger(HygieneController.class);
|
71 |
private static final Logger LOGGER = LogManager.getLogger(HygieneController.class);
|
| 65 |
|
72 |
|
| 66 |
@RequestMapping(value = "/getHygieneData", method = RequestMethod.GET)
|
73 |
@RequestMapping(value = "/getHygieneData", method = RequestMethod.GET)
|
| 67 |
public String getHygieneData(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
74 |
public String getHygieneData(HttpServletRequest request,
|
| - |
|
75 |
@RequestParam(name = "fofoId", required = false, defaultValue = "0") int fofoId, Model model)
|
| - |
|
76 |
throws ProfitMandiBusinessException {
|
| - |
|
77 |
List<HygieneData> hygieneData = null;
|
| - |
|
78 |
if (fofoId != 0) {
|
| - |
|
79 |
hygieneData = hygieneDataRepository.selectAllByFofoIdDisposedTimestamp(fofoId);
|
| - |
|
80 |
} else {
|
| 68 |
List<HygieneData> hygieneData = hygieneDataRepository.selectByDisposedTimestamp();
|
81 |
hygieneData = hygieneDataRepository.selectByDisposedTimestamp();
|
| - |
|
82 |
}
|
| - |
|
83 |
|
| 69 |
List<Integer> orderIds = hygieneData.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
|
84 |
List<Integer> orderIds = hygieneData.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
|
| 70 |
Map<Integer, FofoOrder> fofoOrdersMap = this.getfofoOrderByOrderId(orderIds);
|
85 |
Map<Integer, FofoOrder> fofoOrdersMap = this.getfofoOrderByOrderId(orderIds);
|
| 71 |
Set<Integer> fofoIds = fofoOrdersMap.values().stream().map(x->x.getFofoId()).collect(Collectors.toSet());
|
86 |
Set<Integer> fofoIds = fofoOrdersMap.values().stream().map(x -> x.getFofoId()).collect(Collectors.toSet());
|
| 72 |
Map<Integer, CustomerAddress> customerAddress = this.getCustomerAddressByFofoOrder(fofoOrdersMap.values());
|
87 |
Map<Integer, CustomerAddress> customerAddress = this.getCustomerAddressByFofoOrder(fofoOrdersMap.values());
|
| 73 |
|
88 |
|
| 74 |
Map<Integer, CustomRetailer> partnerAddressMap = retailerService.getFofoRetailers(new ArrayList<Integer>(fofoIds));
|
89 |
Map<Integer, CustomRetailer> partnerAddressMap = retailerService
|
| 75 |
model.addAttribute("hygieneData", hygieneData)
|
90 |
.getFofoRetailers(new ArrayList<Integer>(fofoIds));
|
| - |
|
91 |
|
| 76 |
.addAttribute("fofoOrder", fofoOrdersMap)
|
92 |
model.addAttribute("hygieneData", hygieneData).addAttribute("fofoOrder", fofoOrdersMap)
|
| 77 |
.addAttribute("partnerAddress", partnerAddressMap)
|
- |
|
| 78 |
.addAttribute("customerAddress", customerAddress);
|
93 |
.addAttribute("partnerAddress", partnerAddressMap).addAttribute("customerAddress", customerAddress);
|
| 79 |
|
94 |
|
| 80 |
return "hygiene";
|
95 |
return "hygiene";
|
| 81 |
}
|
96 |
}
|
| 82 |
|
97 |
|
| 83 |
private Map<Integer, FofoOrder> getfofoOrderByOrderId(List<Integer> fofoOrderIds)
|
98 |
private Map<Integer, FofoOrder> getfofoOrderByOrderId(List<Integer> fofoOrderIds)
|