diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index 98ddf13..2792900 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -707,16 +707,13 @@ public class BuyOrderServiceImpl extends ServiceImpl impl expressOrder.setCounty(buyOrder.getDistrict()); expressOrder.setAddress(buyOrder.getAddress()); expressOrder.setRemark(remark); - // 生成快递面单(测试假单号,上线改回 placeExpressOrder) - String expressOrderSn = "SF" + (1000000000L + (long) (Math.random() * 8999999999L)); - String printTemplate = ""; - try { - Thread.sleep(300); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - // ExpressOrderResponseVo response = expressOrderService.placeExpressOrder(expressOrder); - // if(response.isSuccess()){ + // 生成快递面单 + ExpressOrderResponseVo response = expressOrderService.placeExpressOrder(expressOrder); + if(response.isSuccess()){ + String expressOrderSn = response.getOrder().getLogisticCode(); +// String printTemplate = response.getPrintTemplate(); + String printTemplate = pushHtmlToOss(response.getPrintTemplate(),expressOrderSn+".html"); + expressOrder.setExpressOrderSn(expressOrderSn); expressOrder.setPrintTemplate(printTemplate); expressOrderDao.insert(expressOrder); @@ -741,9 +738,9 @@ public class BuyOrderServiceImpl extends ServiceImpl impl } updateBatchById(buyOrderList); return R.ok(); - //}else { - // return R.error(response.getReason()); - //} + }else { + return R.error(response.getReason()); + } } @Override