|
@@ -462,12 +462,17 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple |
|
@@ -462,12 +462,17 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple |
462
|
//
|
462
|
//
|
463
|
Long orderCode = appraiseOrder.getOrderCode();
|
463
|
Long orderCode = appraiseOrder.getOrderCode();
|
464
|
Long parentOrderCode;
|
464
|
Long parentOrderCode;
|
|
|
465
|
+ Long paidOrderCode;
|
465
|
boolean isParent = Objects.isNull(parentOrderCode=appraiseOrder.getParentOrderCode());
|
466
|
boolean isParent = Objects.isNull(parentOrderCode=appraiseOrder.getParentOrderCode());
|
466
|
AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.SHAM_SEND_OUT;
|
467
|
AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.SHAM_SEND_OUT;
|
467
|
AppraiseOrderStatus expectedStatus = AppraiseOrderStatus.SELLER_SEND_OUT;
|
468
|
AppraiseOrderStatus expectedStatus = AppraiseOrderStatus.SELLER_SEND_OUT;
|
468
|
if(isParent){
|
469
|
if(isParent){
|
469
|
- triggerStatusChangeByParentCode(parentOrderCode, targetOrderStatus, expectedStatus);
|
470
|
+ logger.info("shamDeliver isParent orderCode {} ", orderCode);
|
|
|
471
|
+ paidOrderCode = orderCode;
|
|
|
472
|
+ triggerStatusChangeByParentCode(orderCode, targetOrderStatus, expectedStatus);
|
470
|
}else {
|
473
|
}else {
|
|
|
474
|
+ logger.info("shamDeliver is not Parent orderCode {} ", orderCode);
|
|
|
475
|
+ paidOrderCode = parentOrderCode;
|
471
|
//no parent
|
476
|
//no parent
|
472
|
triggerStatusConsistencyCheck(orderCode);
|
477
|
triggerStatusConsistencyCheck(orderCode);
|
473
|
}
|
478
|
}
|
|
@@ -479,7 +484,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple |
|
@@ -479,7 +484,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple |
479
|
.loadUser(appraiseOrder.getUid())
|
484
|
.loadUser(appraiseOrder.getUid())
|
480
|
.loadActionCase(SellerWalletDetail.Type.SELLER_SHAM_SEND_OUT)
|
485
|
.loadActionCase(SellerWalletDetail.Type.SELLER_SHAM_SEND_OUT)
|
481
|
.loadRefundAction(payRefundService::refund)
|
486
|
.loadRefundAction(payRefundService::refund)
|
482
|
- .loadOrder(appraiseOrder.getOrderCode(), appraiseOrder.getParentOrderCode(), appraiseOrder.getPayment(), appraiseOrder.getAmount())
|
487
|
+ .loadOrder(orderCode, paidOrderCode, appraiseOrder.getPayment(), appraiseOrder.getAmount())
|
483
|
.refund();
|
488
|
.refund();
|
484
|
return rows;
|
489
|
return rows;
|
485
|
}
|
490
|
}
|