feat：合并代码问题

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -707,40 +707,6 @@ public class Task {
         }
     }
 
-    public void deliveryOpScrm()
-    {
-        IErpOrderService erpOrderService = getErpService();
-        List<FsStoreOrderScrm> orders = null;
-        if (erpOrderService == gyOrderService){
-            orders = fsStoreOrderMapper.selectOmsOrderdeliveryOpScrm();
-        } else if (erpOrderService == wdtOrderService || erpOrderService == dfOrderService || erpOrderService == jSTOrderService){
-            orders = fsStoreOrderMapper.selectWdtOmsOrderdeliveryOpScrm();
-        }
-        for(FsStoreOrderScrm order:orders){
-            ErpOrderQueryRequert request=new ErpOrderQueryRequert();
-            request.setCode(order.getExtendOrderId());
-            if (erpOrderService != null){
-                ErpOrderQueryResponse response=erpOrderService.getScrmOrder(request);
-                if (erpOrderService != dfOrderService){
-                    if(response.getOrders()!=null&&response.getOrders().size()>0){
-                        for(ErpOrderQuery orderQuery : response.getOrders()){
-                            if(orderQuery.getDeliverys()!=null&&orderQuery.getDeliverys().size()>0){
-                                for(ErpDeliverys delivery:orderQuery.getDeliverys()){
-                                    if(delivery.getDelivery()&& StringUtils.isNotEmpty(delivery.getMail_no())){
-                                        //更新商订单状态 删除REDIS
-                                        fsStoreOrderService.deliveryOrderScrm(order.getOrderCode(),delivery.getMail_no(),delivery.getExpress_code(),delivery.getExpress_name());
-                                        redisCache.deleteObject("delivery"+":"+order.getExtendOrderId());
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-
-    }
     public void getOrderDeliveryStatus()
     {
         IErpOrderService erpOrderService = getErpService();

fs-service/src/main/java/com/fs/his/mapper/FsDoctorMapper.java

@@ -221,5 +221,4 @@ public interface FsDoctorMapper
      * 根据医生id集合查询列表
      */
     List<FsDoctorListUVO> getFsDoctorListUVOListByIds(@Param("doctorIds") List<Long> doctorIds);
-    String selectDoctorNameByIds(@Param("doctorIds") String doctorIds);
 }

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -150,9 +150,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
     @Autowired
     private FsStoreOrderMapper fsStoreOrderMapper;
 
-    @Autowired
-    private FsStoreOrderScrmMapper fsStoreOrderScrmMapper;
-
     @Autowired
     private FsStoreOrderItemMapper fsStoreOrderItemMapper;
     @Autowired
@@ -1771,49 +1768,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
 
     @Autowired
     IFsStoreOrderLogsScrmService iFsStoreOrderLogsScrmService;
-    @Override
-    public void deliveryOrderScrm(String orderCode, String deliveryId, String deliverCode, String deliverName) {
-        FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderScrmByOrderCode(orderCode);
-        if (order != null && order.getStatus() == 1) {
-            FsExpress express = expressService.selectFsExpressByOmsCode(deliverCode);
-            if (express != null) {
-                order.setDeliveryName(deliverName);
-                order.setDeliveryCode(express.getCode());
-            }
-            order.setStatus(2);
-            order.setDeliverySn(deliveryId);
-            order.setDeliverySendTime(DateUtils.getNowDate());
-            storeOrderScrmMapper.updateFsStoreOrder(order);
-            iFsStoreOrderLogsScrmService.create(order.getId(), FsStoreOrderLogEnum.DELIVERY_GOODS.getValue(), FsStoreOrderLogEnum.DELIVERY_GOODS.getDesc());
-            if (order.getCompanyId() != null && order.getCompanyId() > 0) {
-                companyService.subtractCompanyMoneyScrm(order);
-            }
 
-            FsStore store = fsStoreMapper.selectFsStoreByStoreId(order.getStoreId());
-            //订阅物流回调
-            String lastFourNumber = "";
-            if (order.getDeliveryCode().equals(ShipperCodeEnum.SF.getValue())) {
-                if (store != null && store.getSendPhone() != null) {
-                    lastFourNumber = store.getSendPhone();
-                } else {
-                    lastFourNumber = order.getUserPhone();
-                }
-                if (lastFourNumber.length() == 11) {
-                    lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
-                }
-            }
-            expressService.subscribeEspress(order.getOrderCode(), order.getDeliveryCode(), order.getDeliverySn(), lastFourNumber);
 
 
-        }
-
-    }
-
-    @Override
-    public FsStoreOrderScrm selectFsStoreOrderScrmByOrderCode(String soId) {
-        return fsStoreOrderMapper.selectFsStoreOrderScrmByOrderCode(soId);
-    }
-
 
     @Override
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
@@ -4205,12 +4162,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
     public FsStoreOrderAmountStatsVo selectFsStoreOrderAmountStats(FsStoreOrderAmountStatsQueryDto queryDto) {
         return fsStoreOrderMapper.selectFsStoreOrderAmountStats(queryDto);
     }
-    @Autowired
-    FsStoreOrderScrmMapper storeOrderScrmMapper;
-
 
-    @Autowired
-    IFsStoreOrderLogsScrmService iFsStoreOrderLogsScrmService;
     @Override
     public void deliveryOrderScrm(String orderCode, String deliveryId, String deliverCode, String deliverName) {
         FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderScrmByOrderCode(orderCode);