Authored by chenchao

fix

@@ -122,6 +122,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { @@ -122,6 +122,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
122 boolean isQuickDeliver = false; 122 boolean isQuickDeliver = false;
123 boolean isDepositWithQuickDeliverGoods = false; 123 boolean isDepositWithQuickDeliverGoods = false;
124 boolean isDerectPass = false; 124 boolean isDerectPass = false;
  125 +
125 //门店订单支付后直接完成 126 //门店订单支付后直接完成
126 if(BuyerOrderUtils.isOffline(orderInfo) ) { 127 if(BuyerOrderUtils.isOffline(orderInfo) ) {
127 targetOrderStatus = OrderStatus.DONE; 128 targetOrderStatus = OrderStatus.DONE;
@@ -147,7 +148,8 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { @@ -147,7 +148,8 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
147 orderCode, orderStatusCode); 148 orderCode, orderStatusCode);
148 orderStatusFlowService.addAsy(orderCode, orderStatusCode); 149 orderStatusFlowService.addAsy(orderCode, orderStatusCode);
149 if (isDerectPass){ 150 if (isDerectPass){
150 - appraiseService.processQuickDeliverOrderAfterPaid(orderCode, uid); 151 + boolean isDepositRequired = isDepositWithQuickDeliverGoods;
  152 + appraiseService.processQuickDeliverOrderAfterPaid(orderCode, uid, isDepositRequired);
151 } 153 }
152 } 154 }
153 orderInfo.setStatus(orderStatusCode); 155 orderInfo.setStatus(orderStatusCode);
@@ -1568,7 +1568,7 @@ public class AppraiseService { @@ -1568,7 +1568,7 @@ public class AppraiseService {
1568 } 1568 }
1569 @Autowired 1569 @Autowired
1570 private DepositService depositService; 1570 private DepositService depositService;
1571 - public void processQuickDeliverOrderAfterPaid(long orderCode,int uid){ 1571 + public void processQuickDeliverOrderAfterPaid(long orderCode,int uid, boolean isDeposit){
1572 BuyerOrderGoods pbog = buyerOrderGoodsMapper.selectOnlyByOrderCode(orderCode); 1572 BuyerOrderGoods pbog = buyerOrderGoodsMapper.selectOnlyByOrderCode(orderCode);
1573 BuyerOrder pbo = buyerOrderMapper.selectOnlyByOrderCode(orderCode); 1573 BuyerOrder pbo = buyerOrderMapper.selectOnlyByOrderCode(orderCode);
1574 try { 1574 try {
@@ -1577,7 +1577,6 @@ public class AppraiseService { @@ -1577,7 +1577,6 @@ public class AppraiseService {
1577 LOGGER.warn("in processQuickDeliverOrderAfterPaid transferGoodsMoneyWhenPass fail orderCode {} uid {}", 1577 LOGGER.warn("in processQuickDeliverOrderAfterPaid transferGoodsMoneyWhenPass fail orderCode {} uid {}",
1578 orderCode, uid, ex); 1578 orderCode, uid, ex);
1579 } 1579 }
1580 - depositService.changeOwner(pbo.getSellerUid(), pbog.getSkup(), orderCode,uid, false);  
1581 - 1580 + depositService.changeOwner(pbo.getSellerUid(), pbog.getSkup(), orderCode,uid, isDeposit);
1582 } 1581 }
1583 } 1582 }