Merge remote-tracking branch 'origin/test6.9.10' into test6.9.10

@@ -523,7 +523,6 @@ public class DepositServiceImpl implements DepositService {
         }
 
         DepositDetailBo.DepositDetailBoBuilder depositDetailBoBuilder = DepositDetailBo.builder()
-                .orderCode(storageDeposit.getOrderCode())
                 .depositCode(storageDeposit.getDepositCode())
                 .skup(storageDeposit.getSkup())
                 .status(storageDeposit.getStatus())
@@ -533,10 +532,12 @@ public class DepositServiceImpl implements DepositService {
             Map<Long, List<String>> orderStatusStr = depositHelpService.queryAppraiseOrderStatusEx(storageDeposit.getOrderCode());
 
             depositDetailBoBuilder.depositStatusName(CollectionUtils.isNotEmpty(orderStatusStr.get(storageDeposit.getOrderCode())) ? orderStatusStr.get(storageDeposit.getOrderCode()).get(0) : "")
-                    .depositDescName(CollectionUtils.isNotEmpty(orderStatusStr.get(storageDeposit.getOrderCode())) ? orderStatusStr.get(storageDeposit.getOrderCode()).get(1) : "");
+                    .depositDescName(CollectionUtils.isNotEmpty(orderStatusStr.get(storageDeposit.getOrderCode())) ? orderStatusStr.get(storageDeposit.getOrderCode()).get(1) : "")
+                    .orderCode(storageDeposit.getParentOrderCode());
         } else {      // 正常的买家订单召回
             depositDetailBoBuilder.depositStatusName(StorageDepositStatusEnum.getAppStatusNameByCode(storageDeposit.getStatus()))
-                    .depositDescName(StorageDepositStatusEnum.getAppStatusDescByCode(storageDeposit.getStatus()));
+                    .depositDescName(StorageDepositStatusEnum.getAppStatusDescByCode(storageDeposit.getStatus()))
+                    .orderCode(storageDeposit.getOrderCode());
         }
 
         return depositDetailBoBuilder.build();