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 29546efa1d4d839d4c72d214d02c57cbd69b8abd..1aab1c84226c78829f69cd2a3a284443b9d5ebad 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 e0d0a348a1213885bf20f51b890947f9979bd7f3..706f0cb43ef899c639e0e17d6222b1487d61b9d8 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 61a0d39aa0597b1b30d293c4046e5c1e83ab1142..b56893d1fa46e2f4ad68ab4baf5af52dd1b5c82d 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 7d8c0340f309fb325fe033c7e3afc51c04b7ac5a..f91177a5a5d7b812af04ad89c66ec6e6bf1d5f95 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 7c3e19dde8918120d9b2500beb2e0f05dbd4cf47..c1fa1e9b17667e816f805b78db87d57f6aa20851 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 ce044b0ad0a5b5b99bfff2e99c2a2b416c01dab4..b5044552473ae2f1980e0d67697a28819b249237 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 aae88761e49c9b7585db7bd056c7e7cdb35a0adb..9b5454efab44fbc9b4ed0775d8bcb6fe93c25dbb 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