|
@@ -96,12 +96,10 @@ public class SupplyChainController extends BaseController {
|
|
|
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(promoterNickName)) {
|
|
if (!Check.isNull(promoterNickName)) {
|
|
requestMap.put("promoterNickName", promoterNickName);
|
|
requestMap.put("promoterNickName", promoterNickName);
|
|
@@ -140,12 +138,11 @@ public class SupplyChainController extends BaseController {
|
|
@ApiParam("商品ID") @RequestParam(value = "itemId", required = false) String itemId) {
|
|
@ApiParam("商品ID") @RequestParam(value = "itemId", required = false) String itemId) {
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
|
|
+
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(promoterId)) {
|
|
if (!Check.isNull(promoterId)) {
|
|
requestMap.put("promoterId", promoterId);
|
|
requestMap.put("promoterId", promoterId);
|
|
@@ -185,12 +182,10 @@ public class SupplyChainController extends BaseController {
|
|
@ApiParam("订单结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate) {
|
|
@ApiParam("订单结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate) {
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(promoterId)) {
|
|
if (!Check.isNull(promoterId)) {
|
|
requestMap.put("promoterId", promoterId);
|
|
requestMap.put("promoterId", promoterId);
|
|
@@ -234,24 +229,20 @@ public class SupplyChainController extends BaseController {
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(orderStartDate) && !Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderStartDate) && !Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
if (!Check.isNull(bindStartDate) && !Check.isNull(bindEndDate)) {
|
|
if (!Check.isNull(bindStartDate) && !Check.isNull(bindEndDate)) {
|
|
if (!Check.isNull(bindStartDate)) {
|
|
if (!Check.isNull(bindStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(bindStartDate);
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(bindStartDate));
|
|
requestMap.put("bindStartDate", bindStartDate);
|
|
requestMap.put("bindStartDate", bindStartDate);
|
|
}
|
|
}
|
|
if (!Check.isNull(bindEndDate)) {
|
|
if (!Check.isNull(bindEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(bindEndDate);
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(bindEndDate));
|
|
requestMap.put("bindEndDate", bindEndDate);
|
|
requestMap.put("bindEndDate", bindEndDate);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -292,25 +283,20 @@ public class SupplyChainController extends BaseController {
|
|
public void exportOrder(HttpServletRequest request, HttpServletResponse response, @RequestBody JSONObject requestJson) throws Exception {
|
|
public void exportOrder(HttpServletRequest request, HttpServletResponse response, @RequestBody JSONObject requestJson) throws Exception {
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
- Long start = DateUtils.getStartLongTime(requestJson.getString("orderStartDate"));
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(requestJson.getString("orderStartDate")));
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
- Long end = DateUtils.getEndLongTime(requestJson.getString("orderEndDate"));
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(requestJson.getString("orderEndDate")));
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getString("bindStartDate"))) {
|
|
if (!Check.isNull(requestJson.getString("bindStartDate"))) {
|
|
- Long start = DateUtils.getStartLongTime(requestJson.getString("bindStartDate"));
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(requestJson.getString("bindStartDate")));
|
|
requestMap.put("bindStartDate", requestJson.getString("bindStartDate"));
|
|
requestMap.put("bindStartDate", requestJson.getString("bindStartDate"));
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getString("bindEndDate"))) {
|
|
if (!Check.isNull(requestJson.getString("bindEndDate"))) {
|
|
- Long end = DateUtils.getEndLongTime(requestJson.getString("bindEndDate"));
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(requestJson.getString("bindEndDate")));
|
|
requestMap.put("bindEndDate", requestJson.getString("bindEndDate"));
|
|
requestMap.put("bindEndDate", requestJson.getString("bindEndDate"));
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
if (!Check.isNull(requestJson.getString("promoterNickName"))) {
|
|
if (!Check.isNull(requestJson.getString("promoterNickName"))) {
|
|
requestMap.put("promoterNickName", requestJson.getString("promoterNickName"));
|
|
requestMap.put("promoterNickName", requestJson.getString("promoterNickName"));
|
|
}
|
|
}
|
|
@@ -387,12 +373,10 @@ public class SupplyChainController extends BaseController {
|
|
@ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate) {
|
|
@ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate) {
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(itemId)) {
|
|
if (!Check.isNull(itemId)) {
|
|
requestMap.put("itemId", itemId);
|
|
requestMap.put("itemId", itemId);
|
|
@@ -425,12 +409,10 @@ public class SupplyChainController extends BaseController {
|
|
) {
|
|
) {
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(promoterId)) {
|
|
if (!Check.isNull(promoterId)) {
|
|
requestMap.put("promoterId", promoterId);
|
|
requestMap.put("promoterId", promoterId);
|
|
@@ -464,12 +446,10 @@ public class SupplyChainController extends BaseController {
|
|
) throws IOException {
|
|
) throws IOException {
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
- Long start = DateUtils.getStartLongTime(requestJson.getString("orderStartDate"));
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(requestJson.getString("orderStartDate")));
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
- Long end = DateUtils.getEndLongTime(requestJson.getString("orderEndDate"));
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(requestJson.getString("orderEndDate")));
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getLong("promoterId"))) {
|
|
if (!Check.isNull(requestJson.getLong("promoterId"))) {
|
|
requestMap.put("promoterId", requestJson.getLong("promoterId"));
|
|
requestMap.put("promoterId", requestJson.getLong("promoterId"));
|
|
@@ -539,12 +519,10 @@ public class SupplyChainController extends BaseController {
|
|
@ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate) {
|
|
@ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate) {
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(itemId)) {
|
|
if (!Check.isNull(itemId)) {
|
|
requestMap.put("itemId", itemId);
|
|
requestMap.put("itemId", itemId);
|
|
@@ -582,48 +560,42 @@ public class SupplyChainController extends BaseController {
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
if (dateType == 0) {
|
|
if (dateType == 0) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate); //当天开始时间
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate); // 当天结束时间
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
JSONObject orderTotal = supplyChainService.getOrderTotal(requestMap);
|
|
JSONObject orderTotal = supplyChainService.getOrderTotal(requestMap);
|
|
returnJson.put("orderTotal", orderTotal);
|
|
returnJson.put("orderTotal", orderTotal);
|
|
Integer hour = DateUtils.getNowHour() - 1; // 当前小时
|
|
Integer hour = DateUtils.getNowHour() - 1; // 当前小时
|
|
if (hour >= 0) {
|
|
if (hour >= 0) {
|
|
JSONObject ratioJson = new JSONObject();
|
|
JSONObject ratioJson = new JSONObject();
|
|
- Long nowStartHourTemp = DateUtils.getStartLongTime(orderStartDate); // 当天开始时间戳
|
|
|
|
- Long nowEndHourTemp = DateUtils.getNowEndHourTemp(orderStartDate, hour); // 当前结束时间戳
|
|
|
|
|
|
+ Long nowStartHourTemp = DateUtils.strDateToInt(orderStartDate); // 当天开始时间戳
|
|
|
|
+// Long nowEndHourTemp = DateUtils.getNowEndHourTemp(orderStartDate, hour); // 当前结束时间戳
|
|
String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
|
|
String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
|
|
- Long yesterdayStartHourTemp = DateUtils.getStartLongTime(yesterday); //昨日开始时间戳
|
|
|
|
- Long yesterdayEndHourTemp = DateUtils.getNowEndHourTemp(yesterday, hour); // 昨日结束时间戳
|
|
|
|
|
|
+ Long yesterdayStartHourTemp = DateUtils.strDateToInt(yesterday); //昨日开始时间戳
|
|
|
|
+// Long yesterdayEndHourTemp = DateUtils.getNowEndHourTemp(yesterday, hour); // 昨日结束时间戳
|
|
|
|
|
|
Map<String, Object> ratioMap = new HashMap<>();
|
|
Map<String, Object> ratioMap = new HashMap<>();
|
|
ratioMap.put("nowStartHourTemp", nowStartHourTemp);
|
|
ratioMap.put("nowStartHourTemp", nowStartHourTemp);
|
|
- ratioMap.put("nowEndHourTemp", nowEndHourTemp);
|
|
|
|
|
|
+ ratioMap.put("hour", hour);
|
|
ratioMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
|
|
ratioMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
|
|
- ratioMap.put("yesterdayEndHourTemp", yesterdayEndHourTemp);
|
|
|
|
Double ringRatio = supplyChainService.getOrderTotalRatio(ratioMap); //环比
|
|
Double ringRatio = supplyChainService.getOrderTotalRatio(ratioMap); //环比
|
|
ratioJson.put("ringRatio", ringRatio);
|
|
ratioJson.put("ringRatio", ringRatio);
|
|
String yearDay = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -6); // 昨日日期
|
|
String yearDay = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -6); // 昨日日期
|
|
- Long yearStartHourTemp = DateUtils.getStartLongTime(yearDay); //前7日开始时间戳
|
|
|
|
- Long yearEndHourTemp = DateUtils.getNowEndHourTemp(yearDay, hour);//前7日结束时间戳
|
|
|
|
|
|
+ Long yearStartHourTemp = DateUtils.strDateToInt(yearDay); //前7日开始时间戳
|
|
|
|
+// Long yearEndHourTemp = DateUtils.getNowEndHourTemp(yearDay, hour);//前7日结束时间戳
|
|
ratioMap.put("yesterdayStartHourTemp", yearStartHourTemp);
|
|
ratioMap.put("yesterdayStartHourTemp", yearStartHourTemp);
|
|
- ratioMap.put("yesterdayEndHourTemp", yearEndHourTemp);
|
|
|
|
Double yearRatio = supplyChainService.getOrderTotalRatio(ratioMap); //同比
|
|
Double yearRatio = supplyChainService.getOrderTotalRatio(ratioMap); //同比
|
|
ratioJson.put("yearRatio", yearRatio);
|
|
ratioJson.put("yearRatio", yearRatio);
|
|
returnJson.put("ratio", ratioJson);
|
|
returnJson.put("ratio", ratioJson);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate); //昨日开始时间
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate); // 前日开始时间
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
JSONObject orderTotal = supplyChainService.getOrderTotal(requestMap);
|
|
JSONObject orderTotal = supplyChainService.getOrderTotal(requestMap);
|
|
returnJson.put("orderTotal", orderTotal);
|
|
returnJson.put("orderTotal", orderTotal);
|
|
@@ -650,48 +622,39 @@ public class SupplyChainController extends BaseController {
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
if (dateType == 0) {
|
|
if (dateType == 0) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate); //当天开始时间
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate); // 当天结束时间
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
JSONObject amountTotal = supplyChainService.getAmountTotal(requestMap);
|
|
JSONObject amountTotal = supplyChainService.getAmountTotal(requestMap);
|
|
returnJson.put("amountTotal", amountTotal);
|
|
returnJson.put("amountTotal", amountTotal);
|
|
Integer hour = DateUtils.getNowHour() - 1; // 当前小时
|
|
Integer hour = DateUtils.getNowHour() - 1; // 当前小时
|
|
if (hour >= 0) {
|
|
if (hour >= 0) {
|
|
JSONObject amountRatioJson = new JSONObject();
|
|
JSONObject amountRatioJson = new JSONObject();
|
|
- Long nowStartHourTemp = DateUtils.getStartLongTime(orderStartDate); // 当天开始时间戳
|
|
|
|
- Long nowEndHourTemp = DateUtils.getNowEndHourTemp(orderStartDate, hour); // 当前结束时间戳
|
|
|
|
|
|
+ Long nowStartHourTemp = DateUtils.strDateToInt(orderStartDate); // 当天开始时间
|
|
String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
|
|
String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
|
|
- Long yesterdayStartHourTemp = DateUtils.getStartLongTime(yesterday); //昨日开始时间戳
|
|
|
|
- Long yesterdayEndHourTemp = DateUtils.getNowEndHourTemp(yesterday, hour); // 昨日结束时间戳
|
|
|
|
|
|
+ Long yesterdayStartHourTemp = DateUtils.strDateToInt(yesterday); //昨日开始时间
|
|
|
|
|
|
Map<String, Object> ratioMap = new HashMap<>();
|
|
Map<String, Object> ratioMap = new HashMap<>();
|
|
ratioMap.put("nowStartHourTemp", nowStartHourTemp);
|
|
ratioMap.put("nowStartHourTemp", nowStartHourTemp);
|
|
- ratioMap.put("nowEndHourTemp", nowEndHourTemp);
|
|
|
|
ratioMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
|
|
ratioMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
|
|
- ratioMap.put("yesterdayEndHourTemp", yesterdayEndHourTemp);
|
|
|
|
|
|
+ ratioMap.put("hour", hour);
|
|
Double amountRingRatio = supplyChainService.getAmountTotalRatio(ratioMap); //环比
|
|
Double amountRingRatio = supplyChainService.getAmountTotalRatio(ratioMap); //环比
|
|
amountRatioJson.put("amountRingRatio", amountRingRatio);
|
|
amountRatioJson.put("amountRingRatio", amountRingRatio);
|
|
String yearDay = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -6); // 昨日日期
|
|
String yearDay = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -6); // 昨日日期
|
|
- Long yearStartHourTemp = DateUtils.getStartLongTime(yearDay); //前7日开始时间戳
|
|
|
|
- Long yearEndHourTemp = DateUtils.getNowEndHourTemp(yearDay, hour);//前7日结束时间戳
|
|
|
|
|
|
+ Long yearStartHourTemp = DateUtils.strDateToInt(yearDay); //前7日开始时间
|
|
ratioMap.put("yesterdayStartHourTemp", yearStartHourTemp);
|
|
ratioMap.put("yesterdayStartHourTemp", yearStartHourTemp);
|
|
- ratioMap.put("yesterdayEndHourTemp", yearEndHourTemp);
|
|
|
|
Double amountYearRatio = supplyChainService.getAmountTotalRatio(ratioMap); //同比
|
|
Double amountYearRatio = supplyChainService.getAmountTotalRatio(ratioMap); //同比
|
|
amountRatioJson.put("amountYearRatio", amountYearRatio);
|
|
amountRatioJson.put("amountYearRatio", amountYearRatio);
|
|
returnJson.put("amountRatio", amountRatioJson);
|
|
returnJson.put("amountRatio", amountRatioJson);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate); //昨日开始时间
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate); // 前日开始时间
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
JSONObject amountTotal = supplyChainService.getAmountTotal(requestMap);
|
|
JSONObject amountTotal = supplyChainService.getAmountTotal(requestMap);
|
|
returnJson.put("amountTotal", amountTotal);
|
|
returnJson.put("amountTotal", amountTotal);
|
|
@@ -718,12 +681,10 @@ public class SupplyChainController extends BaseController {
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
|
|
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate); //昨日开始时间
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate); // 前日开始时间
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
JSONObject serviceAmountTotal = supplyChainService.getServiceAmountTotal(requestMap);
|
|
JSONObject serviceAmountTotal = supplyChainService.getServiceAmountTotal(requestMap);
|
|
returnJson.put("serviceAmountTotal", serviceAmountTotal);
|
|
returnJson.put("serviceAmountTotal", serviceAmountTotal);
|
|
@@ -752,15 +713,12 @@ public class SupplyChainController extends BaseController {
|
|
return indexOrderRankBytedance(dateType, orderStartDate, orderEndDate);
|
|
return indexOrderRankBytedance(dateType, orderStartDate, orderEndDate);
|
|
} else {
|
|
} else {
|
|
Integer hour = DateUtils.getNowHour(); // 当前小时
|
|
Integer hour = DateUtils.getNowHour(); // 当前小时
|
|
- Long nowStartHourTemp = DateUtils.getStartLongTime(orderStartDate); // 当天开始时间戳
|
|
|
|
- Long nowEndHourTemp = DateUtils.getNowEndHourTemp(orderStartDate, hour); // 当前结束时间戳
|
|
|
|
|
|
+ Long nowStartHourTemp = DateUtils.strDateToInt(orderStartDate); // 当天开始时间
|
|
String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
|
|
String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
|
|
- Long yesterdayStartHourTemp = DateUtils.getStartLongTime(yesterday); //昨日开始时间戳
|
|
|
|
- Long yesterdayEndHourTemp = DateUtils.getNowEndHourTemp(yesterday, hour); // 昨日结束时间戳
|
|
|
|
|
|
+ Long yesterdayStartHourTemp = DateUtils.strDateToInt(yesterday); //昨日开始时间
|
|
requestMap.put("nowStartHourTemp", nowStartHourTemp);
|
|
requestMap.put("nowStartHourTemp", nowStartHourTemp);
|
|
- requestMap.put("nowEndHourTemp", nowEndHourTemp);
|
|
|
|
requestMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
|
|
requestMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
|
|
- requestMap.put("yesterdayEndHourTemp", yesterdayEndHourTemp);
|
|
|
|
|
|
+ requestMap.put("hour", hour);
|
|
startPage();
|
|
startPage();
|
|
List<JSONObject> orderRankRatioList = supplyChainService.getOrderRankRatioList(requestMap);
|
|
List<JSONObject> orderRankRatioList = supplyChainService.getOrderRankRatioList(requestMap);
|
|
return getDataTable(orderRankRatioList);
|
|
return getDataTable(orderRankRatioList);
|
|
@@ -770,12 +728,10 @@ public class SupplyChainController extends BaseController {
|
|
return indexOrderRankBytedance(dateType, orderStartDate, orderEndDate);
|
|
return indexOrderRankBytedance(dateType, orderStartDate, orderEndDate);
|
|
} else {
|
|
} else {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
startPage();
|
|
startPage();
|
|
List<JSONObject> orderRankRatioList = supplyChainService.getOrderRankList(requestMap);
|
|
List<JSONObject> orderRankRatioList = supplyChainService.getOrderRankList(requestMap);
|
|
@@ -846,15 +802,12 @@ public class SupplyChainController extends BaseController {
|
|
requestMap.put("end", end);
|
|
requestMap.put("end", end);
|
|
}
|
|
}
|
|
Integer hour = DateUtils.getNowHour(); // 当前小时
|
|
Integer hour = DateUtils.getNowHour(); // 当前小时
|
|
- Long nowStartHourTemp = DateUtils.getStartLongTime(orderStartDate); // 当天开始时间戳
|
|
|
|
- Long nowEndHourTemp = DateUtils.getNowEndHourTemp(orderStartDate, hour); // 当前结束时间戳
|
|
|
|
|
|
+ Long nowStartHourTemp = DateUtils.strDateToInt(orderStartDate); // 当天开始时间
|
|
String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
|
|
String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1); // 昨日日期
|
|
- Long yesterdayStartHourTemp = DateUtils.getStartLongTime(yesterday); //昨日开始时间戳
|
|
|
|
- Long yesterdayEndHourTemp = DateUtils.getNowEndHourTemp(yesterday, hour); // 昨日结束时间戳
|
|
|
|
|
|
+ Long yesterdayStartHourTemp = DateUtils.strDateToInt(yesterday); //昨日开始时间
|
|
requestMap.put("nowStartHourTemp", nowStartHourTemp);
|
|
requestMap.put("nowStartHourTemp", nowStartHourTemp);
|
|
- requestMap.put("nowEndHourTemp", nowEndHourTemp);
|
|
|
|
requestMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
|
|
requestMap.put("yesterdayStartHourTemp", yesterdayStartHourTemp);
|
|
- requestMap.put("yesterdayEndHourTemp", yesterdayEndHourTemp);
|
|
|
|
|
|
+ requestMap.put("hour", hour);
|
|
startPage();
|
|
startPage();
|
|
List<JSONObject> promoterRankRatioList = supplyChainService.getPromoterRankRatioList(requestMap);
|
|
List<JSONObject> promoterRankRatioList = supplyChainService.getPromoterRankRatioList(requestMap);
|
|
return getDataTable(promoterRankRatioList);
|
|
return getDataTable(promoterRankRatioList);
|
|
@@ -864,12 +817,10 @@ public class SupplyChainController extends BaseController {
|
|
return indexPromoterRankBytedance(dateType, orderStartDate, orderEndDate, userId);
|
|
return indexPromoterRankBytedance(dateType, orderStartDate, orderEndDate, userId);
|
|
} else {
|
|
} else {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
startPage();
|
|
startPage();
|
|
List<JSONObject> orderRatioList = supplyChainService.getPromoterRatioList(requestMap);
|
|
List<JSONObject> orderRatioList = supplyChainService.getPromoterRatioList(requestMap);
|
|
@@ -904,12 +855,10 @@ public class SupplyChainController extends BaseController {
|
|
|
|
|
|
} else {
|
|
} else {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.strDateToInt(orderStartDate); //当天开始时间
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.strDateToInt(orderEndDate); // 当天结束时间
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
startPage();
|
|
startPage();
|
|
List<JSONObject> orderRatioList = supplyChainService.getPromoterRatioListBytedance(requestMap);
|
|
List<JSONObject> orderRatioList = supplyChainService.getPromoterRatioListBytedance(requestMap);
|
|
@@ -923,12 +872,10 @@ public class SupplyChainController extends BaseController {
|
|
|
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
- Long start = DateUtils.getStartLongTime(requestJson.getString("orderStartDate"));
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(requestJson.getString("orderStartDate")));
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
- Long end = DateUtils.getEndLongTime(requestJson.getString("orderEndDate"));
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(requestJson.getString("orderEndDate")));
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getString("promoterNickName"))) {
|
|
if (!Check.isNull(requestJson.getString("promoterNickName"))) {
|
|
requestMap.put("promoterNickName", requestJson.getString("promoterNickName"));
|
|
requestMap.put("promoterNickName", requestJson.getString("promoterNickName"));
|
|
@@ -1041,12 +988,10 @@ public class SupplyChainController extends BaseController {
|
|
public void exportPromoter(HttpServletRequest request, HttpServletResponse response, @RequestBody JSONObject requestJson) throws Exception {
|
|
public void exportPromoter(HttpServletRequest request, HttpServletResponse response, @RequestBody JSONObject requestJson) throws Exception {
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
- Long start = DateUtils.getStartLongTime(requestJson.getString("orderStartDate"));
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(requestJson.getString("orderStartDate")));
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
- Long end = DateUtils.getEndLongTime(requestJson.getString("orderEndDate"));
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(requestJson.getString("orderEndDate")));
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getString("promoterNickName"))) {
|
|
if (!Check.isNull(requestJson.getString("promoterNickName"))) {
|
|
requestMap.put("promoterNickName", requestJson.getString("promoterNickName"));
|
|
requestMap.put("promoterNickName", requestJson.getString("promoterNickName"));
|
|
@@ -1260,20 +1205,24 @@ public class SupplyChainController extends BaseController {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
requestMap.put("start", start);
|
|
requestMap.put("start", start);
|
|
|
|
+ requestMap.put("startDate", orderStartDate);
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
requestMap.put("end", end);
|
|
requestMap.put("end", end);
|
|
- }
|
|
|
|
|
|
+ requestMap.put("endDate", orderEndDate + " 23:59:59");
|
|
|
|
|
|
|
|
+ }
|
|
if (!Check.isNull(bindStartDate)) {
|
|
if (!Check.isNull(bindStartDate)) {
|
|
Long start = DateUtils.getStartLongTime(bindStartDate);
|
|
Long start = DateUtils.getStartLongTime(bindStartDate);
|
|
requestMap.put("start", start);
|
|
requestMap.put("start", start);
|
|
|
|
+ requestMap.put("startDate", bindStartDate);
|
|
}
|
|
}
|
|
|
|
|
|
if (!Check.isNull(bindEndDate)) {
|
|
if (!Check.isNull(bindEndDate)) {
|
|
Long end = DateUtils.getEndLongTime(bindEndDate);
|
|
Long end = DateUtils.getEndLongTime(bindEndDate);
|
|
requestMap.put("end", end);
|
|
requestMap.put("end", end);
|
|
|
|
+ requestMap.put("endDate", bindEndDate + " 23:59:59");
|
|
}
|
|
}
|
|
|
|
|
|
if (!Check.isNull(userId)) {
|
|
if (!Check.isNull(userId)) {
|
|
@@ -1308,20 +1257,26 @@ public class SupplyChainController extends BaseController {
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
Long start = DateUtils.getStartLongTime(requestJson.getString("orderStartDate"));
|
|
Long start = DateUtils.getStartLongTime(requestJson.getString("orderStartDate"));
|
|
requestMap.put("start", start);
|
|
requestMap.put("start", start);
|
|
|
|
+ requestMap.put("startDate", requestJson.getString("orderStartDate"));
|
|
|
|
+
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
Long end = DateUtils.getEndLongTime(requestJson.getString("orderEndDate"));
|
|
Long end = DateUtils.getEndLongTime(requestJson.getString("orderEndDate"));
|
|
requestMap.put("end", end);
|
|
requestMap.put("end", end);
|
|
|
|
+ requestMap.put("endDate", requestJson.getString("orderEndDate")+" 23:59:59");
|
|
}
|
|
}
|
|
|
|
|
|
if (!Check.isNull(requestJson.getString("bindStartDate"))) {
|
|
if (!Check.isNull(requestJson.getString("bindStartDate"))) {
|
|
Long start = DateUtils.getStartLongTime(requestJson.getString("bindStartDate"));
|
|
Long start = DateUtils.getStartLongTime(requestJson.getString("bindStartDate"));
|
|
requestMap.put("start", start);
|
|
requestMap.put("start", start);
|
|
|
|
+ requestMap.put("startDate", requestJson.getString("bindStartDate"));
|
|
}
|
|
}
|
|
|
|
|
|
if (!Check.isNull(requestJson.getString("bindEndDate"))) {
|
|
if (!Check.isNull(requestJson.getString("bindEndDate"))) {
|
|
Long end = DateUtils.getEndLongTime(requestJson.getString("bindEndDate"));
|
|
Long end = DateUtils.getEndLongTime(requestJson.getString("bindEndDate"));
|
|
requestMap.put("end", end);
|
|
requestMap.put("end", end);
|
|
|
|
+ requestMap.put("endDate", requestJson.getString("bindEndDate")+" 23:59:59");
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
if (!Check.isNull(requestJson.getString("userId"))) {
|
|
if (!Check.isNull(requestJson.getString("userId"))) {
|
|
@@ -1393,12 +1348,10 @@ public class SupplyChainController extends BaseController {
|
|
requestMap.put("userId", userId);
|
|
requestMap.put("userId", userId);
|
|
}
|
|
}
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
|
- requestMap.put("start", start);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
|
- requestMap.put("end", end);
|
|
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
}
|
|
}
|
|
if (!Check.isNull(itemId)) {
|
|
if (!Check.isNull(itemId)) {
|
|
requestMap.put("itemId", itemId);
|
|
requestMap.put("itemId", itemId);
|
|
@@ -1437,11 +1390,11 @@ public class SupplyChainController extends BaseController {
|
|
requestMap.put("userId", requestJson.getLong("userId"));
|
|
requestMap.put("userId", requestJson.getLong("userId"));
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderStartDate"))) {
|
|
- Long start = DateUtils.getStartLongTime(requestJson.getString("orderStartDate"));
|
|
|
|
|
|
+ Long start = DateUtils.strDateToInt(requestJson.getString("orderStartDate"));
|
|
requestMap.put("start", start);
|
|
requestMap.put("start", start);
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
if (!Check.isNull(requestJson.getString("orderEndDate"))) {
|
|
- Long end = DateUtils.getEndLongTime(requestJson.getString("orderEndDate"));
|
|
|
|
|
|
+ Long end = DateUtils.strDateToInt(requestJson.getString("orderEndDate"));
|
|
requestMap.put("end", end);
|
|
requestMap.put("end", end);
|
|
}
|
|
}
|
|
if (!Check.isNull(requestJson.getLong("itemId"))) {
|
|
if (!Check.isNull(requestJson.getLong("itemId"))) {
|
|
@@ -1502,11 +1455,11 @@ public class SupplyChainController extends BaseController {
|
|
requestMap.put("userId", userId);
|
|
requestMap.put("userId", userId);
|
|
}
|
|
}
|
|
if (!Check.isNull(orderStartDate)) {
|
|
if (!Check.isNull(orderStartDate)) {
|
|
- Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
|
|
|
+ Long start = DateUtils.strDateToInt(orderStartDate);
|
|
requestMap.put("start", start);
|
|
requestMap.put("start", start);
|
|
}
|
|
}
|
|
if (!Check.isNull(orderEndDate)) {
|
|
if (!Check.isNull(orderEndDate)) {
|
|
- Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
|
|
|
+ Long end = DateUtils.strDateToInt(orderEndDate);
|
|
requestMap.put("end", end);
|
|
requestMap.put("end", end);
|
|
}
|
|
}
|
|
JSONObject returnJson = supplyChainService.userItemTotal(requestMap);
|
|
JSONObject returnJson = supplyChainService.userItemTotal(requestMap);
|
|
@@ -1560,19 +1513,19 @@ public class SupplyChainController extends BaseController {
|
|
lastCycleStart = DateUtils.getAnotherDay("yyyy-MM-dd", lastCycleEnd, -differDay);
|
|
lastCycleStart = DateUtils.getAnotherDay("yyyy-MM-dd", lastCycleEnd, -differDay);
|
|
}
|
|
}
|
|
if (!Check.isNull(thisCycleStart)) {
|
|
if (!Check.isNull(thisCycleStart)) {
|
|
- Long thisCycleStartTemp = DateUtils.getStartLongTime(thisCycleStart);
|
|
|
|
|
|
+ Long thisCycleStartTemp = DateUtils.strDateToInt(thisCycleStart);
|
|
requestMap.put("thisCycleStartTemp", thisCycleStartTemp);
|
|
requestMap.put("thisCycleStartTemp", thisCycleStartTemp);
|
|
}
|
|
}
|
|
if (!Check.isNull(thisCycleEnd)) {
|
|
if (!Check.isNull(thisCycleEnd)) {
|
|
- Long thisCycleEndTemp = DateUtils.getEndLongTime(thisCycleEnd);
|
|
|
|
|
|
+ Long thisCycleEndTemp = DateUtils.strDateToInt(thisCycleEnd);
|
|
requestMap.put("thisCycleEndTemp", thisCycleEndTemp);
|
|
requestMap.put("thisCycleEndTemp", thisCycleEndTemp);
|
|
}
|
|
}
|
|
if (!Check.isNull(lastCycleStart)) {
|
|
if (!Check.isNull(lastCycleStart)) {
|
|
- Long lastCycleStartTemp = DateUtils.getStartLongTime(lastCycleStart);
|
|
|
|
|
|
+ Long lastCycleStartTemp = DateUtils.strDateToInt(lastCycleStart);
|
|
requestMap.put("lastCycleStartTemp", lastCycleStartTemp);
|
|
requestMap.put("lastCycleStartTemp", lastCycleStartTemp);
|
|
}
|
|
}
|
|
if (!Check.isNull(lastCycleEnd)) {
|
|
if (!Check.isNull(lastCycleEnd)) {
|
|
- Long lastCycleEndTemp = DateUtils.getEndLongTime(lastCycleEnd);
|
|
|
|
|
|
+ Long lastCycleEndTemp = DateUtils.strDateToInt(lastCycleEnd);
|
|
requestMap.put("lastCycleEndTemp", lastCycleEndTemp);
|
|
requestMap.put("lastCycleEndTemp", lastCycleEndTemp);
|
|
}
|
|
}
|
|
JSONObject timeIntervalRatioJson = supplyChainService.getTimeIntervalRatio(requestMap);
|
|
JSONObject timeIntervalRatioJson = supplyChainService.getTimeIntervalRatio(requestMap);
|
|
@@ -1606,11 +1559,11 @@ public class SupplyChainController extends BaseController {
|
|
end = orderEndDate;
|
|
end = orderEndDate;
|
|
}
|
|
}
|
|
if (!Check.isNull(start)) {
|
|
if (!Check.isNull(start)) {
|
|
- Long startTemp = DateUtils.getStartLongTime(start);
|
|
|
|
|
|
+ Long startTemp = DateUtils.strDateToInt(start);
|
|
requestMap.put("startTemp", startTemp);
|
|
requestMap.put("startTemp", startTemp);
|
|
}
|
|
}
|
|
if (!Check.isNull(end)) {
|
|
if (!Check.isNull(end)) {
|
|
- Long endTemp = DateUtils.getEndLongTime(end);
|
|
|
|
|
|
+ Long endTemp = DateUtils.strDateToInt(end);
|
|
requestMap.put("endTemp", endTemp);
|
|
requestMap.put("endTemp", endTemp);
|
|
}
|
|
}
|
|
if (!Check.isNull(type)) {
|
|
if (!Check.isNull(type)) {
|
|
@@ -2358,8 +2311,8 @@ public class SupplyChainController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- requestMap.put("start", orderStartDate);
|
|
|
|
- requestMap.put("end", orderEndDate);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
if (!Check.isNull(sellerId)) {
|
|
if (!Check.isNull(sellerId)) {
|
|
requestMap.put("sellerId", sellerId);
|
|
requestMap.put("sellerId", sellerId);
|
|
|
|
|
|
@@ -2391,10 +2344,10 @@ public class SupplyChainController extends BaseController {
|
|
|
|
|
|
@ApiParam("开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
|
|
@ApiParam("开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
|
|
@ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
|
|
@ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
|
|
- @ApiParam("结束时间") @RequestParam(value = "sellerId", required = false) Long sellerId,
|
|
|
|
- @ApiParam("结束时间") @RequestParam(value = "userId", required = false) Long userId,
|
|
|
|
- @ApiParam("结束时间") @RequestParam(value = "itemId", required = false) Long itemId,
|
|
|
|
- @ApiParam("结束时间") @RequestParam(value = "itemTitle", required = false) String itemTitle
|
|
|
|
|
|
+ @ApiParam("店铺Id") @RequestParam(value = "sellerId", required = false) Long sellerId,
|
|
|
|
+ @ApiParam("用户ID") @RequestParam(value = "userId", required = false) Long userId,
|
|
|
|
+ @ApiParam("商品ID") @RequestParam(value = "itemId", required = false) Long itemId,
|
|
|
|
+ @ApiParam("商品名") @RequestParam(value = "itemTitle", required = false) String itemTitle
|
|
|
|
|
|
) {
|
|
) {
|
|
TableDataInfo dataInfo = new TableDataInfo();
|
|
TableDataInfo dataInfo = new TableDataInfo();
|
|
@@ -2420,8 +2373,8 @@ public class SupplyChainController extends BaseController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- requestMap.put("start", orderStartDate);
|
|
|
|
- requestMap.put("end", orderEndDate);
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(orderStartDate));
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(orderEndDate));
|
|
requestMap.put("sellerId", sellerId);
|
|
requestMap.put("sellerId", sellerId);
|
|
if (!Check.isNull(itemId)) {
|
|
if (!Check.isNull(itemId)) {
|
|
requestMap.put("itemId", itemId);
|
|
requestMap.put("itemId", itemId);
|
|
@@ -2464,8 +2417,8 @@ public class SupplyChainController extends BaseController {
|
|
throw new Exception("请输入用户ID");
|
|
throw new Exception("请输入用户ID");
|
|
}
|
|
}
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
- requestMap.put("start", requestJson.getString("orderStartDate"));
|
|
|
|
- requestMap.put("end", requestJson.getString("orderEndDate"));
|
|
|
|
|
|
+ requestMap.put("start", DateUtils.strDateToInt(requestJson.getString("orderStartDate")));
|
|
|
|
+ requestMap.put("end", DateUtils.strDateToInt(requestJson.getString("orderEndDate")));
|
|
requestMap.put("sellerId", requestJson.getLong("sellerId"));
|
|
requestMap.put("sellerId", requestJson.getLong("sellerId"));
|
|
|
|
|
|
String roleKey = sysUserService.getRoleKeyByUserId(userId);
|
|
String roleKey = sysUserService.getRoleKeyByUserId(userId);
|