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

@@ -45,6 +45,7 @@ import com.yohoufo.order.service.pay.AbstractPayService;
 import com.yohoufo.order.service.proxy.InBoxFacade;
 import com.yohoufo.order.service.proxy.InBoxFacade;
 import com.yohoufo.order.service.proxy.OrderStatusFlowService;
 import com.yohoufo.order.service.proxy.OrderStatusFlowService;
 import com.yohoufo.order.service.proxy.ProductProxyService;
 import com.yohoufo.order.service.proxy.ProductProxyService;
+import com.yohoufo.order.utils.BuyerOrderUtils;
 import com.yohoufo.order.utils.LoggerUtils;
 import com.yohoufo.order.utils.LoggerUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -121,15 +122,20 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
      * @param orderRequest
      * @param orderRequest
      */
      */
     public void confirm(OrderRequest orderRequest){
     public void confirm(OrderRequest orderRequest){
-        OrderStatus expectStatus = OrderStatus.WAITING_RECEIVE;
+
         // 参数检查 ![待收货] 不合法
         // 参数检查 ![待收货] 不合法
         DataNode node = checkBase(orderRequest);
         DataNode node = checkBase(orderRequest);
+        BuyerOrder buyerOrder = node.buyerOrderInDB;
+        // 待寄存或待收货
+        OrderStatus expectStatus = BuyerOrderUtils.isDeposit(buyerOrder) ?
+                OrderStatus.JUDGE_PASS_WAIT_WAREHOUSE : OrderStatus.WAITING_RECEIVE;
         checkStatus(node,orderRequest, expectStatus);
         checkStatus(node,orderRequest, expectStatus);
-        int uid;
-        long orderCode;
-        int sellerUid = node.buyerOrderInDB.getSellerUid();
-        // TODO 更新状态为已收货、SKUP的状态应该还是已出售
-        if (1 == buyerOrderMapper.updateStatusByOrderCode(orderCode=orderRequest.getOrderCode(), uid=orderRequest.getUid(),
+        int uid = buyerOrder.getUid();
+        long orderCode = buyerOrder.getOrderCode();
+        int sellerUid = buyerOrder.getSellerUid();
+
+        // 更新状态为已收货、SKUP的状态应该还是已出售
+        if (1 == buyerOrderMapper.updateStatusByOrderCode(orderCode, uid,
                 expectStatus.getCode(),
                 expectStatus.getCode(),
                 OrderStatus.DONE.getCode(),
                 OrderStatus.DONE.getCode(),
                 DateUtil.getCurrentTimeSecond())) {
                 DateUtil.getCurrentTimeSecond())) {

@@ -31,7 +31,7 @@ public class CodeBitMeta {
     /**
     /**
      * 类型
      * 类型
      */
      */
-    private byte typeBits = 2;
+    private byte typeBits = 3;
 
 
 
 
     /**
     /**