Merge remote-tracking branch 'origin/master'

# Conflicts:
#	fs-service/src/main/java/com/fs/his/domain/FsIntegralOrder.java

fs-admin/src/main/java/com/fs/his/controller/FsInquiryOrderController.java

@@ -157,7 +157,7 @@ public class FsInquiryOrderController extends BaseController
     @GetMapping(value = "/sendMsg/{orderId}")
     public AjaxResult sendMsg(@PathVariable("orderId") Long orderId)
     {
-        ;
+
         return AjaxResult.success(fsInquiryOrderService.sendStartMsg(orderId));
     }
     /**

fs-company/src/main/java/com/fs/company/controller/qw/QwUserVoiceLogController.java

@@ -107,7 +107,7 @@ public class QwUserVoiceLogController extends BaseController
         return getDataTable(list);
     }
 
-    @PreAuthorize("@ss.hasPermi('qw:qwUserVoiceLog:sellTotalList')")
+
     @GetMapping("/sellTotalList")
     public TableDataInfo sellTotalList(QwUserVoiceLogTotalVo qwUserVoiceLog)
     {

fs-company/src/main/java/com/fs/company/controller/store/FsInquiryOrderController.java

@@ -1,5 +1,6 @@
 package com.fs.company.controller.store;
 
+import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.fs.common.annotation.Log;
 import com.fs.common.annotation.RepeatSubmit;
@@ -7,6 +8,7 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.core.redis.RedisCache;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.StringUtils;
 import com.fs.framework.security.LoginUser;
@@ -16,6 +18,7 @@ import com.fs.his.domain.FsInquiryOrder;
 import com.fs.his.domain.FsInquiryOrderMsg;
 import com.fs.his.domain.FsStoreOrderLogs;
 import com.fs.his.param.FsInquiryOrderCancelParam;
+import com.fs.his.param.FsInquiryOrderCreateParam;
 import com.fs.his.param.FsInquiryOrderParam;
 import com.fs.his.param.FsInquiryOrderRefundParam;
 import com.fs.his.service.IFsDoctorService;
@@ -35,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 问诊订单Controller
@@ -247,16 +251,24 @@ public class FsInquiryOrderController extends BaseController
         }
         return AjaxResult.success(fsInquiryOrderVO);
     }
-
+    @Autowired
+    RedisCache redisCache;
     /**
      * 新增问诊订单
      */
     @PreAuthorize("@ss.hasPermi('store:inquiryOrder:add')")
     @Log(title = "问诊订单", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody FsInquiryOrder fsInquiryOrder)
+    public R add(@RequestBody FsInquiryOrderCreateParam param)
     {
-        return toAjax(fsInquiryOrderService.insertFsInquiryOrder(fsInquiryOrder));
+        String uuid = IdUtil.randomUUID();
+        redisCache.setCacheObject("orderKey:"+uuid,uuid,200, TimeUnit.MINUTES);
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        param.setOrderKey(uuid);
+        param.setCompanyId(loginUser.getCompany().getCompanyId());
+        param.setCompanyUserId(loginUser.getUser().getUserId());
+        param.setIsVisit("就诊过");
+        return fsInquiryOrderService.createOrder(param);
     }
 
     /**

fs-company/src/main/java/com/fs/company/controller/store/FsUserController.java

@@ -76,9 +76,10 @@ public class FsUserController extends BaseController
     public TableDataInfo userList(FsUserParam fsUser)
     {
         startPage();
-        if(fsUser.getPhoneMk()!=null&&fsUser.getPhone()!=""){
-            fsUser.setPhone(encryptPhone(fsUser.getPhoneMk()));
-        }
+
+
+        fsUser.setPhone(encryptPhone(fsUser.getPhone()));
+
         List<FsUserVO> list = fsUserService.selectFsUserListVOByComponent(fsUser);
         for (FsUserVO fsUserVO : list) {
             fsUserVO.setPhone(decryptAutoPhoneMk(fsUserVO.getPhone()));

fs-ipad-task/src/main/java/com/fs/framework/config/DataSourceConfig.java

@@ -66,6 +66,7 @@ public class DataSourceConfig {
 
         targetDataSources.put(DataSourceType.SLAVE.name(), slaveDataSource);
         targetDataSources.put(DataSourceType.SOP.name(), sopDataSource);
+        targetDataSources.put(DataSourceType.SopREAD.name(), sopReadDataSource);
         targetDataSources.put(DataSourceType.CLICKHOUSE.name(), clickhouseDataSource); // Ensure matching key
         return new DynamicDataSource(masterDataSource, targetDataSources);
     }

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -78,6 +78,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.SocketTimeoutException;
+import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -665,14 +666,22 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             fsUserMapper.updateFsUser(user);
 
 
-            //小访客特有
+//            //小访客特有
 //            SendXfkParam xfkParam=new SendXfkParam();
 //            xfkParam.setCorpId(externalContact.getCorpId());
 //            xfkParam.setUserId(externalContact.getUserId());
 //            xfkParam.setName(externalContact.getName());
 //            xfkParam.setAddWay(externalContact.getAddWay());
 //            xfkParam.setState(externalContact.getState());
-//            xfkParam.setCreateTime(externalContact.getCreateTime().toString());
+//            if (externalContact.getCreateTime()!=null){
+//                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                String formattedTime = sdf.format(externalContact.getCreateTime());
+//                xfkParam.setCreateTime(formattedTime);
+//            }else {
+//                xfkParam.setCreateTime("");
+//            }
+//
+//
 //            xfkService.executeSopByIds(xfkParam);
 
             iSopUserLogsInfoService.updateSopUserInfoByExternalId(qwExternalId,param.getUserId());

fs-service/src/main/java/com/fs/his/domain/FsIntegralOrder.java

@@ -78,6 +78,7 @@ public class FsIntegralOrder extends BaseEntity
     @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date deliveryTime;
 
+
     /**
      * 企业微信ID
      * **/
@@ -95,4 +96,7 @@ public class FsIntegralOrder extends BaseEntity
      * **/
     @Excel(name = "销售公司ID")
     private Long companyId;
+
+
+
 }

fs-service/src/main/java/com/fs/sop/mapper/QwSopLogsMapper.java

@@ -321,6 +321,6 @@ public interface QwSopLogsMapper extends BaseMapper<QwSopLogs> {
     @DataSource(DataSourceType.SOP)
     List<QwSopLogs> selectIpadByCorpId(@Param("corpId") String corpId, @Param("now") LocalDateTime now);
 
-    @DataSource(DataSourceType.SOP)
+    @DataSource(DataSourceType.SopREAD)
     List<QwSopLogs> selectByQwUserId(@Param("id") Long id);
 }

fs-service/src/main/resources/application-druid-myhk.yml

@@ -97,6 +97,10 @@ spring:
                     url: jdbc:mysql://172.27.0.17:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: myhk888777666.
+                read:
+                    url: jdbc:mysql://172.27.0.38:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: myhk888777666.
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -795,7 +795,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and cu.nick_name like concat( #{maps.companyUserNickName}, '%')
             </if>
             <if test="maps.companyId != null and  maps.companyId != -1">
-                " + "and so.company_id =#{maps.companyId} " + "
+                and so.company_id =#{maps.companyId}
             </if>
             <if test="maps.companyId == -1">
                 and so.company_id is null