...
|
...
|
@@ -462,12 +462,17 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple |
|
|
//
|
|
|
Long orderCode = appraiseOrder.getOrderCode();
|
|
|
Long parentOrderCode;
|
|
|
Long paidOrderCode;
|
|
|
boolean isParent = Objects.isNull(parentOrderCode=appraiseOrder.getParentOrderCode());
|
|
|
AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.SHAM_SEND_OUT;
|
|
|
AppraiseOrderStatus expectedStatus = AppraiseOrderStatus.SELLER_SEND_OUT;
|
|
|
if(isParent){
|
|
|
triggerStatusChangeByParentCode(parentOrderCode, targetOrderStatus, expectedStatus);
|
|
|
logger.info("shamDeliver isParent orderCode {} ", orderCode);
|
|
|
paidOrderCode = orderCode;
|
|
|
triggerStatusChangeByParentCode(orderCode, targetOrderStatus, expectedStatus);
|
|
|
}else {
|
|
|
logger.info("shamDeliver is not Parent orderCode {} ", orderCode);
|
|
|
paidOrderCode = parentOrderCode;
|
|
|
//no parent
|
|
|
triggerStatusConsistencyCheck(orderCode);
|
|
|
}
|
...
|
...
|
@@ -479,7 +484,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple |
|
|
.loadUser(appraiseOrder.getUid())
|
|
|
.loadActionCase(SellerWalletDetail.Type.SELLER_SHAM_SEND_OUT)
|
|
|
.loadRefundAction(payRefundService::refund)
|
|
|
.loadOrder(appraiseOrder.getOrderCode(), appraiseOrder.getParentOrderCode(), appraiseOrder.getPayment(), appraiseOrder.getAmount())
|
|
|
.loadOrder(orderCode, paidOrderCode, appraiseOrder.getPayment(), appraiseOrder.getAmount())
|
|
|
.refund();
|
|
|
return rows;
|
|
|
}
|
...
|
...
|
|