Explorar o código

Merge remote-tracking branch 'origin/master'

yumeng hai 5 meses
pai
achega
8582a23318

+ 1 - 1
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/service/impl/KuaishouMaterialVideoReportDailyServiceImpl.java

@@ -60,7 +60,7 @@ public class KuaishouMaterialVideoReportDailyServiceImpl extends ServiceImpl<Kua
         JSONObject resultJson = JSONObject.parseObject(result);
         JSONObject resultJson = JSONObject.parseObject(result);
         JSONArray details = resultJson.getJSONArray("details");
         JSONArray details = resultJson.getJSONArray("details");
         if (null == details || details.size() <= 0) {
         if (null == details || details.size() <= 0) {
-            log.error("快手视频日报返回详情为空,accountId:{}", advertiserId);
+            log.error("快手视频日报返回详情为空,accountId:{},返还:{}", advertiserId,resultJson);
             return;
             return;
         }
         }
         Boolean toGet = true;
         Boolean toGet = true;

+ 128 - 36
job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/RuixuanJob.java

@@ -16,36 +16,59 @@ import java.util.Map;
 public class RuixuanJob {
 public class RuixuanJob {
 
 
     private static final String RX_IP = "http://ruixuan.api.tjyourong.com.cn/";
     private static final String RX_IP = "http://ruixuan.api.tjyourong.com.cn/";
+    private static final String COMMON_IP = ".api.tjyourong.com.cn/isv/supply_chain/";
+    private static final String SHOP_IP = ".api.tjyourong.com.cn/isv/supply_chain/insertShopInfo";
 
 
     /**
     /**
-     * 昨天到今天的数据 kwaixiaodian_order_cursor_list
+     * 昨天的数据 kwaixiaodian_order_cursor_list
      */
      */
     @XxlJob("querykwaiOrderList")
     @XxlJob("querykwaiOrderList")
     public void querykwaiOrderList() {
     public void querykwaiOrderList() {
-        String param = XxlJobHelper.getJobParam(); // 执行参数
-        if (Check.isNull(param)) {
-            log.error("入参为空");
-            return;
-        }
-        String today = DateUtils.getNowDate("yyyy-MM-dd");
-        String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", today, -1);
+        try {
+            String param = XxlJobHelper.getJobParam(); // 执行参数
+            if (Check.isNull(param)) {
+                log.error("入参为空");
+                return;
+            }
+            String today = DateUtils.getNowDate("yyyy-MM-dd");
+            String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", today, -1);
 
 
-        Map<String, Object> createMap = new HashMap<>();
-        createMap.put("shopId", param);
-        createMap.put("queryType", 1);
-        createMap.put("beginDate", yesterday);
-        createMap.put("endDate", yesterday);
+            //queryType:1按创建时间查找 2按更新时间查找 ,默认创建时间
 
 
-        //获取订单列表
-        String listUrl = RX_IP + "kwaixiaodian/item/querykwaiOrderList";
-        HttpUtils.httpGet(listUrl, createMap, null);
+            Map<String, Object> createMap = new HashMap<>();
+            createMap.put("shopId", param);
+            createMap.put("queryType", 1);
+            createMap.put("beginDate", yesterday);
+            createMap.put("endDate", yesterday);
+
+            //获取订单列表
+            String listUrl = RX_IP + "kwaixiaodian/item/querykwaiOrderList";
+            HttpUtils.httpGet(listUrl, createMap, null);
 
 
-        Map<String, Object> updateMap = new HashMap<>();
-        updateMap.put("shopId", param);
-        updateMap.put("queryType", 2);
-        updateMap.put("beginDate", yesterday);
-        updateMap.put("endDate", yesterday);
-        HttpUtils.httpGet(listUrl, updateMap, null);
+            /* -----------获取售后单列表 ↓↓↓ begin*/
+
+            Thread.sleep(10000);
+            //获取售后单列表
+            String rxAfterIp = RX_IP + "kwaixiaodian/item/afterSalesList";
+            HttpUtils.httpGet(rxAfterIp, createMap, null);
+            /* -----------获取售后单列表 ↑↑↑ end*/
+
+            Thread.sleep(10000);
+            Map<String, Object> updateMap = new HashMap<>();
+            updateMap.put("shopId", param);
+            updateMap.put("queryType", 2);
+            updateMap.put("beginDate", yesterday);
+            updateMap.put("endDate", yesterday);
+            HttpUtils.httpGet(listUrl, updateMap, null);
+
+            /* -----------获取售后单列表 ↓↓↓ begin*/
+            Thread.sleep(10000);
+            HttpUtils.httpGet(rxAfterIp, updateMap, null);
+            /* -----------获取售后单列表 ↑↑↑ end*/
+
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
     }
     }
 
 
     /**
     /**
@@ -53,6 +76,36 @@ public class RuixuanJob {
      */
      */
     @XxlJob("queryNowdayKWaiOrderList")
     @XxlJob("queryNowdayKWaiOrderList")
     public void queryNowDaykwaiOrderList() {
     public void queryNowDaykwaiOrderList() {
+        try {
+            String param = XxlJobHelper.getJobParam(); // 执行参数
+            if (Check.isNull(param)) {
+                log.error("入参为空");
+                return;
+            }
+            Map<String, Object> createMap = new HashMap<>();
+            createMap.put("shopId", param);
+
+            //获取订单列表
+            String listUrl = RX_IP + "kwaixiaodian/item/queryNowdayKWaiOrderList";
+            HttpUtils.httpGet(listUrl, createMap, null);
+
+            /* -----------获取售后单列表 ↓↓↓ begin*/
+            Thread.sleep(10000);
+            //获取售后单列表
+            String rxAfterIp = RX_IP + "kwaixiaodian/item/queryNowdayafterSalesList";
+            HttpUtils.httpGet(rxAfterIp, createMap, null);
+            /* -----------获取售后单列表 ↑↑↑ end*/
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 获取90天内的数据 kwaixiaodian_order_cursor_list
+     */
+    @XxlJob("querykwaiOrderListMonth")
+    public void querykwaiOrderListMonth() {
         String param = XxlJobHelper.getJobParam(); // 执行参数
         String param = XxlJobHelper.getJobParam(); // 执行参数
         if (Check.isNull(param)) {
         if (Check.isNull(param)) {
             log.error("入参为空");
             log.error("入参为空");
@@ -61,17 +114,22 @@ public class RuixuanJob {
         Map<String, Object> createMap = new HashMap<>();
         Map<String, Object> createMap = new HashMap<>();
         createMap.put("shopId", param);
         createMap.put("shopId", param);
 
 
-        //获取订单列表
-        String listUrl = RX_IP + "kwaixiaodian/item/queryNowdayKWaiOrderList";
+//        //获取订单列表
+//        String listUrl = RX_IP + "kwaixiaodian/item/querykwaiOrderListMonth";
+//
+        //获取售后单列表
+        String listUrl = RX_IP + "kwaixiaodian/item/queryAfterSalesListMonth";
         HttpUtils.httpGet(listUrl, createMap, null);
         HttpUtils.httpGet(listUrl, createMap, null);
     }
     }
 
 
+
     /**
     /**
-     * 获取30天内的数据 kwaixiaodian_order_cursor_list
+     * 店铺体验分、带货口碑分 kwaixiaodian_shop_score
      */
      */
-    @XxlJob("querykwaiOrderListMonth")
-    public void querykwaiOrderListMonth() {
-        String param = XxlJobHelper.getJobParam(); // 执行参数
+    @XxlJob("queryShopScore")
+    public void queryShopScore() {
+        // 执行参数
+        String param = XxlJobHelper.getJobParam();
         if (Check.isNull(param)) {
         if (Check.isNull(param)) {
             log.error("入参为空");
             log.error("入参为空");
             return;
             return;
@@ -79,12 +137,16 @@ public class RuixuanJob {
         Map<String, Object> createMap = new HashMap<>();
         Map<String, Object> createMap = new HashMap<>();
         createMap.put("shopId", param);
         createMap.put("shopId", param);
 
 
-        //获取订单列表
-        String listUrl = RX_IP + "kwaixiaodian/item/querykwaiOrderListMonth";
-        HttpUtils.httpGet(listUrl, createMap, null);
+        //获取带货口碑分信息
+        String url = RX_IP + "kwaixiaodian/item/queryMasterScore";
+        HttpUtils.httpGet(url, createMap, null);
+
+        //获取店铺体验分信息
+        String Url2 = RX_IP + "kwaixiaodian/item/queryShopScore";
+        HttpUtils.httpGet(Url2, createMap, null);
+
     }
     }
 
 
-    private static final String COMMON_IP = ".api.tjyourong.com.cn/isv/supply_chain/insertNowdayOrderList";
 
 
     /**
     /**
      * 插入昨天数据 kuaishou_supply_chain
      * 插入昨天数据 kuaishou_supply_chain
@@ -102,9 +164,9 @@ public class RuixuanJob {
             String tokenId = arr[1];
             String tokenId = arr[1];
             String url = null;
             String url = null;
             if ("miaogousi".equals(dbType)) {
             if ("miaogousi".equals(dbType)) {
-                url = "http://mgs" + COMMON_IP;
+                url = "http://mgs" + COMMON_IP + "insertOrderList";
             } else {
             } else {
-                url = "http://" + dbType + COMMON_IP;
+                url = "http://" + dbType + COMMON_IP + "insertOrderList";
             }
             }
             log.info("---tokenId:{},订单URL:{}", tokenId, url);
             log.info("---tokenId:{},订单URL:{}", tokenId, url);
             String today = DateUtils.getNowDate("yyyy-MM-dd");
             String today = DateUtils.getNowDate("yyyy-MM-dd");
@@ -143,9 +205,9 @@ public class RuixuanJob {
             String tokenId = arr[1];
             String tokenId = arr[1];
             String url = null;
             String url = null;
             if ("miaogousi".equals(dbType)) {
             if ("miaogousi".equals(dbType)) {
-                url = "http://mgs" + COMMON_IP;
+                url = "http://mgs" + COMMON_IP + "insertNowdayOrderList";
             } else {
             } else {
-                url = "http://" + dbType + COMMON_IP;
+                url = "http://" + dbType + COMMON_IP + "insertNowdayOrderList";
             }
             }
 
 
             //获取订单列表
             //获取订单列表
@@ -156,4 +218,34 @@ public class RuixuanJob {
         }
         }
     }
     }
 
 
+    /**
+     * 插入店铺名称
+     * 昨天+今天 kuaishou_activity_shop_info
+     */
+    @XxlJob("insertShopInfo")
+    public void insertShopInfo() {
+        String param = XxlJobHelper.getJobParam(); // 执行参数
+        if (Check.isNull(param)) {
+            log.error("入参为空");
+            return;
+        }
+        String[] arr = param.split("_");
+        if (arr.length > 1) {
+            String dbType = arr[0];
+            String tokenId = arr[1];
+            String url = null;
+            if ("miaogousi".equals(dbType)) {
+                url = "http://mgs" + SHOP_IP;
+            } else {
+                url = "http://" + dbType + SHOP_IP;
+            }
+            log.info("---tokenId:{},订单URL:{}", tokenId, url);
+            Map<String, Object> createMap = new HashMap<>();
+            createMap.put("tokenId", tokenId);
+            createMap.put("bdtype", dbType);
+            //录入店铺名称
+            HttpUtils.httpGet(url, createMap, null);
+        }
+    }
+
 }
 }