|
@@ -458,7 +458,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
}
|
|
|
JSONObject sample = kuaishouItemCollectSamplesMapper.queryTheNumberOfCompletedJobs(promoterIds, startDate, endDate, mediaId);
|
|
|
|
|
|
- data.put("completeCount", sample.getInteger("completeCount"));//完成作业数
|
|
|
+ data.put("completeCount", sample.getLong("completeCount"));//完成作业数
|
|
|
data.put("completeRate", sample.getString("completeRate"));//合格作业率
|
|
|
JSONObject order = new JSONObject();
|
|
|
|
|
@@ -467,13 +467,13 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
} else {
|
|
|
order = supplyChainService.selectOrderInfo(promoterIds, startDate, endDate);
|
|
|
}
|
|
|
- data.put("allNumber", order.getInteger("allNumber"));//订单总数
|
|
|
- data.put("promoterCount", order.getInteger("promoterCount"));//达人总数
|
|
|
- data.put("validOrderNUm", order.getInteger("validOrderNUm"));//有效订单数
|
|
|
- data.put("inValidOrderNUm", order.getInteger("allNumber") - order.getInteger("validOrderNUm"));//失效订单数
|
|
|
- data.put("orderAmount", order.getInteger("orderAmount"));//订单金额
|
|
|
- data.put("regimentalPromotionAmount", order.getInteger("regimentalPromotionAmount"));//预估服务费
|
|
|
- data.put("baseAmount", order.getInteger("baseAmount"));//累计货贷基数
|
|
|
+ data.put("allNumber", order.getLong("allNumber"));//订单总数
|
|
|
+ data.put("promoterCount", order.getLong("promoterCount"));//达人总数
|
|
|
+ data.put("validOrderNUm", order.getLong("validOrderNUm"));//有效订单数
|
|
|
+ data.put("inValidOrderNUm", order.getLong("allNumber") - order.getLong("validOrderNUm"));//失效订单数
|
|
|
+ data.put("orderAmount", order.getLong("orderAmount"));//订单金额
|
|
|
+ data.put("regimentalPromotionAmount", order.getLong("regimentalPromotionAmount"));//预估服务费
|
|
|
+ data.put("baseAmount", order.getLong("baseAmount"));//累计货贷基数
|
|
|
|
|
|
Date date = new Date();
|
|
|
//当前小时
|
|
@@ -584,15 +584,15 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
} else {
|
|
|
order = supplyChainService.selectOrderInfoByItemIds(itemIds, startDate, endDate);
|
|
|
}
|
|
|
- data.put("sendCount", order.getInteger("sendCount"));//发货数
|
|
|
+ data.put("sendCount", order.getLong("sendCount"));//发货数
|
|
|
data.put("sendRate", order.getString("sendRate"));//订单发货率
|
|
|
- data.put("allNumber", order.getInteger("allNumber"));//订单总数
|
|
|
- data.put("promoterCount", order.getInteger("promoterCount"));//达人总数
|
|
|
- data.put("validOrderNUm", order.getInteger("validOrderNUm"));//有效订单数
|
|
|
- data.put("inValidOrderNUm", order.getInteger("allNumber") - order.getInteger("validOrderNUm"));//失效订单数
|
|
|
- data.put("orderAmount", order.getInteger("orderAmount"));//订单金额
|
|
|
- data.put("regimentalPromotionAmount", order.getInteger("regimentalPromotionAmount"));//预估服务费
|
|
|
- data.put("baseAmount", order.getInteger("baseAmount"));//累计货贷基数
|
|
|
+ data.put("allNumber", order.getLong("allNumber"));//订单总数
|
|
|
+ data.put("promoterCount", order.getLong("promoterCount"));//达人总数
|
|
|
+ data.put("validOrderNUm", order.getLong("validOrderNUm"));//有效订单数
|
|
|
+ data.put("inValidOrderNUm", order.getLong("allNumber") - order.getLong("validOrderNUm"));//失效订单数
|
|
|
+ data.put("orderAmount", order.getLong("orderAmount"));//订单金额
|
|
|
+ data.put("regimentalPromotionAmount", order.getLong("regimentalPromotionAmount"));//预估服务费
|
|
|
+ data.put("baseAmount", order.getLong("baseAmount"));//累计货贷基数
|
|
|
|
|
|
Date date = new Date();
|
|
|
//当前小时
|
|
@@ -791,8 +791,8 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
}
|
|
|
|
|
|
if (Check.isNotNull(amount)) {
|
|
|
- data.put("orderAmount", amount.getInteger("orderAmount"));
|
|
|
- data.put("regimentalPromotionAmount", amount.getInteger("regimentalPromotionAmount"));
|
|
|
+ data.put("orderAmount", amount.getLong("orderAmount"));
|
|
|
+ data.put("regimentalPromotionAmount", amount.getLong("regimentalPromotionAmount"));
|
|
|
data.put("orderAmountRate", amount.getString("orderAmountRate"));
|
|
|
data.put("regimentalPromotionAmountRate", amount.getString("regimentalPromotionAmountRate"));
|
|
|
}
|
|
@@ -863,8 +863,8 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
amount = supplyChainService.getMonthOrderAmountTotalByItems(map);
|
|
|
}
|
|
|
if (Check.isNotNull(amount)) {
|
|
|
- data.put("orderAmount", amount.getInteger("orderAmount"));
|
|
|
- data.put("regimentalPromotionAmount", amount.getInteger("regimentalPromotionAmount"));
|
|
|
+ data.put("orderAmount", amount.getLong("orderAmount"));
|
|
|
+ data.put("regimentalPromotionAmount", amount.getLong("regimentalPromotionAmount"));
|
|
|
data.put("orderAmountRate", amount.getString("orderAmountRate"));
|
|
|
data.put("regimentalPromotionAmountRate", amount.getString("regimentalPromotionAmountRate"));
|
|
|
data.put("orderCount", amount.getString("orderCount"));
|