益寿缘-scrm推送兔灵

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

@@ -145,7 +145,8 @@ public class TlErpOrderServiceImpl implements TlErpOrderService {
                     ,request.getLcId(),request.getLogisticsCompany(),request.getSendDate());
         } else {
             FsStoreOrderScrm orderScrm = storeOrderScrmService.selectFsStoreOrderByOrderCode(request.getSoId());
-            if (orderScrm != null && orderScrm.getIsPay() == 1) {
+            log.info("准备更新SCRM订单数据orderScrm:{}", orderScrm);
+            if (orderScrm != null && orderScrm.getStatus() == 1) {
                 FsStoreOrderScrm map = new FsStoreOrderScrm();
                 map.setId(orderScrm.getId());
                 map.setExtendOrderId(request.getOId().toString());

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

@@ -829,10 +829,10 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
         fsPrescribe.setPrescribeDoctorSignUrl(fsDoctor.getSignUrl());
 
         //分配在线的随机药师
-        FsDoctor fsDrugDoctor = doctorMapper.selectRandomOnlineDoctorForPackage(fsPackage.getProductType());
+        FsDoctor fsDrugDoctor = doctorMapper.selectRandomOnlineDoctorForPackage();
         if (fsDrugDoctor==null){
             //兜底情况，如果没有在线的药师就无论在线随机分配
-            fsDrugDoctor=doctorMapper.selectPackageFsDoctorType2Ids(fsPackage.getProductType());
+            fsDrugDoctor=doctorMapper.selectPackageFsDoctorType2Ids();
             if (fsDrugDoctor == null) {
                 log.error("无法分配药师：productType={}, 无可用在线或离线药师", fsPackage.getProductType());
                 throw new CustomException("当前无可用药师，请稍后再试");

fs-service/src/main/java/com/fs/hisStore/service/impl/FsPrescribeScrmStoreServiceImpl.java

@@ -534,7 +534,8 @@ public class FsPrescribeScrmStoreServiceImpl implements IFsPrescribeScrmStoreSer
         fsPrescribe.setPrescribeDoctorId(fsDoctor.getDoctorId());
         fsPrescribe.setPrescribeDoctorSignUrl(fsDoctor.getSignUrl());
 
-        FsDoctor drug =doctorMapper.selectPackageFsDoctorType2Ids(fsPackage.getProductType());
+        //FsDoctor drug =doctorMapper.selectPackageFsDoctorType2Ids(fsPackage.getProductType());
+        FsDoctor drug =doctorMapper.selectPackageFsDoctorType2Ids();
 
         fsPrescribe.setDrugDoctorId(drug.getDoctorId());
         fsPrescribe.setDrugDoctorSignUrl(drug.getSignUrl());