后台申请单详情

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysExchangeApplyOrderServiceImpl.java

@@ -226,13 +226,13 @@ public class SysExchangeApplyOrderServiceImpl implements SysExchangeApplyOrderSe
             if (StringUtils.hasLength(userOrderId)) {
                 commitOrder = distributionOrderDao.findById(userOrderId);
                 EntityMapper.copyAttribute(commitOrder, commitOrderVo);
-            }
-            //用户寄来平台的物流信息
+            // 用户寄来平台的物流信息
                 List<ExchangeOrderSnapshot> commitExchangeOrderSnapshots = exchangeOrderSnapshotDao.findByOrderId(userOrderId);
                 if (!CollectionUtils.isEmpty(commitExchangeOrderSnapshots)) {
                     commitOrderVo.setFromLogisticsCode(commitExchangeOrderSnapshots.get(0).getLogisticsCode());
                     commitOrderVo.setFromWaybill(commitExchangeOrderSnapshots.get(0).getWaybill());
                 }
+            }
             
             //交换的目标商品
             long targetItemId = exchangeApplyOrder.getTargetItemId();
@@ -257,13 +257,13 @@ public class SysExchangeApplyOrderServiceImpl implements SysExchangeApplyOrderSe
             if (StringUtils.hasLength(targetUserOrderId)) {
                 receiveOrder = distributionOrderDao.findById(targetUserOrderId);
                 EntityMapper.copyAttribute(receiveOrder, receiveOrderVo);
-            }
                 //用户寄来平台的物流信息
                 List<ExchangeOrderSnapshot> receiveExchangeOrderSnapshots = exchangeOrderSnapshotDao.findByOrderId(targetUserOrderId);
                 if (!CollectionUtils.isEmpty(receiveExchangeOrderSnapshots)) {
                     receiveOrderVo.setFromLogisticsCode(receiveExchangeOrderSnapshots.get(0).getLogisticsCode());
                     receiveOrderVo.setFromWaybill(receiveExchangeOrderSnapshots.get(0).getWaybill());
                 }
+            }
             List<SupplierItemVo> userItemList = new ArrayList<>();
             //用户用来交换的商品
             for (ExchangeApplyOrderDetail exchangeApplyOrderDetail : detailList) {