ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit df6300ddd4b30e20323164689c306b41d520a39a 1 parent f2b2c586

fix

Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
@@ -121,12 +121,14 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { @@ -121,12 +121,14 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
121 OrderStatus targetOrderStatus = OrderStatus.HAS_PAYED; 121 OrderStatus targetOrderStatus = OrderStatus.HAS_PAYED;
122 boolean isQuickDeliver = false; 122 boolean isQuickDeliver = false;
123 boolean isDepositWithQuickDeliverGoods = false; 123 boolean isDepositWithQuickDeliverGoods = false;
  124 + boolean isDerectPass = false;
124 //门店订单支付后直接完成 125 //门店订单支付后直接完成
125 if(BuyerOrderUtils.isOffline(orderInfo) ) { 126 if(BuyerOrderUtils.isOffline(orderInfo) ) {
126 targetOrderStatus = OrderStatus.DONE; 127 targetOrderStatus = OrderStatus.DONE;
127 }else if((isQuickDeliver=BuyerOrderUtils.isQuickDeliver(orderInfo.getAttributes())) 128 }else if((isQuickDeliver=BuyerOrderUtils.isQuickDeliver(orderInfo.getAttributes()))
128 || (isDepositWithQuickDeliverGoods = isDepositWithQuickDeliverGoods(uid, orderCode, orderInfo.getAttributes()))){ 129 || (isDepositWithQuickDeliverGoods = isDepositWithQuickDeliverGoods(uid, orderCode, orderInfo.getAttributes()))){
129 targetOrderStatus = OrderStatus.WAITING_RECEIVE; 130 targetOrderStatus = OrderStatus.WAITING_RECEIVE;
  131 + isDerectPass = true;
130 } 132 }
131 logger.info("after paid updateOrderStatusPaid uid {} orderCode {} isQuickDeliver {} isDepositWithQuickDeliverGoods {} ", 133 logger.info("after paid updateOrderStatusPaid uid {} orderCode {} isQuickDeliver {} isDepositWithQuickDeliverGoods {} ",
132 uid, orderCode, isQuickDeliver, isDepositWithQuickDeliverGoods); 134 uid, orderCode, isQuickDeliver, isDepositWithQuickDeliverGoods);
@@ -144,7 +146,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { @@ -144,7 +146,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
144 logger.info("in updateOrderStatusPaid record status change, orderCode {}, status: {}", 146 logger.info("in updateOrderStatusPaid record status change, orderCode {}, status: {}",
145 orderCode, orderStatusCode); 147 orderCode, orderStatusCode);
146 orderStatusFlowService.addAsy(orderCode, orderStatusCode); 148 orderStatusFlowService.addAsy(orderCode, orderStatusCode);
147 - if (isQuickDeliver){ 149 + if (isDerectPass){
148 appraiseService.processQuickDeliverOrderAfterPaid(orderCode, uid); 150 appraiseService.processQuickDeliverOrderAfterPaid(orderCode, uid);
149 } 151 }
150 } 152 }