feat：处理代码合并问题

fs-service/src/main/java/com/fs/erp/http/JstErpHttpServiceImpl.java

@@ -15,8 +15,7 @@ import com.fs.erp.utils.SignUtil;
 import com.fs.ybPay.dto.RefundOrderDTO;
 import com.hc.openapi.tool.util.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
-
+//import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

fs-service/src/main/java/com/fs/erp/service/impl/FsJstAftersalePushServiceImpl.java

@@ -20,9 +20,7 @@ import com.fs.his.mapper.FsStoreOrderMapper;
 import com.fs.his.service.IFsStoreOrderItemService;
 import com.fs.ybPay.dto.RefundOrderDTO;
 import lombok.extern.slf4j.Slf4j;
-
-
-import org.apache.commons.lang3.StringUtils;
+//import org.apache.commons.lang3.StringUtils;
 import org.apache.http.util.Asserts;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

fs-service/src/main/java/com/fs/qw/service/impl/AsyncSopTestService.java

@@ -501,21 +501,6 @@ public class AsyncSopTestService {
     public void  asyncSendMsgBySopAppLink(Long externalId,String linkTile,String linkDescribe,String link){
 //        push2Service.pushSopAppLinkMsgByExternal(externalId,linkTile,linkDescribe,link);
     }
-    /**
-     * 异步录入 发送有app的客户 之 正常sop版
-     */
-    @Async("scheduledExecutorService")
-    public void  asyncSendMsgBySopAppLinkNormalIM(List<QwSopTempSetting.Content.Setting> setting,String cropId,Long companyUserId,Long fsUserId){
-
-        setting.forEach(item->{
-            try {
-                push2Service.pushSopAppLinkMsgByExternalIM(cropId,item.getLinkTitle(),item.getLinkDescribe(),item.getLinkImageUrl(),item.getAppLinkUrl(),companyUserId,fsUserId);
-            } catch (JsonProcessingException e) {
-                e.printStackTrace();
-            }
-        });
-
-    }
 
     /**
      * 异步录入 发送有app的客户 之 正常sop版