判断是否香港仓出库物流

@@ -142,7 +142,7 @@ private static final Logger LOGGER = LoggerUtils.getMqConsumerLogger();
         expressInfo.setState(state);
 
         // 中通国际快递公司,存在物流则表示清关成功
-        if (LogisticsTypes.isZtoInternational(logisticsType)) {
+        if (LogisticsTypes.isZtoInternational(logisticsType) && isHkClearSuccess(acceptAddress, acceptRemark)) {
             expressInfo.setOperateTransferCode(EnumExpressDataOperateTransferCode.express_clear_success.getCode());
         }
         expressInfoMapper.insert(expressInfo);
@@ -151,6 +151,17 @@ private static final Logger LOGGER = LoggerUtils.getMqConsumerLogger();
     }
 
     /**
+     * 判断是否香港仓已出关
+     *
+     * @return
+     */
+    public static boolean isHkClearSuccess(String acceptAddress, String acceptRemark) {
+        return StringUtils.contains(acceptAddress, "东莞") && StringUtils.contains(acceptRemark, "已揽收");
+    }
+
+
+
+    /**
      * 确认收货处理
      */
     private void handleAcceptExpress(ErpExpressBo erpExpressBo,Byte expressType) {