|
@@ -418,7 +418,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public JSONObject getOrderData(Long userId, String startDate, String endDate, String type) {
|
|
|
+ public JSONObject getOrderData(Long userId, String startDate, String endDate, String type, String mediaId) {
|
|
|
String roleKey = userService.getRoleKeyByUserId(userId);
|
|
|
List<Long> userList = null;
|
|
|
if ("courtshipManager".equals(roleKey) || "bdManager".equals(roleKey)) {
|
|
@@ -435,24 +435,34 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
returnJson.put("code", 0);
|
|
|
returnJson.put("message", "调用成功");
|
|
|
if ("1".equals(type)) {
|
|
|
- returnJson.put("data", getOrderDataByChannel(userList, startDate, endDate));
|
|
|
+ returnJson.put("data", getOrderDataByChannel(userList, startDate, endDate, mediaId));
|
|
|
} else {
|
|
|
- returnJson.put("data", getOrderDataByAttractInvestment(userList, startDate, endDate));
|
|
|
+ returnJson.put("data", getOrderDataByAttractInvestment(userList, startDate, endDate, mediaId));
|
|
|
}
|
|
|
return returnJson;
|
|
|
}
|
|
|
|
|
|
//渠道数据
|
|
|
- private JSONObject getOrderDataByChannel(List<Long> userList, String startDate, String endDate) {
|
|
|
+ private JSONObject getOrderDataByChannel(List<Long> userList, String startDate, String endDate, String mediaId) {
|
|
|
JSONObject data = new JSONObject();
|
|
|
List<String> promoterIds = null;
|
|
|
if (Check.isNotNull(userList)) {
|
|
|
- promoterIds = promoterService.selectPromoterIdList(userList);
|
|
|
+ promoterIds = promoterService.selectPromoterIdList(userList, mediaId);
|
|
|
+ }
|
|
|
+ if (Check.isNull(promoterIds)) {
|
|
|
+ return data;
|
|
|
+ }
|
|
|
+ JSONObject sample = kuaishouItemCollectSamplesMapper.queryTheNumberOfCompletedJobs(promoterIds, startDate, endDate, mediaId);
|
|
|
+
|
|
|
+ data.put("completeCount", sample.getInteger("completeCount"));//完成作业数
|
|
|
+ data.put("completeRate", sample.getString("completeRate"));//合格作业率
|
|
|
+ JSONObject order = new JSONObject();
|
|
|
+
|
|
|
+ if ("1".equals(mediaId)) {
|
|
|
+ order = supplyChainService.selectOrderInfoBytedance(promoterIds, DateUtils.strDateToInt(startDate), DateUtils.strDateToInt(endDate));
|
|
|
+ } else {
|
|
|
+ order = supplyChainService.selectOrderInfo(promoterIds, startDate, endDate);
|
|
|
}
|
|
|
- JSONObject Sample = kuaishouItemCollectSamplesMapper.queryTheNumberOfCompletedJobs(promoterIds, startDate, endDate);
|
|
|
- data.put("completeCount", Sample.getInteger("completeCount"));//完成作业数
|
|
|
- data.put("completeRate", Sample.getString("completeRate"));//合格作业率
|
|
|
- JSONObject order = supplyChainService.selectOrderInfo(promoterIds, startDate, endDate);
|
|
|
data.put("allNumber", order.getInteger("allNumber"));//订单总数
|
|
|
data.put("promoterCount", order.getInteger("promoterCount"));//达人总数
|
|
|
data.put("validOrderNUm", order.getInteger("validOrderNUm"));//有效订单数
|
|
@@ -472,13 +482,13 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
String todayOfLastWeek = DateUtils.getSubtractTime(date, 7);
|
|
|
|
|
|
//当天数据
|
|
|
- JSONObject toData = getOrderRate(today, today, hour, promoterIds, null);
|
|
|
+ JSONObject toData = getOrderRate(today, today, hour, promoterIds, null, mediaId);
|
|
|
|
|
|
//昨日数据
|
|
|
- JSONObject yesData = getOrderRate(yesterday, yesterday, hour, promoterIds, null);
|
|
|
+ JSONObject yesData = getOrderRate(yesterday, yesterday, hour, promoterIds, null, mediaId);
|
|
|
|
|
|
//上周当日数据
|
|
|
- JSONObject weeklyDayData = getOrderRate(todayOfLastWeek, todayOfLastWeek, hour, promoterIds, null);
|
|
|
+ JSONObject weeklyDayData = getOrderRate(todayOfLastWeek, todayOfLastWeek, hour, promoterIds, null, mediaId);
|
|
|
|
|
|
//日环比 (今天-昨天)/昨天*100%
|
|
|
data.put("dateOrderRate", getOrderRateValue(toData, yesData));
|
|
@@ -494,30 +504,30 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
//当前近七天的开始日期
|
|
|
String start = DateUtils.getSubtractTime(date, 6);
|
|
|
//当前近七天的数据
|
|
|
- inDayData = getOrderRate(start, today, hour, promoterIds, null);
|
|
|
+ inDayData = getOrderRate(start, today, hour, promoterIds, null, mediaId);
|
|
|
//上个近七天的开始日期
|
|
|
String lastStart = DateUtils.getSubtractTime(date, 13);
|
|
|
//上个近七天的数据
|
|
|
- lastDayData = getOrderRate(lastStart, todayOfLastWeek, hour, promoterIds, null);
|
|
|
+ lastDayData = getOrderRate(lastStart, todayOfLastWeek, hour, promoterIds, null, mediaId);
|
|
|
} else if (startDate.equals(endDate) && !startDate.equals(today)) {
|
|
|
// startDate 环比 startDate的前一天
|
|
|
- inDayData = getOrderRate(startDate, startDate, 23, promoterIds, null);
|
|
|
+ inDayData = getOrderRate(startDate, startDate, 23, promoterIds, null, mediaId);
|
|
|
// startDate -1
|
|
|
String lastDay = DateUtils.getSubtractTime(DateUtils.parseDate(startDate), 1);
|
|
|
- lastDayData = getOrderRate(lastDay, lastDay, 23, promoterIds, null);
|
|
|
+ lastDayData = getOrderRate(lastDay, lastDay, 23, promoterIds, null, mediaId);
|
|
|
} else if (!startDate.equals(endDate) && !endDate.equals(today)) {
|
|
|
// startDate 环比 startDate的前一天
|
|
|
- inDayData = getOrderRate(startDate, endDate, 23, promoterIds, null);
|
|
|
+ inDayData = getOrderRate(startDate, endDate, 23, promoterIds, null, mediaId);
|
|
|
int days = DateUtils.differentDaysByMillisecond(DateUtils.parseDate(startDate), DateUtils.parseDate(endDate)) + 1;
|
|
|
String lastStart = DateUtils.getSubtractTime(DateUtils.parseDate(startDate), days);
|
|
|
String lastEnd = DateUtils.getSubtractTime(DateUtils.parseDate(endDate), days);
|
|
|
- lastDayData = getOrderRate(lastStart, lastEnd, 23, promoterIds, null);
|
|
|
+ lastDayData = getOrderRate(lastStart, lastEnd, 23, promoterIds, null, mediaId);
|
|
|
} else {
|
|
|
- inDayData = getOrderRate(startDate, endDate, hour, promoterIds, null);
|
|
|
+ inDayData = getOrderRate(startDate, endDate, hour, promoterIds, null, mediaId);
|
|
|
int days = DateUtils.differentDaysByMillisecond(DateUtils.parseDate(startDate), DateUtils.parseDate(endDate)) + 1;
|
|
|
String lastStart = DateUtils.getSubtractTime(DateUtils.parseDate(startDate), days);
|
|
|
String lastEnd = DateUtils.getSubtractTime(DateUtils.parseDate(endDate), days);
|
|
|
- lastDayData = getOrderRate(lastStart, lastEnd, hour, promoterIds, null);
|
|
|
+ lastDayData = getOrderRate(lastStart, lastEnd, hour, promoterIds, null, mediaId);
|
|
|
}
|
|
|
//数据对比
|
|
|
data.put("dataOrderRate", getOrderRateValue(inDayData, lastDayData));
|
|
@@ -525,10 +535,17 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
return data;
|
|
|
}
|
|
|
|
|
|
- private JSONObject getOrderRate(String startDate, String endDate, int hour, List<String> promoterIds, List<Long> itemIds) {
|
|
|
- Long startHourTemp = DateUtils.getStartLongTime(startDate); // startDate开始时间戳
|
|
|
- Long endHourTemp = DateUtils.getNowEndHourTemp(endDate, hour); // endDate结束时间戳
|
|
|
- return supplyChainService.selectOrderRate(promoterIds, itemIds, startHourTemp, endHourTemp);
|
|
|
+ private JSONObject getOrderRate(String startDate, String endDate, int hour, List<String> promoterIds, List<Long> itemIds, String mediaId) {
|
|
|
+ if ("1".equals(mediaId)) {
|
|
|
+ Long startHourTemp = DateUtils.strDateToInt(startDate);
|
|
|
+ Long endHourTemp = DateUtils.strDateToInt(endDate);
|
|
|
+ return supplyChainService.selectOrderRateBytedance(promoterIds, itemIds, startHourTemp, endHourTemp);
|
|
|
+ } else if ("2".equals(mediaId)) {
|
|
|
+ Long startHourTemp = DateUtils.getStartLongTime(startDate); // startDate开始时间戳
|
|
|
+ Long endHourTemp = DateUtils.getNowEndHourTemp(endDate, hour); // endDate结束时间戳
|
|
|
+ return supplyChainService.selectOrderRate(promoterIds, itemIds, startHourTemp, endHourTemp);
|
|
|
+ }
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
private BigDecimal getOrderRateValue(JSONObject toData, JSONObject yesData) {
|
|
@@ -550,12 +567,19 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
}
|
|
|
|
|
|
//招商数据
|
|
|
- private JSONObject getOrderDataByAttractInvestment(List<Long> userList, String startDate, String endDate) {
|
|
|
+ private JSONObject getOrderDataByAttractInvestment(List<Long> userList, String startDate, String endDate, String mediaId) {
|
|
|
JSONObject data = new JSONObject();
|
|
|
//查询登录人(创建人)的所有商品
|
|
|
- List<Long> itemIds = kuaishouItemCollectSamplesMapper.getItemIdsByCreateId(userList);
|
|
|
+ List<Long> itemIds = kuaishouItemCollectSamplesMapper.getItemIdsByCreateId(userList, mediaId);
|
|
|
if (Check.isNotNull(itemIds)) {
|
|
|
- JSONObject order = supplyChainService.selectOrderInfoByItemIds(itemIds, startDate, endDate);
|
|
|
+ JSONObject order = null;
|
|
|
+ if ("1".equals(mediaId)) {
|
|
|
+ Long startHourTemp = DateUtils.strDateToInt(startDate);
|
|
|
+ Long endHourTemp = DateUtils.strDateToInt(endDate);
|
|
|
+ order = supplyChainService.selectOrderInfoByItemIdsBytedance(itemIds, startHourTemp, endHourTemp);
|
|
|
+ } else {
|
|
|
+ order = supplyChainService.selectOrderInfoByItemIds(itemIds, startDate, endDate);
|
|
|
+ }
|
|
|
data.put("sendCount", order.getInteger("sendCount"));//发货数
|
|
|
data.put("sendRate", order.getString("sendRate"));//订单发货率
|
|
|
data.put("allNumber", order.getInteger("allNumber"));//订单总数
|
|
@@ -577,13 +601,13 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
String todayOfLastWeek = DateUtils.getSubtractTime(date, 7);
|
|
|
|
|
|
//当天数据
|
|
|
- JSONObject toData = getOrderRate(today, today, hour, null, itemIds);
|
|
|
+ JSONObject toData = getOrderRate(today, today, hour, null, itemIds, mediaId);
|
|
|
|
|
|
//昨日数据
|
|
|
- JSONObject yesData = getOrderRate(yesterday, yesterday, hour, null, itemIds);
|
|
|
+ JSONObject yesData = getOrderRate(yesterday, yesterday, hour, null, itemIds, mediaId);
|
|
|
|
|
|
//上周当日数据
|
|
|
- JSONObject weeklyDayData = getOrderRate(todayOfLastWeek, todayOfLastWeek, hour, null, itemIds);
|
|
|
+ JSONObject weeklyDayData = getOrderRate(todayOfLastWeek, todayOfLastWeek, hour, null, itemIds, mediaId);
|
|
|
|
|
|
//日环比 (今天-昨天)/昨天*100%
|
|
|
data.put("dateOrderRate", getOrderRateValue(toData, yesData));
|
|
@@ -598,30 +622,30 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
if (startDate.equals(endDate) && startDate.equals(today)) {
|
|
|
String start = DateUtils.getSubtractTime(date, 6); //当前近七天的开始日期
|
|
|
//当前近七天的数据
|
|
|
- inDayData = getOrderRate(start, today, hour, null, itemIds);
|
|
|
+ inDayData = getOrderRate(start, today, hour, null, itemIds, mediaId);
|
|
|
|
|
|
String lastStart = DateUtils.getSubtractTime(date, 13); //上个近七天的开始日期
|
|
|
//上个近七天的数据
|
|
|
- lastDayData = getOrderRate(lastStart, todayOfLastWeek, hour, null, itemIds);
|
|
|
+ lastDayData = getOrderRate(lastStart, todayOfLastWeek, hour, null, itemIds, mediaId);
|
|
|
} else if (startDate.equals(endDate) && !startDate.equals(today)) {
|
|
|
// startDate 环比 startDate的前一天
|
|
|
- inDayData = getOrderRate(startDate, startDate, 23, null, itemIds);
|
|
|
+ inDayData = getOrderRate(startDate, startDate, 23, null, itemIds, mediaId);
|
|
|
// startDate -1
|
|
|
String lastDay = DateUtils.getSubtractTime(DateUtils.parseDate(startDate), 1);
|
|
|
- lastDayData = getOrderRate(lastDay, lastDay, 23, null, itemIds);
|
|
|
+ lastDayData = getOrderRate(lastDay, lastDay, 23, null, itemIds, mediaId);
|
|
|
} else if (!startDate.equals(endDate) && !endDate.equals(today)) {
|
|
|
// startDate 环比 startDate的前一天
|
|
|
- inDayData = getOrderRate(startDate, endDate, 23, null, itemIds);
|
|
|
+ inDayData = getOrderRate(startDate, endDate, 23, null, itemIds, mediaId);
|
|
|
int days = DateUtils.differentDaysByMillisecond(DateUtils.parseDate(startDate), DateUtils.parseDate(endDate)) + 1;
|
|
|
String lastStart = DateUtils.getSubtractTime(DateUtils.parseDate(startDate), days);
|
|
|
String lastEnd = DateUtils.getSubtractTime(DateUtils.parseDate(endDate), days);
|
|
|
- lastDayData = getOrderRate(lastStart, lastEnd, 23, null, itemIds);
|
|
|
+ lastDayData = getOrderRate(lastStart, lastEnd, 23, null, itemIds, mediaId);
|
|
|
} else {
|
|
|
- inDayData = getOrderRate(startDate, endDate, hour, null, itemIds);
|
|
|
+ inDayData = getOrderRate(startDate, endDate, hour, null, itemIds, mediaId);
|
|
|
int days = DateUtils.differentDaysByMillisecond(DateUtils.parseDate(startDate), DateUtils.parseDate(endDate)) + 1;
|
|
|
String lastStart = DateUtils.getSubtractTime(DateUtils.parseDate(startDate), days);
|
|
|
String lastEnd = DateUtils.getSubtractTime(DateUtils.parseDate(endDate), days);
|
|
|
- lastDayData = getOrderRate(lastStart, lastEnd, hour, null, itemIds);
|
|
|
+ lastDayData = getOrderRate(lastStart, lastEnd, hour, null, itemIds, mediaId);
|
|
|
}
|
|
|
//数据对比
|
|
|
data.put("dataOrderRate", getOrderRateValue(inDayData, lastDayData));
|
|
@@ -631,7 +655,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public JSONObject getDataAnalysis(Long userId, String startDate, String endDate, String type) {
|
|
|
+ public JSONObject getDataAnalysis(Long userId, String startDate, String endDate, String type, String mediaId) {
|
|
|
String roleKey = userService.getRoleKeyByUserId(userId);
|
|
|
List<Long> userList = null;
|
|
|
if ("courtshipManager".equals(roleKey) || "bdManager".equals(roleKey)) {
|
|
@@ -648,9 +672,9 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
returnJson.put("code", 0);
|
|
|
returnJson.put("message", "调用成功");
|
|
|
if ("1".equals(type)) {
|
|
|
- returnJson.put("data", getDataAnalysisByChannel(userList, startDate, endDate));
|
|
|
+ returnJson.put("data", getDataAnalysisByChannel(userList, startDate, endDate, mediaId));
|
|
|
} else {
|
|
|
- returnJson.put("data", getDataAnalysisByAttractInvestment(userList, startDate, endDate));
|
|
|
+ returnJson.put("data", getDataAnalysisByAttractInvestment(userList, startDate, endDate, mediaId));
|
|
|
}
|
|
|
return returnJson;
|
|
|
}
|
|
@@ -690,11 +714,14 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
}
|
|
|
|
|
|
// 渠道—数据分析
|
|
|
- private JSONObject getDataAnalysisByChannel(List<Long> userList, String startDate, String endDate) {
|
|
|
+ private JSONObject getDataAnalysisByChannel(List<Long> userList, String startDate, String endDate, String mediaId) {
|
|
|
JSONObject data = new JSONObject();
|
|
|
List<String> promoterIds = null;
|
|
|
if (Check.isNotNull(userList)) {
|
|
|
- promoterIds = promoterService.selectPromoterIdList(userList);
|
|
|
+ promoterIds = promoterService.selectPromoterIdList(userList, mediaId);
|
|
|
+ }
|
|
|
+ if (Check.isNull(promoterIds)) {
|
|
|
+ return data;
|
|
|
}
|
|
|
if (Check.isNull(startDate) && Check.isNull(endDate)) {
|
|
|
//当前月份第一天
|
|
@@ -709,7 +736,13 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
map.put("promoterIds", promoterIds);
|
|
|
map.put("startLong", DateUtils.getStartLongTime(startDate));
|
|
|
map.put("endLong", DateUtils.getEndLongTime(endDate));
|
|
|
- List<JSONObject> list = supplyChainService.getMonthOrderAmount(map);
|
|
|
+ List<JSONObject> list = null;
|
|
|
+ if ("1".equals(mediaId)) {
|
|
|
+ list = supplyChainService.getMonthOrderAmountBytedance(map);
|
|
|
+ } else {
|
|
|
+ list = supplyChainService.getMonthOrderAmount(map);
|
|
|
+ }
|
|
|
+
|
|
|
List<String> allDates = DateUtils.getAllDatesOfTwoTimes(startDate, endDate);
|
|
|
if (Check.isNull(list) || list.size() != allDates.size()) {
|
|
|
String orderAmountStr = JSONObject.toJSONString(list);
|
|
@@ -735,14 +768,20 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
});
|
|
|
data.put("list", list);
|
|
|
map.put("toStartLong", DateUtils.getStartLongTime(endDate));
|
|
|
- JSONObject amount = supplyChainService.getMonthOrderAmountTotal(map);
|
|
|
+ JSONObject amount = null;
|
|
|
+ if ("1".equals(mediaId)) {
|
|
|
+ amount = supplyChainService.getMonthOrderAmountTotalBytedance(map);
|
|
|
+ } else {
|
|
|
+ amount = supplyChainService.getMonthOrderAmountTotal(map);
|
|
|
+ }
|
|
|
+
|
|
|
if (Check.isNotNull(amount)) {
|
|
|
data.put("orderAmount", amount.getInteger("orderAmount"));
|
|
|
data.put("regimentalPromotionAmount", amount.getInteger("regimentalPromotionAmount"));
|
|
|
data.put("orderAmountRate", amount.getString("orderAmountRate"));
|
|
|
data.put("regimentalPromotionAmountRate", amount.getString("regimentalPromotionAmountRate"));
|
|
|
}
|
|
|
- JSONObject promoter = promoterService.getgetMonthPromoterTotal(userList, startDate, endDate);
|
|
|
+ JSONObject promoter = promoterService.getgetMonthPromoterTotal(userList, startDate, endDate, mediaId);
|
|
|
if (Check.isNotNull(promoter)) {
|
|
|
data.put("promoterCount", promoter.getString("count"));
|
|
|
data.put("promoterRate", promoter.getString("rate"));
|
|
@@ -751,10 +790,10 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
}
|
|
|
|
|
|
// 招商—数据分析
|
|
|
- private JSONObject getDataAnalysisByAttractInvestment(List<Long> userList, String startDate, String endDate) {
|
|
|
+ private JSONObject getDataAnalysisByAttractInvestment(List<Long> userList, String startDate, String endDate, String mediaId) {
|
|
|
JSONObject data = new JSONObject();
|
|
|
//查询登录人(创建人)的所有商品
|
|
|
- List<Long> itemIds = kuaishouItemCollectSamplesMapper.getItemIdsByCreateId(userList);
|
|
|
+ List<Long> itemIds = kuaishouItemCollectSamplesMapper.getItemIdsByCreateId(userList, mediaId);
|
|
|
if (Check.isNotNull(itemIds)) {
|
|
|
if (Check.isNull(startDate) && Check.isNull(endDate)) {
|
|
|
//当前月份第一天
|
|
@@ -766,10 +805,18 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
map.put("start", startDate);
|
|
|
map.put("end", endDate);
|
|
|
map.put("itemIds", itemIds);
|
|
|
+ map.put("IntStart", DateUtils.strDateToInt(startDate));
|
|
|
+ map.put("IntEnd", DateUtils.strDateToInt(endDate));
|
|
|
map.put("startLong", DateUtils.getStartLongTime(startDate));
|
|
|
map.put("toStartLong", DateUtils.getStartLongTime(endDate));
|
|
|
map.put("endLong", DateUtils.getEndLongTime(endDate));
|
|
|
- List<JSONObject> list = supplyChainService.getMonthOrderAmountByItems(map);
|
|
|
+ List<JSONObject> list = null;
|
|
|
+ if ("1".equals(mediaId)) {
|
|
|
+ list = supplyChainService.getMonthOrderAmountByItemsBytedance(map);
|
|
|
+ } else {
|
|
|
+ list = supplyChainService.getMonthOrderAmountByItems(map);
|
|
|
+ ;
|
|
|
+ }
|
|
|
List<String> allDates = DateUtils.getAllDatesOfTwoTimes(startDate, endDate);
|
|
|
if (Check.isNull(list) || list.size() != allDates.size()) {
|
|
|
String orderAmountStr = JSONObject.toJSONString(list);
|
|
@@ -793,7 +840,12 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
}
|
|
|
});
|
|
|
data.put("list", list);
|
|
|
- JSONObject amount = supplyChainService.getMonthOrderAmountTotalByItems(map);
|
|
|
+ JSONObject amount = null;
|
|
|
+ if ("1".equals(mediaId)) {
|
|
|
+ amount = supplyChainService.getMonthOrderAmountTotalByItemsBytedance(map);
|
|
|
+ } else {
|
|
|
+ amount = supplyChainService.getMonthOrderAmountTotalByItems(map);
|
|
|
+ }
|
|
|
if (Check.isNotNull(amount)) {
|
|
|
data.put("orderAmount", amount.getInteger("orderAmount"));
|
|
|
data.put("regimentalPromotionAmount", amount.getInteger("regimentalPromotionAmount"));
|