diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index e8a3274..f1b758a 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -163,7 +163,7 @@ public class CustomerService { * @return 是否成功 */ @Transactional(rollbackFor = Exception.class) - public void turnBack(TurnBackDTO turnBackDTOS) { + public void turnBack(TurnBackDTO turnBackDTOS) throws Exception { if (turnBackDTOS.getWxData().getUnionId() == null || turnBackDTOS.getUserId() == null) { log.info("unionId 是空不操作"); return; @@ -222,11 +222,7 @@ public class CustomerService { if (turnBackDTOS.getVipData() != null) { log.info("如果有vip数据就认为是vip客户然后绑定客户vip关系"); //有vip数据就不需要重新请求bsd的vip接口 - try { - vipCheck(turnBackDTOS); - } catch (ParseException e) { - e.printStackTrace(); - } + vipCheck(turnBackDTOS); } } @@ -235,7 +231,7 @@ public class CustomerService { * * @param turnBackDTO vip数据 */ - private void vipCheck(TurnBackDTO turnBackDTO) throws ParseException { + private void vipCheck(TurnBackDTO turnBackDTO) throws Exception { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); OpCustomer opCustomer = new OpCustomer(turnBackDTO.getName(), turnBackDTO.getPhone()); opCustomer.setUpdateBy(Constants.SYS_OPERATION); diff --git a/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java b/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java index ace466e..30df7e8 100644 --- a/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java +++ b/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java @@ -78,10 +78,16 @@ public class SynchronousController { @RequestMapping(value = "/ics/customer", method = RequestMethod.POST, consumes = "application/json") @ResponseBody public String turnBack(@RequestBody List turnBackDTOS) { - String str = JSON.toJSONString(turnBackDTOS); - System.out.println(str); - turnBackDTOS.forEach(customerService::turnBack); - return DataImportUtil.succ(1); + try { + String str = JSON.toJSONString(turnBackDTOS); + System.out.println(str); + for (TurnBackDTO turnBackDTO : turnBackDTOS) { + customerService.turnBack(turnBackDTO); + } + return DataImportUtil.succ(1); + }catch (Exception e){ + return DataImportUtil.fail(e); + } } /**