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

fs-admin/src/main/java/com/fs/course/controller/FsCourseQuestionBankController.java

@@ -156,11 +156,8 @@ public class FsCourseQuestionBankController extends BaseController
     @PreAuthorize("@ss.hasPermi('course:courseQuestionBank:importData')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file) throws Exception {
-
-        ExcelUtil<FsCourseQuestionBankImportDTO> util =
-                new ExcelUtil<>(FsCourseQuestionBankImportDTO.class);
-        List<FsCourseQuestionBankImportDTO> list =
-                util.importExcel(file.getInputStream());
+        ExcelUtil<FsCourseQuestionBankImportDTO> util = new ExcelUtil<>(FsCourseQuestionBankImportDTO.class);
+        List<FsCourseQuestionBankImportDTO> list = util.importExcel(file.getInputStream());
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long userId = loginUser.getUser().getUserId();

fs-ipad-task/src/main/java/com/fs/app/service/IpadSendServer.java

@@ -445,7 +445,7 @@ public class IpadSendServer {
                     sendVoice(vo, content);
                     break;
                 case "8":
-                    // 语音
+                    // 视频号
                     sendWxVideo(vo, content);
                     break;
                 default:

fs-qw-task/src/main/java/com/fs/app/task/UserCourseWatchCountTask.java

@@ -16,7 +16,7 @@ public class UserCourseWatchCountTask {
     /**
      * 每15分钟执行一次
      */
-    @Scheduled(cron = "0 */10 * * * ?")  // 每10分钟执行一次
+//    @Scheduled(cron = "0 */10 * * * ?")  // 每10分钟执行一次
     public void userCourseCountTask() {
         try {
             log.info("==============会员看课统计任务执行===============开始");

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

@@ -13,6 +13,7 @@ import com.fs.course.domain.FsUserCoursePeriodDays;
 import com.fs.course.domain.FsUserCourseVideo;
 import com.fs.course.mapper.FsUserCoursePeriodDaysMapper;
 import com.fs.course.mapper.FsUserCoursePeriodMapper;
+import com.fs.course.mapper.FsUserCourseVideoMapper;
 import com.fs.course.mapper.FsUserCourseVideoRedPackageMapper;
 import com.fs.course.param.BatchAddCourseSectionParam;
 import com.fs.course.param.CompanyRedPacketParam;
@@ -28,6 +29,7 @@ import com.fs.his.mapper.FsUserMapper;
 import com.fs.his.vo.OptionsVO;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.mapper.SysConfigMapper;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,13 +59,15 @@ import java.util.stream.Collectors;
 public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCoursePeriodDaysMapper, FsUserCoursePeriodDays> implements IFsUserCoursePeriodDaysService {
 
     private final FsUserCoursePeriodMapper fsUserCoursePeriodMapper;
+
     private final FsUserMapper fsUserMapper;
     private final SysConfigMapper sysConfigMapper;
+
     private final FsUserCoursePeriodDaysMapper fsUserCoursePeriodDaysMapper;
-    
+
     @Lazy
     private final IFsUserCourseVideoService fsUserCourseVideoService;
-    
+
     public FsUserCoursePeriodDaysServiceImpl(
             FsUserCoursePeriodMapper fsUserCoursePeriodMapper,
             FsUserMapper fsUserMapper,

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

@@ -216,6 +216,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
 
     @Autowired
     private IFsStoreCartScrmService cartService;
+    @Autowired
+    private CompanyUserUserMapper companyUserUserMapper;
 
     @Autowired
     private ApplicationEventPublisher publisher;
@@ -397,9 +399,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
     @Autowired
     private IFsStoreCartScrmService fsStoreCartScrmService;
 
-    @Autowired
-    private CompanyUserUserMapper companyUserUserMapper;
-
     @PostConstruct
     public void initErpServiceMap() {
         erpServiceMap = new HashMap<>();
@@ -3178,12 +3177,12 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 }
 
                 FsShippingTemplatesRegionScrm shippingTemplatesRegion = shippingTemplatesRegionMap.get(tempId);
-                
+
                 // 如果该运费模板在当前城市没有配置运费区域，跳过该商品
                 if (shippingTemplatesRegion == null) {
                     continue;
                 }
-                
+
                 BigDecimal price = NumberUtil.round(NumberUtil.mul(storeCartVO.getCartNum(),
                         storeCartVO.getPrice()), 2);
                 if (!templateDTOMap.containsKey(tempId)) {
@@ -4886,8 +4885,9 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
     }
 
-
-
+    private static final DateTimeFormatter CST_FORMATTER = DateTimeFormatter
+            .ofPattern("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US)
+            .withZone(ZoneId.of("Asia/Shanghai"));
 
     @Override
     public List<FsStoreOrderVO> selectFsStoreOrderListVOByErpAccount(FsStoreOrderParam param) {
@@ -5393,10 +5393,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         return R.ok().put("orderKey", uuid);
     }
 
-    private static final DateTimeFormatter CST_FORMATTER = DateTimeFormatter
-            .ofPattern("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US)
-            .withZone(ZoneId.of("Asia/Shanghai"));
-
     private static final DateTimeFormatter STANDARD_FORMATTER = DateTimeFormatter
             .ofPattern("yyyy-MM-dd HH:mm:ss");
 

fs-service/src/main/java/com/fs/qw/mapper/QwWatchLogMapper.java

@@ -420,4 +420,11 @@ public interface QwWatchLogMapper extends BaseMapper<QwWatchLog>{
     int selectQwWatchLogIsFirstByUserId(Long userId);
 
 
+    @Select("select \n" +
+            "COUNT(CASE WHEN day = 0 and status in (1,2) THEN 1 END) AS firstOnline,\n" +
+            "COUNT(CASE WHEN day = 0 and status=2 THEN 1 END) AS firstOver,\n" +
+            "COUNT(CASE WHEN day = 1 and status in (1,2) THEN 1 END) AS d1Online,\n" +
+            "COUNT(CASE WHEN day = 1 and status=2 THEN 1 END) AS d1Over\n" +
+            " from qw_watch_log where qw_user_id=#{id} and DATE(line_time) = DATE(#{createTime})")
+    QwWatchLogStatisticsListVO selectQwWatchLogByQwUserId(@Param("id")Long id,@Param("createTime") Date createTime);
 }

fs-service/src/main/java/com/fs/qw/service/IQwExternalContactService.java

@@ -250,7 +250,6 @@ public interface IQwExternalContactService extends IService<QwExternalContact> {
     List<QwUserDelLossLogVO> selectQwUserDelLossLogList(QwUserDelLossLogParam param);
 
     void updateQwExternalContactStatusById(QwExternalContact qwExternalContact);
-    List<QwExternalContact> selectQwUserAndLevel(List<Long> qwUserIdList, List<String> levelList, boolean isReg);
 
     R getRepeat(RepeatParam param);
     List<QwExternalContactVO> selectQwExternalContactListVONewSys(QwExternalContactParam qwExternalContact);
@@ -259,4 +258,5 @@ public interface IQwExternalContactService extends IService<QwExternalContact> {
      * */
     QwExternalContact selectQwUserListVOByQwUserIdAndCorpIdAndExternalUserId(ExternalContactParam externalContactParam);
 
+    List<QwExternalContact> selectQwUserAndLevel(List<Long> qwUserIdList, List<String> list, boolean b);
 }

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

@@ -39,16 +39,17 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                  url: jdbc:mysql://rds.czwh.lan:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                  url: jdbc:mysql://192.168.0.229:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                   username: czwh
                   password: Ylrz_1q2w3e4r5t6y
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
-                    enabled: false
-                    url:
-                    username:
-                    password:
+                    enabled: true
+                    url: jdbc:mysql://192.168.0.180:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: czwh
+                    password: Ylrz_1q2w3e4r5t6y
+              # 从库数据源
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量
@@ -94,7 +95,12 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://rds.czwh.lan:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://192.168.0.229:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: czwh
+                    password: Ylrz_1q2w3e4r5t6y
+                # 主库数据源
+                read:
+                    url: jdbc:mysql://192.168.0.180:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: czwh
                     password: Ylrz_1q2w3e4r5t6y
                 # 初始连接数

fs-user-app/src/main/java/com/fs/app/controller/store/CompanyUserScrmController.java

@@ -18,6 +18,7 @@ import com.fs.common.core.redis.RedisCache;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.CloudHostUtils;
 import com.fs.common.utils.sign.Md5Utils;
+import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.domain.CompanyUserCard;
 import com.fs.company.domain.CompanyUserUser;
@@ -39,6 +40,13 @@ import com.fs.sop.service.IQwSopTempVoiceService;
 import com.fs.system.service.ISysConfigService;
 import com.fs.system.oss.CloudStorageService;
 import com.fs.system.oss.OSSFactory;
+import com.fs.his.dto.PayConfigDTO;
+import com.fs.his.service.IFsPrescribeService;
+import com.fs.sop.domain.QwSopTempVoice;
+import com.fs.sop.service.IQwSopTempVoiceService;
+import com.fs.system.oss.CloudStorageService;
+import com.fs.system.oss.OSSFactory;
+import com.fs.system.service.ISysConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.FileUtils;
@@ -61,6 +69,9 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static com.fs.app.controller.CompanyUserController.SOP_TEMP_VOICE_KEY;
+import java.util.stream.Collectors;
+
 
 @Api("销售中心")
 @RestController
@@ -77,6 +88,7 @@ public class CompanyUserScrmController extends AppBaseController {
     private ICompanyUserService companyUserService;
     @Autowired
     private ICompanyUserCardService companyUserCardService;
+
     @Autowired
     private ICompanyUserUserService companyUserUserService;
     @Autowired
@@ -90,6 +102,12 @@ public class CompanyUserScrmController extends AppBaseController {
     @Autowired
     private FastgptChatVoiceHomoMapper fastgptChatVoiceHomoMapper;
 
+
+
+    @Autowired
+    private IFsPrescribeService fsPrescribeService;
+
+
     @PostMapping("/login")
     public R Login(@RequestBody CompanyUserLoginParam param, HttpServletRequest request){
         try {
@@ -112,6 +130,7 @@ public class CompanyUserScrmController extends AppBaseController {
             return R.error("操作异常");
         }
     }
+
     @Login
     @ApiOperation("绑定销售")
     @PostMapping("/bindCompanyUser")