diff --git a/src/main/java/com/management/controller/ReimbursementController.java b/src/main/java/com/management/controller/ReimbursementController.java index a466eeb..5c479d9 100644 --- a/src/main/java/com/management/controller/ReimbursementController.java +++ b/src/main/java/com/management/controller/ReimbursementController.java @@ -84,14 +84,16 @@ public class ReimbursementController { String expensesUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/em/er_dailyreimbursebill/dailyreimbursebillQuery"; - JSONObject expensesRes = new JSONObject(); + String expensesResStr = ""; try { - expensesRes = restTemplate.postForObject(expensesUrl, expensesEntity, JSONObject.class); + expensesResStr = restTemplate.postForObject(expensesUrl, expensesEntity, String.class); } catch (Exception e) { e.printStackTrace(); } + JSONObject expensesRes = JSON.parseObject(expensesResStr); + System.out.println(expensesRes); //开始判断是否存在符合条件的数据 @@ -398,14 +400,16 @@ public class ReimbursementController { String expensesUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/em/er_publicreimbursebill/publicreimbursebillQuery"; - JSONObject expensesRes = new JSONObject(); + String expensesResStr = ""; try { - expensesRes = restTemplate.postForObject(expensesUrl, expensesEntity, JSONObject.class); + expensesResStr = restTemplate.postForObject(expensesUrl, expensesEntity, String.class); } catch (Exception e) { e.printStackTrace(); } + JSONObject expensesRes = JSON.parseObject(expensesResStr); + System.out.println(expensesRes); //判断是否成功或者数据是否存在 @@ -702,14 +706,16 @@ public class ReimbursementController { String expensesUrl = ERPURLConstant.ERP_URL + "/ierp/kapi/v2/f9w5/em/er_tripreimbursebill/query"; - JSONObject expensesRes = new JSONObject(); + String expensesResStr = ""; try { - expensesRes = restTemplate.postForObject(expensesUrl, expensesEntity, JSONObject.class); + expensesResStr = restTemplate.postForObject(expensesUrl, expensesEntity, String.class); } catch (Exception e) { e.printStackTrace(); } + JSONObject expensesRes = JSON.parseObject(expensesResStr); + System.out.println(expensesRes); if (!"0".equals(expensesRes.getString("errorCode")) || expensesRes.getJSONObject("data").getJSONArray("rows").isEmpty()) { diff --git a/src/main/java/com/management/task/CrmTask.java b/src/main/java/com/management/task/CrmTask.java index 9988068..7f20e12 100644 --- a/src/main/java/com/management/task/CrmTask.java +++ b/src/main/java/com/management/task/CrmTask.java @@ -38,6 +38,8 @@ public class CrmTask { BankInfoController bankInfoController; @Autowired ReimbursementController reimbursementController; + @Autowired + VendorController vendorController; /** * 定时任务获取纷享销客token @@ -79,6 +81,7 @@ public class CrmTask { // reimbursementController.syncReimbursement(); // reimbursementController.syncPublicExpenses(); // reimbursementController.syncTravelExpenses(); +// vendorController.syncVendor(); // System.out.println("ERP数据执行完毕"); // } diff --git a/src/main/java/com/management/task/CrmTaskTZ.java b/src/main/java/com/management/task/CrmTaskTZ.java index c1298ee..ef1330f 100644 --- a/src/main/java/com/management/task/CrmTaskTZ.java +++ b/src/main/java/com/management/task/CrmTaskTZ.java @@ -41,7 +41,7 @@ public class CrmTaskTZ { // projectInitiateController.syncProjectInitiate(); // deliveryReqController.syncDeliveryReq(); // deliveryReqController.syncRefund(); -// //deviceInstallController.syncDeviceInstall(); +// deviceInstallController.syncDeviceInstall(); // deviceInstallController.upDeviceInstall(); // xshtController.syncSaleOrder(); // yqhtController.syncYQHT();