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

@@ -73,6 +73,7 @@ public class ActionStatusHold {
     private static class SellerASH{
         final static List<Integer> View_Express_Status = Arrays.asList(OrderStatus.SELLER_SEND_OUT.getCode(),
                 OrderStatus.PLATFORM_CHECKING.getCode(), OrderStatus.CHECKING_FAKE.getCode(),
+                OrderStatus.WAITING_RECEIVE.getCode(),
                 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode());
         //
         static List<Integer> CanRefundStatus;

@@ -132,7 +132,7 @@ public interface IExpressInfoService {
 
 
     List<Integer> status2OnlySellerExpressType = Arrays.asList(OrderStatus.SELLER_SEND_OUT.getCode(),
-            OrderStatus.PLATFORM_CHECKING.getCode());
+            OrderStatus.PLATFORM_CHECKING.getCode(), OrderStatus.WAITING_RECEIVE.getCode());
 
     default List<Integer> getExpressTypes4Seller(Integer status){
         List<Integer> types = null;

@@ -213,7 +213,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
         }else{
             if(changedAddress.getAddress().contains("*")){
                 logger.warn("dbAddressInfo_hidden is null ,uid {} ,orderCode {} , invalid address with * {}",uid,orderCode,changedAddress.getAddress());
-                throw new UfoServiceException(400,"详细地址信息格式填写错误");
+                throw new UfoServiceException(400,"详细地址不支持特殊符号");
             }
         }
         //收货人没有变化
@@ -222,7 +222,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
         }else{
             if(changedAddress.getConsignee().contains("*")){
                 logger.warn("dbAddressInfo_hidden is null ,uid {} ,orderCode {} , invalid consignee with * {}",uid,orderCode,changedAddress.getConsignee());
-                throw new UfoServiceException(400,"收货人格式填写错误");
+                throw new UfoServiceException(400,"收货人不支持特殊符号");
             }
         }
         //手机号没有变化
@@ -231,7 +231,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
         }else{
             if(!UserInfoHiddenHelper.isPhone(changedAddress.getMobile())){
                 logger.warn("dbAddressInfo_hidden is null ,uid {} ,orderCode {} , invalid mobile {}",uid,orderCode,changedAddress.getMobile());
-                throw new UfoServiceException(400,"手机号码格式填写错误");
+                throw new UfoServiceException(400,"请填写正确的手机号码");
             }
         }
 

@@ -715,15 +715,6 @@ public class SellerOrderService  implements IOrderListService, IOrderDetailServi
         return total;
     }
 
-    /**
-     * 商家出售中的商品
-     */
-    public int getCanSellSkupBySellerUid(Integer uid){
-        log.info("in seller order getCanSellSkupBySellerUid count uid {} ", uid);
-        Integer total = sellerOrderGoodsMapper.selectCntByUidStatusList(uid, Arrays.asList(SkupStatus.CAN_SELL.getCode()));
-        log.info("in seller order getCanSellSkupBySellerUid count uid {}, total {} ", uid, total);
-        return total;
-    }
 
     public SellerOrderListResp refresh(OrderRequest req){
         int uid = req.getUid();

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -48,5 +49,14 @@ public class SkupService {
         return result;
     }
 
+    /**
+     * 商家出售中的商品
+     */
+    public int getCanSellSkupBySellerUid(Integer uid){
+        logger.info("in seller order getCanSellSkupBySellerUid count uid {} ", uid);
+        Integer total = sellerOrderGoodsMapper.selectCntByUidStatusList(uid, Arrays.asList(SkupStatus.CAN_SELL.getCode()));
+        logger.info("in seller order getCanSellSkupBySellerUid count uid {}, total {} ", uid, total);
+        return total;
+    }
 
 }

@@ -71,6 +71,9 @@ public class StoredSellerDepositServiceImpl implements IStoredSellerDepositServi
     @Autowired
     StoredSellerCacheService storedSellerCacheService;
 
+    @Autowired
+    private SkupService skupService;
+
     /**
      * 充值保证金
      */
@@ -200,7 +203,7 @@ public class StoredSellerDepositServiceImpl implements IStoredSellerDepositServi
             throw new UfoServiceException(400,"商户存在未完成订单，不允许退驻！");
         }
 
-        total=sellerOrderService.getCanSellSkupBySellerUid(uid);
+        total=skupService.getCanSellSkupBySellerUid(uid);
         if(total!=null && total>0){
             logger.error("quitStoredSeller not allowed cause of can seller product ,uid {} ,total {}" ,uid,total);
             throw new UfoServiceException(400,"商户存在出售中商品，不允许退驻！");