| Line 4... |
Line 4... |
| 4 |
import java.net.URISyntaxException;
|
4 |
import java.net.URISyntaxException;
|
| 5 |
import java.time.DayOfWeek;
|
5 |
import java.time.DayOfWeek;
|
| 6 |
import java.time.LocalDate;
|
6 |
import java.time.LocalDate;
|
| 7 |
import java.time.LocalDateTime;
|
7 |
import java.time.LocalDateTime;
|
| 8 |
import java.time.temporal.TemporalAdjusters;
|
8 |
import java.time.temporal.TemporalAdjusters;
|
| - |
|
9 |
import java.util.Arrays;
|
| 9 |
import java.util.List;
|
10 |
import java.util.List;
|
| 10 |
|
11 |
|
| 11 |
import javax.servlet.http.HttpServletRequest;
|
12 |
import javax.servlet.http.HttpServletRequest;
|
| 12 |
|
13 |
|
| 13 |
import org.apache.logging.log4j.LogManager;
|
14 |
import org.apache.logging.log4j.LogManager;
|
| Line 32... |
Line 33... |
| 32 |
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
|
33 |
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
|
| 33 |
import com.spice.profitmandi.dao.repository.dtr.NotificationPanelRepository;
|
34 |
import com.spice.profitmandi.dao.repository.dtr.NotificationPanelRepository;
|
| 34 |
import com.spice.profitmandi.dao.repository.fofo.CurrentInventorySnapshotRepository;
|
35 |
import com.spice.profitmandi.dao.repository.fofo.CurrentInventorySnapshotRepository;
|
| 35 |
import com.spice.profitmandi.dao.repository.fofo.PartnerDailyInvestmentRepository;
|
36 |
import com.spice.profitmandi.dao.repository.fofo.PartnerDailyInvestmentRepository;
|
| 36 |
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
|
37 |
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
|
| - |
|
38 |
import com.spice.profitmandi.service.PartnerInvestmentService;
|
| 37 |
import com.spice.profitmandi.service.authentication.RoleManager;
|
39 |
import com.spice.profitmandi.service.authentication.RoleManager;
|
| 38 |
import com.spice.profitmandi.service.inventory.InventoryService;
|
40 |
import com.spice.profitmandi.service.inventory.InventoryService;
|
| 39 |
import com.spice.profitmandi.service.transaction.TransactionService;
|
41 |
import com.spice.profitmandi.service.transaction.TransactionService;
|
| 40 |
import com.spice.profitmandi.service.wallet.WalletService;
|
42 |
import com.spice.profitmandi.service.wallet.WalletService;
|
| 41 |
import com.spice.profitmandi.web.model.LoginDetails;
|
43 |
import com.spice.profitmandi.web.model.LoginDetails;
|
| Line 90... |
Line 92... |
| 90 |
private OrderRepository orderRepository;
|
92 |
private OrderRepository orderRepository;
|
| 91 |
|
93 |
|
| 92 |
|
94 |
|
| 93 |
@Autowired
|
95 |
@Autowired
|
| 94 |
private PartnerDailyInvestmentRepository partnerDailyInvestmentRepository;
|
96 |
private PartnerDailyInvestmentRepository partnerDailyInvestmentRepository;
|
| - |
|
97 |
|
| - |
|
98 |
@Autowired
|
| - |
|
99 |
private PartnerInvestmentService partnerInvestmentService;
|
| 95 |
|
100 |
|
| 96 |
/*
|
101 |
/*
|
| 97 |
* @Autowired private ScanRepository scanRepository;
|
102 |
* @Autowired private ScanRepository scanRepository;
|
| 98 |
*/
|
103 |
*/
|
| 99 |
|
104 |
|
| Line 234... |
Line 239... |
| 234 |
|
239 |
|
| 235 |
}
|
240 |
}
|
| 236 |
}
|
241 |
}
|
| 237 |
LocalDate endDate = LocalDate.now().minusDays(1);
|
242 |
LocalDate endDate = LocalDate.now().minusDays(1);
|
| 238 |
LocalDate weekStartDate = endDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
|
243 |
LocalDate weekStartDate = endDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
|
| 239 |
LocalDate startDate = weekStartDate.minusWeeks(5);
|
244 |
LocalDate startDate = weekStartDate.minusWeeks(2);
|
| 240 |
List<PartnerDailyInvestment> partnerInvestments = partnerDailyInvestmentRepository
|
245 |
List<PartnerDailyInvestment> partnerInvestments =
|
| - |
|
246 |
Arrays.asList(partnerInvestmentService.getInvestment(loginDetails.getFofoId(), 0));
|
| 241 |
.selectAll(loginDetails.getFofoId(), startDate, endDate);
|
247 |
partnerInvestments.addAll(partnerDailyInvestmentRepository.selectAll(loginDetails.getFofoId(), startDate, endDate));
|
| 242 |
|
248 |
|
| 243 |
model.addAttribute("investmentChart", this.getInvestmentChartData(partnerInvestments));
|
249 |
model.addAttribute("investmentChart", this.getInvestmentChartData(partnerInvestments));
|
| 244 |
model.addAttribute("sale", sale);
|
250 |
model.addAttribute("sale", sale);
|
| 245 |
model.addAttribute("walletAmount", walletAmount);
|
251 |
model.addAttribute("walletAmount", walletAmount);
|
| 246 |
model.addAttribute("inStockAmount", inStockAmount);
|
252 |
model.addAttribute("inStockAmount", inStockAmount);
|