Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

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

@@ -218,7 +218,8 @@ public interface FsDoctorMapper
      */
     List<FsDoctorListUVO> getFsDoctorListUVOListByIds(@Param("doctorIds") List<Long> doctorIds);
 
-    @Select("SELECT * FROM fs_doctor WHERE store_id=#{storeId} and doctor_type = 2 and  `status`=1 and is_audit=1 and sign_url is not null ORDER BY RAND() LIMIT 1; ")
+//    @Select("SELECT * FROM fs_doctor WHERE store_id=#{storeId} and doctor_type = 2 and  `status`=1 and is_audit=1 and sign_url is not null ORDER BY RAND() LIMIT 1; ")
+    @Select("SELECT * FROM fs_doctor WHERE store_id=#{storeId} and doctor_type = 2 and  `status`=1 and is_audit=1  ORDER BY RAND() LIMIT 1; ")
     FsDoctor findByStoreId(@Param("storeId") Long storeId);
     String selectDoctorNameByIds(@Param("doctorIds") String doctorIds);
 

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

@@ -448,9 +448,11 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             log.error("修改商城订单地址推送到聚水潭ERP失败，orderId: {}", fsStoreOrder.getId(), e);
         }
 
+        FsStoreOrderScrm fsStoreOrderScrm=fsStoreOrderMapper.selectFsStoreOrderById(fsStoreOrder.getId());
+
         //判断发货类型
-        if(fsStoreOrder.getStatus() == 2 || fsStoreOrder.getStatus() == 3) {//待收货
-            List<FsStoreOrderItemVO> scrmList = fsStoreOrderItemMapper.selectMyFsStoreOrderItemListByOrderId(fsStoreOrder.getId());
+        if(fsStoreOrderScrm.getStatus() == 2 || fsStoreOrderScrm.getStatus() == 3) {//待收货
+            List<FsStoreOrderItemVO> scrmList = fsStoreOrderItemMapper.selectMyFsStoreOrderItemListByOrderId(fsStoreOrderScrm.getId());
             if (!scrmList.isEmpty()) {
                 List<Long> orderItemIds = scrmList.stream().map(FsStoreOrderItemVO::getItemId).collect(Collectors.toList());
                 //获取溯源码，进行回退
@@ -1045,7 +1047,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
 
             if (config.getUnPayTime() != null && config.getUnPayTime() > 0) {
                 if(storeOrder.getIsPrescribe() != null && storeOrder.getIsPrescribe() == 1){//处方药72小时
-                    config.setUnPayTime(4320);
                     redisCache.setCacheObject(redisKey, storeOrder.getId(),4320, TimeUnit.MINUTES);
                 }else {
                     redisCache.setCacheObject(redisKey, storeOrder.getId(), config.getUnPayTime(), TimeUnit.MINUTES);
@@ -1055,7 +1056,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     if(config == null){
                         config = new StoreConfig();
                     }
-                    config.setUnPayTime(4320);
                     redisCache.setCacheObject(redisKey, storeOrder.getId(),4320, TimeUnit.MINUTES);
                 }else {
                     redisCache.setCacheObject(redisKey, storeOrder.getId(), 30, TimeUnit.MINUTES);
@@ -1780,7 +1780,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             StoreConfig config = JSONUtil.toBean(json, StoreConfig.class);
             if (config.getUnPayTime() != null && config.getUnPayTime() > 0) {
                 if(storeOrder.getIsPrescribe() != null && storeOrder.getIsPrescribe() == 1){//处方药72小时
-                    config.setUnPayTime(4320);
                     redisCache.setCacheObject(redisKey, storeOrder.getId(),4320, TimeUnit.MINUTES);
                 }else {
                     redisCache.setCacheObject(redisKey, storeOrder.getId(), config.getUnPayTime(), TimeUnit.MINUTES);
@@ -1790,7 +1789,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     if(config == null){
                         config = new StoreConfig();
                     }
-                    config.setUnPayTime(4320);
                     redisCache.setCacheObject(redisKey, storeOrder.getId(),4320, TimeUnit.MINUTES);
                 }else {
                     redisCache.setCacheObject(redisKey, storeOrder.getId(), 30, TimeUnit.MINUTES);
@@ -5190,7 +5188,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             com.fs.store.config.StoreConfig config = JSONUtil.toBean(json, com.fs.store.config.StoreConfig.class);
             if (config.getUnPayTime() != null && config.getUnPayTime() > 0) {
                 if(storeOrder.getIsPrescribe() != null && storeOrder.getIsPrescribe() == 1){//处方药72小时
-                    config.setUnPayTime(4320);
                     redisCache.setCacheObject(redisKey, storeOrder.getId(),4320, TimeUnit.MINUTES);
                 }else {
                     redisCache.setCacheObject(redisKey, storeOrder.getId(), config.getUnPayTime(), TimeUnit.MINUTES);
@@ -5200,7 +5197,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     if(config == null){
                         config = new com.fs.store.config.StoreConfig();
                     }
-                    config.setUnPayTime(4320);
                     redisCache.setCacheObject(redisKey, storeOrder.getId(),4320, TimeUnit.MINUTES);
                 }else {
                     redisCache.setCacheObject(redisKey, storeOrder.getId(), 30, TimeUnit.MINUTES);

fs-service/src/main/java/com/fs/hospital580/util/ThumbnailatorWatermark.java

@@ -34,7 +34,7 @@ public class ThumbnailatorWatermark {
 
     public String addWatermarkToNetworkImage(Long preId, Integer orderStatus, String signUrl) {
         try {
-            log.error("添加水印处方水印:{} {} {}0", preId, orderStatus, signUrl);
+            log.info("添加水印处方水印:{} {} {}0", preId, orderStatus, signUrl);
             // 处方原图
             String imageUrl = redisCache.getCacheObject("prescription:dstFilePath:" + preId);
             if (ObjectUtil.isEmpty(imageUrl)) {

fs-service/src/main/resources/mapper/hisStore/FsStoreProductScrmMapper.xml

@@ -579,7 +579,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             WHERE
             fsp.is_del = 0
             AND fsp.is_show = 1
-            AND fsp.is_good = 1
             AND fsp.is_best = 1
             AND fsp.is_display = 1
             <if test='config.isAudit == "1" and (isDrug == null or isDrug != null and isDrug == 1)'>