|
@@ -858,7 +858,7 @@ public class KwaiXiaoDianReportController {
|
|
|
|
|
|
|
|
|
|
@GetMapping("/getSaleDetail")
|
|
@GetMapping("/getSaleDetail")
|
|
- public TableDataInfo getSaleDetail(String startDate, String endDate, Long userId, Integer pageNum, Integer pageSize, Long loginUserId) {
|
|
|
|
|
|
+ public TableDataInfo getSaleDetail(String startDate, String endDate, Long userId, Integer pageNum, Integer pageSize, Long loginUserId, Long itemId, String itemTitle) {
|
|
TableDataInfo rspData = new TableDataInfo();
|
|
TableDataInfo rspData = new TableDataInfo();
|
|
try {
|
|
try {
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
@@ -878,7 +878,12 @@ public class KwaiXiaoDianReportController {
|
|
Long end = DateUtils.strDateToInt(endDate);
|
|
Long end = DateUtils.strDateToInt(endDate);
|
|
requestMap.put("start", start);
|
|
requestMap.put("start", start);
|
|
requestMap.put("end", end);
|
|
requestMap.put("end", end);
|
|
-
|
|
|
|
|
|
+ if (!Check.isNull(itemId)) {
|
|
|
|
+ requestMap.put("itemId", itemId);
|
|
|
|
+ }
|
|
|
|
+ if (!Check.isNull(itemTitle)) {
|
|
|
|
+ requestMap.put("itemTitle", itemTitle);
|
|
|
|
+ }
|
|
|
|
|
|
startPage(pageNum, pageSize);
|
|
startPage(pageNum, pageSize);
|
|
List<JSONObject> list = kwaiXiaoDianReportService.getSaleDetail(requestMap);
|
|
List<JSONObject> list = kwaiXiaoDianReportService.getSaleDetail(requestMap);
|
|
@@ -904,7 +909,6 @@ public class KwaiXiaoDianReportController {
|
|
if (Check.isNull(endDate)) {
|
|
if (Check.isNull(endDate)) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
-
|
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(userId)) {
|
|
if (!Check.isNull(userId)) {
|
|
requestMap.put("userId", userId);
|
|
requestMap.put("userId", userId);
|
|
@@ -922,10 +926,7 @@ public class KwaiXiaoDianReportController {
|
|
Long end = DateUtils.strDateToInt(endDate);
|
|
Long end = DateUtils.strDateToInt(endDate);
|
|
requestMap.put("start", start);
|
|
requestMap.put("start", start);
|
|
requestMap.put("end", end);
|
|
requestMap.put("end", end);
|
|
-
|
|
|
|
-
|
|
|
|
List<JSONObject> list = kwaiXiaoDianReportService.getSaleDetail(requestMap);
|
|
List<JSONObject> list = kwaiXiaoDianReportService.getSaleDetail(requestMap);
|
|
-
|
|
|
|
List<List<Object>> exportList = new ArrayList<>();
|
|
List<List<Object>> exportList = new ArrayList<>();
|
|
if (!Check.isNull(list)) {
|
|
if (!Check.isNull(list)) {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
@@ -1068,7 +1069,7 @@ public class KwaiXiaoDianReportController {
|
|
|
|
|
|
|
|
|
|
@GetMapping("/getPurchaseDetail")
|
|
@GetMapping("/getPurchaseDetail")
|
|
- public TableDataInfo getPurchaseDetail(String startDate, String endDate, Long userId, Integer pageNum, Integer pageSize, Long loginUserId) {
|
|
|
|
|
|
+ public TableDataInfo getPurchaseDetail(String startDate, String endDate, Long userId, Integer pageNum, Integer pageSize, Long loginUserId, Long itemId, String itemTitle) {
|
|
TableDataInfo rspData = new TableDataInfo();
|
|
TableDataInfo rspData = new TableDataInfo();
|
|
try {
|
|
try {
|
|
|
|
|
|
@@ -1089,8 +1090,12 @@ public class KwaiXiaoDianReportController {
|
|
Long end = DateUtils.strDateToInt(endDate);
|
|
Long end = DateUtils.strDateToInt(endDate);
|
|
requestMap.put("start", start);
|
|
requestMap.put("start", start);
|
|
requestMap.put("end", end);
|
|
requestMap.put("end", end);
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ if (!Check.isNull(itemId)) {
|
|
|
|
+ requestMap.put("itemId", itemId);
|
|
|
|
+ }
|
|
|
|
+ if (!Check.isNull(itemTitle)) {
|
|
|
|
+ requestMap.put("itemTitle", itemTitle);
|
|
|
|
+ }
|
|
startPage(pageNum, pageSize);
|
|
startPage(pageNum, pageSize);
|
|
List<JSONObject> list = kwaiXiaoDianReportService.getPurchaseDetail(requestMap);
|
|
List<JSONObject> list = kwaiXiaoDianReportService.getPurchaseDetail(requestMap);
|
|
rspData.setCode(HttpStatus.SUCCESS);
|
|
rspData.setCode(HttpStatus.SUCCESS);
|