From d7dfb015771688fcc500e137198d215444da89f8 Mon Sep 17 00:00:00 2001 From: Nicky Liang Date: Thu, 31 May 2018 21:09:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=8F=91=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CallWayBillByHYCController.java | 10 +++---- .../spring/applicationContext-sehedule.xml | 8 +++--- .../service/CallOrderByHYCService.java | 2 ++ .../service/CallOrderByHYCServiceImpl.java | 16 ++++++++++++ .../service/CallWayBillByHYCServiceImpl.java | 26 +++++++++---------- .../interfaces/base/mapper/SoorderMapper.java | 2 ++ .../main/resources/mappers/SoorderMapper.xml | 7 +++++ 7 files changed, 48 insertions(+), 23 deletions(-) diff --git a/erp-hyc-interfaces-api/src/main/java/com/unlcn/erp/hyc/interfaces/api/controller/CallWayBillByHYCController.java b/erp-hyc-interfaces-api/src/main/java/com/unlcn/erp/hyc/interfaces/api/controller/CallWayBillByHYCController.java index 29546ef..1aab1c8 100644 --- a/erp-hyc-interfaces-api/src/main/java/com/unlcn/erp/hyc/interfaces/api/controller/CallWayBillByHYCController.java +++ b/erp-hyc-interfaces-api/src/main/java/com/unlcn/erp/hyc/interfaces/api/controller/CallWayBillByHYCController.java @@ -82,11 +82,11 @@ public class CallWayBillByHYCController { @RequestMapping(value = "/doSaveWaybill",method = RequestMethod.POST) @ResponseBody - public ResultDTO doSaveWaybill(String wayBill){ + public ResultDTO doSaveWaybill(String waybill){ LOGGER.info("CallOrderByHYCController.doSaveWaybill param:{}."); ResultDTO result = new ResultDTO(true, null, "运单保存成功"); try{ - callWayBillByHYCService.saveWayBillDetails(wayBill); + callWayBillByHYCService.saveWayBillDetails(waybill); }catch (Exception e){ LOGGER.error("TmsPickUpController.getExcepList error: {}", e); result.setSuccess(false); @@ -98,16 +98,16 @@ public class CallWayBillByHYCController { /** * 根据错误执行运单 - * @param wayBill + * @param waybill * @return */ @RequestMapping(value = "/doDisposeExeByCode", method = RequestMethod.POST) @ResponseBody - public ResultDTO doDisposeExeByCode(String wayBill){ + public ResultDTO doDisposeExeByCode(String waybill){ LOGGER.info("CallOrderByHYCController.saveWayBillByHYC param:{}."); ResultDTO result = new ResultDTO(true, null, "运单保存成功"); try{ - execptionDisposeService.doDisposeExeByCode(wayBill); + execptionDisposeService.doDisposeExeByCode(waybill); }catch (Exception e){ LOGGER.error("TmsPickUpController.getExcepList error: {}", e); result.setSuccess(false); diff --git a/erp-hyc-interfaces-api/src/main/resources/spring/applicationContext-sehedule.xml b/erp-hyc-interfaces-api/src/main/resources/spring/applicationContext-sehedule.xml index e0d0a34..706f0cb 100644 --- a/erp-hyc-interfaces-api/src/main/resources/spring/applicationContext-sehedule.xml +++ b/erp-hyc-interfaces-api/src/main/resources/spring/applicationContext-sehedule.xml @@ -30,12 +30,12 @@ - + - + @@ -43,12 +43,12 @@ - + - + diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCService.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCService.java index 61a0d39..b56893d 100644 --- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCService.java +++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCService.java @@ -14,4 +14,6 @@ public interface CallOrderByHYCService { void getOrderDetails(String orderCode) throws Exception; void saveOrderByCode(String orderCode) throws Exception; + + String getCustomerOrderCode(String orderCode) throws Exception; } diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java index 7d8c034..f91177a 100644 --- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java +++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Objects; /** * 获取订单信息 @@ -286,4 +287,19 @@ public class CallOrderByHYCServiceImpl implements CallOrderByHYCService{ soorderMapper.updateSaveSoorderByHYC(soorder); } } + + @Override + public String getCustomerOrderCode(String orderCode) throws Exception { + String customerOrderCode = ""; + //根据订单号获取订单详细信息 + String data = callHYCUrlReceiveService.callHYCUrlReceive(ORDERDETAILS,orderCode); + if(data == null){ + LOGGER.error(orderCode+"该订单查询的数据为空"); + } + HYCOrderDB db = JSONObject.parseObject(data, HYCOrderDB.class); + if(!Objects.isNull(db)){ + customerOrderCode = db.getCustomerordercode(); + } + return customerOrderCode; + } } diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java index 7c3e19d..c1fa1e9 100644 --- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java +++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java @@ -1,6 +1,7 @@ package com.unlcn.erp.hyc.interfaces.backend.service; import com.alibaba.dubbo.common.utils.CollectionUtils; +import com.alibaba.dubbo.common.utils.StringUtils; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; import com.unlcn.erp.hyc.interfaces.backend.bo.HYCWayBillDB; @@ -146,15 +147,13 @@ public class CallWayBillByHYCServiceImpl implements CallWayBillByHYCService{ for(int i = 0; i < wayBillDetailDBs.size(); i++){ HYCWayBillDetailDB detailDB = wayBillDetailDBs.get(i); - Soorder soorder = soorderMapper.getOrderByOrderNo(detailDB.getOrdercode()); - //如果为空，从接口中重新取得 - if(Objects.isNull(soorder)){ - callOrderByHYCService.getOrderDetails(detailDB.getOrdercode()); - soorder = soorderMapper.getOrderByOrderNo(detailDB.getOrdercode()); + String vcCustOrderNo= soorderMapper.getVcustomOrderNo(detailDB.getOrdercode()); + if(StringUtils.isEmpty(vcCustOrderNo)){ + vcCustOrderNo = callOrderByHYCService.getCustomerOrderCode(detailDB.getOrdercode()); } - Long iCustShipId = map.get(soorder.getVccustorderno()); + Long iCustShipId = map.get(vcCustOrderNo); Hycwaybilldetail hycwaybilldetail = new Hycwaybilldetail(); BeanUtils.copyProperties(detailDB,hycwaybilldetail); @@ -206,18 +205,17 @@ public class CallWayBillByHYCServiceImpl implements CallWayBillByHYCService{ List list = new ArrayList<>(); for(HYCWayBillDetailDB detaildb: wayBillDetailDBs){ - Soorder soorder = soorderMapper.getOrderByOrderNo(detaildb.getOrdercode()); - if(soorder == null){ - callOrderByHYCService.getOrderDetails(detaildb.getOrdercode()); - soorder = soorderMapper.getOrderByOrderNo(detaildb.getOrdercode()); + String vcCustOrderNo= soorderMapper.getVcustomOrderNo(detaildb.getOrdercode()); + if(StringUtils.isEmpty(vcCustOrderNo)){ + vcCustOrderNo = callOrderByHYCService.getCustomerOrderCode(detaildb.getOrdercode()); } //如果不存在 - if(!map.containsKey(soorder.getVccustorderno())){ + if(!map.containsKey(vcCustOrderNo)){ HycorderExample example = new HycorderExample(); - example.createCriteria().andCustomerordercodeEqualTo(soorder.getVccustorderno()); + example.createCriteria().andCustomerordercodeEqualTo(vcCustOrderNo); int intCount =hycorderMapper.countByExample(example); - map.put(soorder.getVccustorderno(),intCount); - list.add(soorder.getVccustorderno()); + map.put(vcCustOrderNo,intCount); + list.add(vcCustOrderNo); } } for(int i = 0; i < list.size(); i++){ diff --git a/erp-hyc-interfaces-base/src/main/java/com/unlcn/erp/hyc/interfaces/base/mapper/SoorderMapper.java b/erp-hyc-interfaces-base/src/main/java/com/unlcn/erp/hyc/interfaces/base/mapper/SoorderMapper.java index ce044b0..b504455 100644 --- a/erp-hyc-interfaces-base/src/main/java/com/unlcn/erp/hyc/interfaces/base/mapper/SoorderMapper.java +++ b/erp-hyc-interfaces-base/src/main/java/com/unlcn/erp/hyc/interfaces/base/mapper/SoorderMapper.java @@ -121,4 +121,6 @@ public interface SoorderMapper { Long updateSaveSoorderByHYC(Soorder record); + String getVcustomOrderNo(String vcorderno); + } \ No newline at end of file diff --git a/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml b/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml index aae8876..9b5454e 100644 --- a/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml +++ b/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml @@ -1450,4 +1450,11 @@ DCALKILOMETER = #{dcalkilometer,jdbcType=DECIMAL} where VCORDERNO = #{vcorderno,jdbcType=VARCHAR} + + + \ No newline at end of file -- Gitee