ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit 1197b3e9feb16a58c01bde09531416e356c66ef8 2 parents 49bd0d57 fd214fc1

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

Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
@@ -523,7 +523,6 @@ public class DepositServiceImpl implements DepositService { @@ -523,7 +523,6 @@ public class DepositServiceImpl implements DepositService {
523 } 523 }
524 524
525 DepositDetailBo.DepositDetailBoBuilder depositDetailBoBuilder = DepositDetailBo.builder() 525 DepositDetailBo.DepositDetailBoBuilder depositDetailBoBuilder = DepositDetailBo.builder()
526 - .orderCode(storageDeposit.getOrderCode())  
527 .depositCode(storageDeposit.getDepositCode()) 526 .depositCode(storageDeposit.getDepositCode())
528 .skup(storageDeposit.getSkup()) 527 .skup(storageDeposit.getSkup())
529 .status(storageDeposit.getStatus()) 528 .status(storageDeposit.getStatus())
@@ -533,10 +532,12 @@ public class DepositServiceImpl implements DepositService { @@ -533,10 +532,12 @@ public class DepositServiceImpl implements DepositService {
533 Map<Long, List<String>> orderStatusStr = depositHelpService.queryAppraiseOrderStatusEx(storageDeposit.getOrderCode()); 532 Map<Long, List<String>> orderStatusStr = depositHelpService.queryAppraiseOrderStatusEx(storageDeposit.getOrderCode());
534 533
535 depositDetailBoBuilder.depositStatusName(CollectionUtils.isNotEmpty(orderStatusStr.get(storageDeposit.getOrderCode())) ? orderStatusStr.get(storageDeposit.getOrderCode()).get(0) : "") 534 depositDetailBoBuilder.depositStatusName(CollectionUtils.isNotEmpty(orderStatusStr.get(storageDeposit.getOrderCode())) ? orderStatusStr.get(storageDeposit.getOrderCode()).get(0) : "")
536 - .depositDescName(CollectionUtils.isNotEmpty(orderStatusStr.get(storageDeposit.getOrderCode())) ? orderStatusStr.get(storageDeposit.getOrderCode()).get(1) : ""); 535 + .depositDescName(CollectionUtils.isNotEmpty(orderStatusStr.get(storageDeposit.getOrderCode())) ? orderStatusStr.get(storageDeposit.getOrderCode()).get(1) : "")
  536 + .orderCode(storageDeposit.getParentOrderCode());
537 } else { // 正常的买家订单召回 537 } else { // 正常的买家订单召回
538 depositDetailBoBuilder.depositStatusName(StorageDepositStatusEnum.getAppStatusNameByCode(storageDeposit.getStatus())) 538 depositDetailBoBuilder.depositStatusName(StorageDepositStatusEnum.getAppStatusNameByCode(storageDeposit.getStatus()))
539 - .depositDescName(StorageDepositStatusEnum.getAppStatusDescByCode(storageDeposit.getStatus())); 539 + .depositDescName(StorageDepositStatusEnum.getAppStatusDescByCode(storageDeposit.getStatus()))
  540 + .orderCode(storageDeposit.getOrderCode());
540 } 541 }
541 542
542 return depositDetailBoBuilder.build(); 543 return depositDetailBoBuilder.build();