Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8

@@ -200,9 +200,13 @@ public class OrderDetailInfo {
          * 实付金额
          * 实付金额
          */
          */
         String realPayPrice;
         String realPayPrice;
-
+        /**
+         * 仓储费
+         */
         String depositPrice;
         String depositPrice;
-
+        /**
+         * 闪购服务费
+         */
         String quickDeliveServicePrice;
         String quickDeliveServicePrice;
     }
     }
 
 

@@ -122,6 +122,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
         boolean isQuickDeliver = false;
         boolean isQuickDeliver = false;
         boolean isDepositWithQuickDeliverGoods = false;
         boolean isDepositWithQuickDeliverGoods = false;
         boolean isDerectPass = false;
         boolean isDerectPass = false;
+
         //门店订单支付后直接完成
         //门店订单支付后直接完成
         if(BuyerOrderUtils.isOffline(orderInfo) ) {
         if(BuyerOrderUtils.isOffline(orderInfo) ) {
             targetOrderStatus = OrderStatus.DONE;
             targetOrderStatus = OrderStatus.DONE;
@@ -147,7 +148,8 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
                     orderCode, orderStatusCode);
                     orderCode, orderStatusCode);
             orderStatusFlowService.addAsy(orderCode, orderStatusCode);
             orderStatusFlowService.addAsy(orderCode, orderStatusCode);
             if (isDerectPass){
             if (isDerectPass){
-                appraiseService.processQuickDeliverOrderAfterPaid(orderCode, uid);
+                boolean isDepositRequired = isDepositWithQuickDeliverGoods;
+                appraiseService.processQuickDeliverOrderAfterPaid(orderCode, uid, isDepositRequired);
             }
             }
         }
         }
         orderInfo.setStatus(orderStatusCode);
         orderInfo.setStatus(orderStatusCode);

@@ -1568,7 +1568,7 @@ public class AppraiseService {
     }
     }
     @Autowired
     @Autowired
     private DepositService depositService;
     private DepositService depositService;
-    public void processQuickDeliverOrderAfterPaid(long orderCode,int uid){
+    public void processQuickDeliverOrderAfterPaid(long orderCode,int uid, boolean isDeposit){
         BuyerOrderGoods pbog = buyerOrderGoodsMapper.selectOnlyByOrderCode(orderCode);
         BuyerOrderGoods pbog = buyerOrderGoodsMapper.selectOnlyByOrderCode(orderCode);
         BuyerOrder pbo = buyerOrderMapper.selectOnlyByOrderCode(orderCode);
         BuyerOrder pbo = buyerOrderMapper.selectOnlyByOrderCode(orderCode);
         try {
         try {
@@ -1577,7 +1577,6 @@ public class AppraiseService {
             LOGGER.warn("in processQuickDeliverOrderAfterPaid transferGoodsMoneyWhenPass fail orderCode {} uid {}",
             LOGGER.warn("in processQuickDeliverOrderAfterPaid transferGoodsMoneyWhenPass fail orderCode {} uid {}",
                     orderCode, uid, ex);
                     orderCode, uid, ex);
         }
         }
-        depositService.changeOwner(pbo.getSellerUid(), pbog.getSkup(), orderCode,uid, false);
-
+        depositService.changeOwner(pbo.getSellerUid(), pbog.getSkup(), orderCode,uid, isDeposit);
     }
     }
 }
 }