Authored by chenchao

fix

... ... @@ -122,6 +122,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
boolean isQuickDeliver = false;
boolean isDepositWithQuickDeliverGoods = false;
boolean isDerectPass = false;
//门店订单支付后直接完成
if(BuyerOrderUtils.isOffline(orderInfo) ) {
targetOrderStatus = OrderStatus.DONE;
... ... @@ -147,7 +148,8 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
orderCode, orderStatusCode);
orderStatusFlowService.addAsy(orderCode, orderStatusCode);
if (isDerectPass){
appraiseService.processQuickDeliverOrderAfterPaid(orderCode, uid);
boolean isDepositRequired = isDepositWithQuickDeliverGoods;
appraiseService.processQuickDeliverOrderAfterPaid(orderCode, uid, isDepositRequired);
}
}
orderInfo.setStatus(orderStatusCode);
... ...
... ... @@ -1568,7 +1568,7 @@ public class AppraiseService {
}
@Autowired
private DepositService depositService;
public void processQuickDeliverOrderAfterPaid(long orderCode,int uid){
public void processQuickDeliverOrderAfterPaid(long orderCode,int uid, boolean isDeposit){
BuyerOrderGoods pbog = buyerOrderGoodsMapper.selectOnlyByOrderCode(orderCode);
BuyerOrder pbo = buyerOrderMapper.selectOnlyByOrderCode(orderCode);
try {
... ... @@ -1577,7 +1577,6 @@ public class AppraiseService {
LOGGER.warn("in processQuickDeliverOrderAfterPaid transferGoodsMoneyWhenPass fail orderCode {} uid {}",
orderCode, uid, ex);
}
depositService.changeOwner(pbo.getSellerUid(), pbog.getSkup(), orderCode,uid, false);
depositService.changeOwner(pbo.getSellerUid(), pbog.getSkup(), orderCode,uid, isDeposit);
}
}
... ...