|
@@ -474,7 +474,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
data.put("orderAmount", order.getLong("orderAmount"));//订单金额
|
|
|
data.put("regimentalPromotionAmount", order.getLong("regimentalPromotionAmount"));//预估服务费
|
|
|
data.put("baseAmount", order.getLong("baseAmount"));//累计货贷基数
|
|
|
- if("1".equals(mediaId)){
|
|
|
+ if ("1".equals(mediaId)) {
|
|
|
data.put("secondEstimatedCommission", order.getLong("secondEstimatedCommission"));// 预估服务费支出
|
|
|
|
|
|
}
|
|
@@ -726,6 +726,31 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
return kuaishouItemCollectSamplesMapper.getStatusStringByCourierNumbe(nu);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<JSONObject> getBigDataAnalysis(String mediaId) {
|
|
|
+ String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
|
|
|
+ String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
|
|
|
+ String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", endDate, -30);
|
|
|
+
|
|
|
+ if ("1".equals(mediaId)) {
|
|
|
+ return kuaishouItemCollectSamplesMapper.getBytedanceBigDataAnalysis(Long.valueOf(startDate.replace("-", "")), Long.valueOf(endDate.replace("-", "")));
|
|
|
+ } else if ("2".equals(mediaId)) {
|
|
|
+ return kuaishouItemCollectSamplesMapper.getKuaishouBigDataAnalysis(startDate, endDate);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ public static void main(String[] args) {
|
|
|
+ String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
|
|
|
+ String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
|
|
|
+ String startDate = DateUtils.getAnotherDay("yyyy-MM-dd", endDate, -30);
|
|
|
+ System.err.println(startDate);
|
|
|
+ System.err.println(endDate);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
// 渠道—数据分析
|
|
|
private JSONObject getDataAnalysisByChannel(List<Long> userList, String startDate, String endDate, String mediaId) {
|
|
|
JSONObject data = new JSONObject();
|