...
|
...
|
@@ -121,12 +121,14 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { |
|
|
OrderStatus targetOrderStatus = OrderStatus.HAS_PAYED;
|
|
|
boolean isQuickDeliver = false;
|
|
|
boolean isDepositWithQuickDeliverGoods = false;
|
|
|
boolean isDerectPass = false;
|
|
|
//门店订单支付后直接完成
|
|
|
if(BuyerOrderUtils.isOffline(orderInfo) ) {
|
|
|
targetOrderStatus = OrderStatus.DONE;
|
|
|
}else if((isQuickDeliver=BuyerOrderUtils.isQuickDeliver(orderInfo.getAttributes()))
|
|
|
|| (isDepositWithQuickDeliverGoods = isDepositWithQuickDeliverGoods(uid, orderCode, orderInfo.getAttributes()))){
|
|
|
targetOrderStatus = OrderStatus.WAITING_RECEIVE;
|
|
|
isDerectPass = true;
|
|
|
}
|
|
|
logger.info("after paid updateOrderStatusPaid uid {} orderCode {} isQuickDeliver {} isDepositWithQuickDeliverGoods {} ",
|
|
|
uid, orderCode, isQuickDeliver, isDepositWithQuickDeliverGoods);
|
...
|
...
|
@@ -144,7 +146,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { |
|
|
logger.info("in updateOrderStatusPaid record status change, orderCode {}, status: {}",
|
|
|
orderCode, orderStatusCode);
|
|
|
orderStatusFlowService.addAsy(orderCode, orderStatusCode);
|
|
|
if (isQuickDeliver){
|
|
|
if (isDerectPass){
|
|
|
appraiseService.processQuickDeliverOrderAfterPaid(orderCode, uid);
|
|
|
}
|
|
|
}
|
...
|
...
|
|