Merge branch 'test6.9.9' into gray

@@ -17,6 +17,6 @@ public class OrderConfigConstant {
      * @return
      */
     public boolean getVedioConfig() {
-        return configReader.getBoolean("ufo.Vedio.Config", true);
+        return configReader.getBoolean("ufo.Vedio.Config", false);
     }
 }
\ No newline at end of file

@@ -420,6 +420,7 @@
     where owner_uid = #{uid,jdbcType=INTEGER}
     and deposit_code = #{depositCode,jdbcType=VARCHAR}
     AND lock_flag = #{expectStatus,jdbcType=INTEGER}
+    and status = 1
   </update>
 
 </mapper>
\ No newline at end of file

@@ -986,6 +986,12 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
         return buyerAddress;
     }
 
+    private AddressInfo findSellerAddressInfo(Integer sellerUid, Long orderCode){
+        BuyerOrderGoods pbog = buyerOrderGoodsMapper.selectOnlyByOrderCode(orderCode);
+        Integer skup = pbog.getSkup();
+        return findSellerAddressInfo(sellerUid, skup);
+    }
+
     private AddressInfo findSellerAddressInfo(Integer uid, Integer skup) {
         SellerOrderMeta addressMeta = sellerOrderMetaMapper.selectByMetaKey(uid, skup, MetaKey.BACK_2_SELLER_DELIVERY_ADDRESS);
         AddressInfo addressInfo = null;
@@ -1090,7 +1096,23 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
 
     private AppraiseAddressResp getAppraiseAddressResp4Deposit(Integer uid, Long orderCode) {
         LOGGER.info("in getAppraiseAddressResp4Deposit uid {}, orderCode {}", uid, orderCode);
-        AppraiseAddressResp resp = appraiseAddressService.findByDepotType(DepotType.NJ.getCode());
+        AddressInfo sellerAddressInfo = findSellerAddressInfo(uid, orderCode);
+
+        //  根据用户id查询默认地址的省份
+        AppraiseAddressResp aar = null;
+        String sellerAddressCode = null;
+        if (null != sellerAddressInfo) {
+            // 根据产品给的哪些用户的省份匹配到对应的鉴定中心地址
+            aar = appraiseAddressService.queryAddressByAreaCode(sellerAddressCode=sellerAddressInfo.getAreaCode());
+        }
+        final DepotType targetDT = DepotType.NJ;
+        if (aar!=null && aar.getType() == targetDT.getCode()){
+            LOGGER.info("in getAppraiseAddressResp4Deposit no need notice, [{}-{}] original depot type {} sellerAddressCode {}",
+                    uid, orderCode, aar.getType(), sellerAddressCode);
+            return null;
+        }
+
+        AppraiseAddressResp resp = appraiseAddressService.findByDepotType(targetDT.getCode());
         final String tips = SellerConfig.DELIVER2DEPOTTIPS4DEPOSITGOODS;
         resp.setTitle(SellerConfig.FORCENOTICE_ADDRESS_TITLE);
         resp.setForceShow(true);