Merge branch 'Hotfix_list_contain_yoho' into test6.9.14

@@ -586,7 +586,8 @@ public class ShoppingServiceImpl implements IShoppingService {
         if(AddressHelper.isNeedUpdate(addressInfo)){
         if(AddressHelper.isNeedUpdate(addressInfo)){
             logger.warn("submit addressId need update, uid is {}, skup is {}, addressId is {}", shoppingRequest.getUid(),
             logger.warn("submit addressId need update, uid is {}, skup is {}, addressId is {}", shoppingRequest.getUid(),
                     shoppingRequest.getSkup(), shoppingRequest.getAddressId());
                     shoppingRequest.getSkup(), shoppingRequest.getAddressId());
-            throw new ServiceException(ServiceError.ORDER_ADDRESS_NEED_UPDATE);
+            //throw new ServiceException(ServiceError.ORDER_ADDRESS_NEED_UPDATE);
+            throw new UfoServiceException(400,"您的收货地址缺少所在地的街道信息，请更新收货地址");
         }
         }
 
 
         // 检查地址是否是鉴定中心的地址
         // 检查地址是否是鉴定中心的地址

@@ -111,7 +111,7 @@ public class SellerOrderPrepareProcessor
         if(AddressHelper.isNeedUpdate(noHiddenBackAddress)){
         if(AddressHelper.isNeedUpdate(noHiddenBackAddress)){
             log.warn("seller submit addressId need update, uid is {}, storageId is {}, addressId is {}",
             log.warn("seller submit addressId need update, uid is {}, storageId is {}, addressId is {}",
                     uid, storageId, addressId);
                     uid, storageId, addressId);
-            throw new ServiceException(ServiceError.ORDER_ADDRESS_NEED_UPDATE);
+            throw new UfoServiceException(400,"您的收货地址缺少所在地的街道信息，请更新收货地址");
         }
         }
 
 
         Integer businessClientCode = OrderAssist.findBusinessClientCode(req.getBusinessClient());
         Integer businessClientCode = OrderAssist.findBusinessClientCode(req.getBusinessClient());

 package com.yohoufo.product.helper;
 package com.yohoufo.product.helper;
 
 
+import com.yohoufo.common.constant.BusinessClientEnum;
 import com.yohoufo.common.utils.AppVersion;
 import com.yohoufo.common.utils.AppVersion;
 import com.yohoufo.product.request.ProductSearchReq;
 import com.yohoufo.product.request.ProductSearchReq;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -45,7 +46,9 @@ public class SearchHelpService {
 	 * @return
 	 * @return
 	 */
 	 */
 	public void setContainYoho(String appVersion, ProductSearchReq req) {
 	public void setContainYoho(String appVersion, ProductSearchReq req) {
-		if(StringUtils.isNotBlank(appVersion) && AppVersion.of(appVersion).greaterThanOrEquals(AppVersion.of("6.8.5"))){
+		// 闲鱼请求不能含YOHO
+		if(StringUtils.isNotBlank(appVersion) && AppVersion.of(appVersion).greaterThanOrEquals(AppVersion.of("6.8.5"))
+				&& !BusinessClientEnum.isXianYu(req.getBusinessClient())){
 			req.setContainYoho("Y");
 			req.setContainYoho("Y");
 		}
 		}
 	}
 	}