代码合并

fs-admin/src/main/java/com/fs/api/controller/IndexStatisticsController.java

@@ -70,7 +70,7 @@ public class IndexStatisticsController {
         if(userType == null) {
             userType = 0;
         }
-        if(!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
+        if(medicalMallConfig.isStatics()|| (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             analysisPreviewDTO = redisCache.getCacheObject(String.format("%s:%d:%d",DATA_OVERVIEW_DEALER_ANALYSISPREVIEW,type,userType));
         }else if(param.getCompanyId() != null){
             analysisPreviewDTO = redisCache.getCacheObject(String.format("%s:%d:%d:%d",DATA_OVERVIEW_DEALER_ANALYSISPREVIEW,type,userType,param.getCompanyId()));
@@ -144,7 +144,7 @@ public class IndexStatisticsController {
     @GetMapping("/rechargeComsumption")
     public R rechargeComsumption(StatisticsDeptCompanyParam param){
         ConsumptionBalanceDataDTO consumptionBalanceDataDTO = new ConsumptionBalanceDataDTO();
-        if(!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)) {
+        if(medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)) {
             consumptionBalanceDataDTO = redisCache.getCacheObject(StatisticsRedisConstant.DATA_OVERVIEW_DEALER_BALANCE);
         }else if(param.getCompanyId() != null){
             consumptionBalanceDataDTO = redisCache.getCacheObject(String.format("%s:%d",DATA_OVERVIEW_DEALER_BALANCE,param.getCompanyId()));
@@ -179,9 +179,9 @@ public class IndexStatisticsController {
     @GetMapping("/trafficLog")
     public R getTrafficLog(StatisticsDeptCompanyParam  param){
         TrafficLogDTO result = new TrafficLogDTO();
-        if(!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)) {
+        if(!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)) {
             result = redisCache.getCacheObject(DATA_OVERVIEW_TRAFFIC_LOG);
-            if (!"1".equals(medicalMallConfig.getStatics())) {
+            if (!medicalMallConfig.isStatics()) {
                 SysConfig sysConfig = sysConfigService.selectConfigByConfigKey("redPacket.Traffic.config");
                 if(result == null || sysConfig == null) {
                     return null;
@@ -247,7 +247,7 @@ public class IndexStatisticsController {
         }
         List<WatchEndPlayTrendDTO> watchEndPlayTrendDTOS;
         // 参考watchCourseTopTen方法的处理逻辑
-        if (!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
+        if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             String key = String.format("%s:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType);
             watchEndPlayTrendDTOS = redisCache.getCacheObject(key);
         }else if(param.getCompanyId() != null){
@@ -331,7 +331,7 @@ public class IndexStatisticsController {
         }
         List<DeaMemberTopTenDTO> deaMemberTopTenDTOS = new ArrayList<>();
         // 参考deaMemberTopTen方法处理逻辑
-        if (!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
+        if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             String key = String.format("%s:%d:%d:%d", CHARTS_MEMBER_TOP_TEN_WATCH, type, statisticalType,userType);
             deaMemberTopTenDTOS =  redisCache.getCacheObject(key);
         }else if(param.getCompanyId() != null){
@@ -388,7 +388,7 @@ public class IndexStatisticsController {
         Integer userType = param.getUserType();
         List<RewardMoneyTopTenDTO> rewardMoneyTopTenDTOS = new ArrayList<>();
         // 参考rewardMoneyTopTen方法处理逻辑
-        if(!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
+        if(!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             String key = String.format("%s:%d:%d:%d", CHARTS_REWARD_MONEY_TOP_TEN, type,dataType,userType);
             rewardMoneyTopTenDTOS = redisCache.getCacheObject(key);
         }else if(param.getCompanyId() != null){
@@ -442,7 +442,7 @@ public class IndexStatisticsController {
         Integer userType = param.getUserType();
         List<RewardMoneyTrendDTO> rewardMoneyTrendDTOS = new ArrayList<>();
         // 参考rewardMoneyTrend方法处理逻辑
-        if(!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
+        if(!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             String key = String.format("%s:%d:%d", CHARTS_REWARD_MONEY_TREND, type,userType);
             rewardMoneyTrendDTOS = redisCache.getCacheObject(key);
         }else if(param.getCompanyId() != null){
@@ -494,7 +494,7 @@ public class IndexStatisticsController {
         Integer statisticalType = param.getStatisticalType();
         Integer userType = param.getUserType();
         List<CourseStatsDTO> courseStatsDTOS;
-        if (!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
+        if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             courseStatsDTOS = redisCache.getCacheObject(String.format("%s:%d:%d:%d:%s", CHARTS_WATCH_TOP_TEN, type,statisticalType,userType,sort));
         }else if(param.getCompanyId() != null){
             courseStatsDTOS = redisCache.getCacheObject(String.format("%s:%d:%d:%d:%s:%d", CHARTS_WATCH_TOP_TEN, type,statisticalType,userType,sort,param.getCompanyId()));
@@ -611,7 +611,7 @@ public class IndexStatisticsController {
     @GetMapping("/dealerAggregated")
     public R dealerAggregated(StatisticsDeptCompanyParam param){
         DealerAggregatedDTO result = new DealerAggregatedDTO();
-        if (!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)) {
+        if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)) {
             result = redisCache.getCacheObject(StatisticsRedisConstant.DATA_OVERVIEW_DEALER_AGGREGATED);
         }else if (param.getCompanyId() != null) {
             result = redisCache.getCacheObject(String.format("%s:%d", DATA_OVERVIEW_DEALER_AGGREGATED, param.getCompanyId()));
@@ -666,7 +666,7 @@ public class IndexStatisticsController {
      */
     @GetMapping("/smsBalance")
     public R smsBalance(StatisticsDeptCompanyParam param){
-        if (!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
+        if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             return R.ok().put("data", redisCache.getCacheObject(StatisticsRedisConstant.DATA_OVERVIEW_DEALER_SMS_BALANCE));
         }else if(param.getCompanyId() != null){
             return R.ok().put("data", redisCache.getCacheObject(String.format("%s:%d", DATA_OVERVIEW_DEALER_SMS_BALANCE, param.getCompanyId())));
@@ -692,7 +692,7 @@ public class IndexStatisticsController {
     @GetMapping("/authorizationInfo")
     public R authorizationInfo(StatisticsDeptCompanyParam  param){
         AuthorizationInfoDTO authorizationInfoDTO = new AuthorizationInfoDTO();
-        if (!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
+        if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             return R.ok().put("data", redisCache.getCacheObject(StatisticsRedisConstant.DATA_OVERVIEW_DEALER_AUTHORIZATION_INFO));
         }else if(param.getCompanyId() != null){
             return R.ok().put("data", redisCache.getCacheObject(String.format("%s:%d", DATA_OVERVIEW_DEALER_AUTHORIZATION_INFO, param.getCompanyId())));
@@ -728,7 +728,7 @@ public class IndexStatisticsController {
      */
     @GetMapping("/thisMonthOrderCount")
     public R thisMonthOrderCount(StatisticsDeptCompanyParam  param){
-        if (!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
+        if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             return redisCache.getCacheObject(StatisticsRedisConstant.THIS_MONTH_ORDER_COUNT);
         }else if(param.getCompanyId() != null){
             return redisCache.getCacheObject(String.format("%s:%d", THIS_MONTH_ORDER_COUNT, param.getCompanyId()));
@@ -759,7 +759,7 @@ public class IndexStatisticsController {
 
     @GetMapping("/thisMonthRecvCount")
     public R thisMonthRecvCount(StatisticsDeptCompanyParam  param){
-        if (!"1".equals(medicalMallConfig.getStatics()) || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
+        if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             return redisCache.getCacheObject(StatisticsRedisConstant.THIS_MONTH_RECV_COUNT);
         }else if(param.getCompanyId() != null){
             return redisCache.getCacheObject(String.format("%s:%d", THIS_MONTH_RECV_COUNT, param.getCompanyId()));

fs-admin/src/main/java/com/fs/company/controller/CompanyTrafficController.java

@@ -39,7 +39,7 @@ public class CompanyTrafficController extends BaseController {
      * */
     @Scheduled(cron = "0 1 0 * * ?")
     public void refreshTraffic(){
-        if("1".equals(medicalMallConfig.getStatics()))
+        if(medicalMallConfig.isStatics())
             companyTrafficRecordService.refreshTraffic();
     }
 
@@ -48,7 +48,7 @@ public class CompanyTrafficController extends BaseController {
      * */
     @PostConstruct
     public void init() {
-        if("1".equals(medicalMallConfig.getStatics()))
+        if(medicalMallConfig.isStatics())
             companyTrafficRecordService.init();
     }
 

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

@@ -58,10 +58,6 @@ public class FsCourseRedPacketLogController extends BaseController
     ISysConfigService configService;
     @Autowired
     FsUserCourseVideoMapper fsUserCourseVideoMapper;
-    @Autowired
-    private TokenService tokenService;
-    @Autowired
-    private ISysConfigService configService;
     /**
      * 查询短链课程看课记录列表
      */

fs-admin/src/main/java/com/fs/his/controller/FsUserComplaintController.java → fs-admin/src/main/java/com/fs/his/controller/FsHisComplaintController.java

@@ -6,8 +6,8 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.his.domain.FsUserComplaint;
-import com.fs.his.service.IFsUserComplaintService;
+import com.fs.his.domain.FsHisComplaint;
+import com.fs.his.service.IFsHisComplaintService;
 import com.fs.his.vo.FsUserComplaintVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,20 +23,20 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/his/complaint")
-public class FsUserComplaintController extends BaseController
+public class FsHisComplaintController extends BaseController
 {
     @Autowired
-    private IFsUserComplaintService fsUserComplaintService;
+    private IFsHisComplaintService fsUserComplaintService;
 
     /**
      * 查询用户投诉列表
      */
     @PreAuthorize("@ss.hasPermi('his:complaint:list')")
     @GetMapping("/list")
-    public TableDataInfo list(FsUserComplaint fsUserComplaint)
+    public TableDataInfo list(FsHisComplaint fsHisComplaint)
     {
         startPage();
-        List<FsUserComplaintVo> list = fsUserComplaintService.selectFsUserComplaintList(fsUserComplaint);
+        List<FsUserComplaintVo> list = fsUserComplaintService.selectFsUserComplaintList(fsHisComplaint);
         return getDataTable(list);
     }
 
@@ -46,9 +46,9 @@ public class FsUserComplaintController extends BaseController
     @PreAuthorize("@ss.hasPermi('his:complaint:export')")
     @Log(title = "用户投诉", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(FsUserComplaint fsUserComplaint)
+    public AjaxResult export(FsHisComplaint fsHisComplaint)
     {
-        List<FsUserComplaintVo> list = fsUserComplaintService.selectFsUserComplaintList(fsUserComplaint);
+        List<FsUserComplaintVo> list = fsUserComplaintService.selectFsUserComplaintList(fsHisComplaint);
         ExcelUtil<FsUserComplaintVo> util = new ExcelUtil<FsUserComplaintVo>(FsUserComplaintVo.class);
         return util.exportExcel(list, "用户投诉数据");
     }
@@ -69,9 +69,9 @@ public class FsUserComplaintController extends BaseController
     @PreAuthorize("@ss.hasPermi('his:complaint:add')")
     @Log(title = "用户投诉", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody FsUserComplaint fsUserComplaint)
+    public AjaxResult add(@RequestBody FsHisComplaint fsHisComplaint)
     {
-        return toAjax(fsUserComplaintService.insertFsUserComplaint(fsUserComplaint));
+        return toAjax(fsUserComplaintService.insertFsUserComplaint(fsHisComplaint));
     }
 
     /**
@@ -80,9 +80,9 @@ public class FsUserComplaintController extends BaseController
     @PreAuthorize("@ss.hasPermi('his:complaint:edit')")
     @Log(title = "用户投诉", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody FsUserComplaint fsUserComplaint)
+    public AjaxResult edit(@RequestBody FsHisComplaint fsHisComplaint)
     {
-        return toAjax(fsUserComplaintService.updateFsUserComplaint(fsUserComplaint));
+        return toAjax(fsUserComplaintService.updateFsUserComplaint(fsHisComplaint));
     }
 
     /**

fs-qw-api-msg/src/main/java/com/fs/app/controller/QwMsgController.java

@@ -360,7 +360,7 @@ public class QwMsgController {
                     }
                     Long receiver = wxWorkMessageDTO.getReceiver();
                     Long extId=null;
-                    Integer totalSeconds=0;
+                    long totalSeconds=0L;
                     if (2000000000000000L-receiver>0){
                          extId = wxWorkMessageDTO.getSender();
                         log.info("id:{}, 客户发起", id);
@@ -391,7 +391,7 @@ public class QwMsgController {
                                     minutes = Integer.parseInt(matcher.group(1));
                                     seconds = Integer.parseInt(matcher.group(2));
                                 }
-                                totalSeconds = hours * 3600 + minutes * 60 + seconds;
+                                totalSeconds = hours * 3600L + minutes * 60L + seconds;
                                 log.info("id:{}, 总通话秒数: " + totalSeconds, id);
                             }
                         }

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseMapper.java

@@ -233,10 +233,7 @@ public interface FsUserCourseMapper
 
     @Select("select course_id dict_value, course_name dict_label,img_url dict_imgUrl  from fs_user_course where is_del = 0 and is_private = 1 ")
     List<OptionsVO> selectFsUserCourseAllList();
-
-    @Select("select course_id dict_value, course_name dict_label,img_url dict_imgUrl  from fs_user_course where is_del = 0 and is_private = 1 and user_id = #{userId}")
-    List<OptionsVO> selectFsUserCourseAllListByUserId(@Param("userId") Long userId);
-
+    
     @Select("select course_id dict_value, course_name dict_label,img_url dict_imgUrl  from fs_user_course where is_del = 0 and is_private = 1" +
             " and find_in_set(#{companyId},company_ids) ")
     List<OptionsVO> selectFsUserCourseByCompany(@Param("companyId") Long companyId);

fs-service/src/main/java/com/fs/his/domain/FsUserComplaint.java → fs-service/src/main/java/com/fs/his/domain/FsHisComplaint.java

@@ -1,6 +1,7 @@
 package com.fs.his.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -16,7 +17,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class FsUserComplaint extends BaseEntity{
+@TableName("fs_user_complaint")
+public class FsHisComplaint extends BaseEntity{
 
     @TableId
     private Long id;

fs-service/src/main/java/com/fs/his/mapper/FsUserComplaintMapper.java → fs-service/src/main/java/com/fs/his/mapper/FsHisComplaintMapper.java

@@ -1,7 +1,7 @@
 package com.fs.his.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fs.his.domain.FsUserComplaint;
+import com.fs.his.domain.FsHisComplaint;
 import com.fs.his.vo.FsUserComplaintVo;
 
 import java.util.List;
@@ -12,7 +12,7 @@ import java.util.List;
  * @author fs
  * @date 2025-06-09
  */
-public interface FsUserComplaintMapper extends BaseMapper<FsUserComplaint>{
+public interface FsHisComplaintMapper extends BaseMapper<FsHisComplaint>{
     /**
      * 查询用户投诉
      *
@@ -24,26 +24,26 @@ public interface FsUserComplaintMapper extends BaseMapper<FsUserComplaint>{
     /**
      * 查询用户投诉列表
      *
-     * @param fsUserComplaint 用户投诉
+     * @param fsHisComplaint 用户投诉
      * @return 用户投诉集合
      */
-    List<FsUserComplaintVo> selectFsUserComplaintList(FsUserComplaint fsUserComplaint);
+    List<FsUserComplaintVo> selectFsUserComplaintList(FsHisComplaint fsHisComplaint);
 
     /**
      * 新增用户投诉
      *
-     * @param fsUserComplaint 用户投诉
+     * @param fsHisComplaint 用户投诉
      * @return 结果
      */
-    int insertFsUserComplaint(FsUserComplaint fsUserComplaint);
+    int insertFsUserComplaint(FsHisComplaint fsHisComplaint);
 
     /**
      * 修改用户投诉
      *
-     * @param fsUserComplaint 用户投诉
+     * @param fsHisComplaint 用户投诉
      * @return 结果
      */
-    int updateFsUserComplaint(FsUserComplaint fsUserComplaint);
+    int updateFsUserComplaint(FsHisComplaint fsHisComplaint);
 
     /**
      * 删除用户投诉

fs-service/src/main/java/com/fs/his/service/IFsUserComplaintService.java → fs-service/src/main/java/com/fs/his/service/IFsHisComplaintService.java

@@ -1,7 +1,7 @@
 package com.fs.his.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fs.his.domain.FsUserComplaint;
+import com.fs.his.domain.FsHisComplaint;
 import com.fs.his.vo.FsUserComplaintVo;
 
 import java.util.List;
@@ -12,7 +12,7 @@ import java.util.List;
  * @author fs
  * @date 2025-06-09
  */
-public interface IFsUserComplaintService extends IService<FsUserComplaint>{
+public interface IFsHisComplaintService extends IService<FsHisComplaint>{
     /**
      * 查询用户投诉
      *
@@ -24,26 +24,26 @@ public interface IFsUserComplaintService extends IService<FsUserComplaint>{
     /**
      * 查询用户投诉列表
      *
-     * @param fsUserComplaint 用户投诉
+     * @param fsHisComplaint 用户投诉
      * @return 用户投诉集合
      */
-    List<FsUserComplaintVo> selectFsUserComplaintList(FsUserComplaint fsUserComplaint);
+    List<FsUserComplaintVo> selectFsUserComplaintList(FsHisComplaint fsHisComplaint);
 
     /**
      * 新增用户投诉
      *
-     * @param fsUserComplaint 用户投诉
+     * @param fsHisComplaint 用户投诉
      * @return 结果
      */
-    int insertFsUserComplaint(FsUserComplaint fsUserComplaint);
+    int insertFsUserComplaint(FsHisComplaint fsHisComplaint);
 
     /**
      * 修改用户投诉
      *
-     * @param fsUserComplaint 用户投诉
+     * @param fsHisComplaint 用户投诉
      * @return 结果
      */
-    int updateFsUserComplaint(FsUserComplaint fsUserComplaint);
+    int updateFsUserComplaint(FsHisComplaint fsHisComplaint);
 
     /**
      * 批量删除用户投诉

fs-service/src/main/java/com/fs/his/service/impl/FsUserComplaintServiceImpl.java → fs-service/src/main/java/com/fs/his/service/impl/FsHisComplaintServiceImpl.java

@@ -2,9 +2,9 @@ package com.fs.his.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.common.utils.DateUtils;
-import com.fs.his.domain.FsUserComplaint;
-import com.fs.his.mapper.FsUserComplaintMapper;
-import com.fs.his.service.IFsUserComplaintService;
+import com.fs.his.domain.FsHisComplaint;
+import com.fs.his.mapper.FsHisComplaintMapper;
+import com.fs.his.service.IFsHisComplaintService;
 import com.fs.his.vo.FsUserComplaintVo;
 import org.springframework.stereotype.Service;
 
@@ -17,7 +17,7 @@ import java.util.List;
  * @date 2025-06-09
  */
 @Service
-public class FsUserComplaintServiceImpl extends ServiceImpl<FsUserComplaintMapper, FsUserComplaint> implements IFsUserComplaintService {
+public class FsHisComplaintServiceImpl extends ServiceImpl<FsHisComplaintMapper, FsHisComplaint> implements IFsHisComplaintService {
 
     /**
      * 查询用户投诉
@@ -34,38 +34,38 @@ public class FsUserComplaintServiceImpl extends ServiceImpl<FsUserComplaintMappe
     /**
      * 查询用户投诉列表
      *
-     * @param fsUserComplaint 用户投诉
+     * @param fsHisComplaint 用户投诉
      * @return 用户投诉
      */
     @Override
-    public List<FsUserComplaintVo> selectFsUserComplaintList(FsUserComplaint fsUserComplaint)
+    public List<FsUserComplaintVo> selectFsUserComplaintList(FsHisComplaint fsHisComplaint)
     {
-        return baseMapper.selectFsUserComplaintList(fsUserComplaint);
+        return baseMapper.selectFsUserComplaintList(fsHisComplaint);
     }
 
     /**
      * 新增用户投诉
      *
-     * @param fsUserComplaint 用户投诉
+     * @param fsHisComplaint 用户投诉
      * @return 结果
      */
     @Override
-    public int insertFsUserComplaint(FsUserComplaint fsUserComplaint)
+    public int insertFsUserComplaint(FsHisComplaint fsHisComplaint)
     {
-        fsUserComplaint.setCreateTime(DateUtils.getNowDate());
-        return baseMapper.insertFsUserComplaint(fsUserComplaint);
+        fsHisComplaint.setCreateTime(DateUtils.getNowDate());
+        return baseMapper.insertFsUserComplaint(fsHisComplaint);
     }
 
     /**
      * 修改用户投诉
      *
-     * @param fsUserComplaint 用户投诉
+     * @param fsHisComplaint 用户投诉
      * @return 结果
      */
     @Override
-    public int updateFsUserComplaint(FsUserComplaint fsUserComplaint)
+    public int updateFsUserComplaint(FsHisComplaint fsHisComplaint)
     {
-        return baseMapper.updateFsUserComplaint(fsUserComplaint);
+        return baseMapper.updateFsUserComplaint(fsHisComplaint);
     }
 
     /**

fs-service/src/main/java/com/fs/hisStore/config/MedicalMallConfig.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.util.Objects;
 
 @Getter
 @Component
@@ -20,21 +21,21 @@ public class MedicalMallConfig {
     {"isMedicalMall":"0","statics":"1","isAudit":"0"}
     */
     // 是否药品商城
-    private String isMedicalMall;
+    private boolean isMedicalMall;
     // 首页是否根据部门、公司进行统计
-    private String statics;
+    private boolean isStatics;
     // 店铺、商品是否审核
-    private String isAudit;
+    private boolean isAudit;
     // 资源配置
-    private String isResource;
+    private boolean isResource;
     @PostConstruct
     public void init() {
         JSONObject jsonObject = configUtil.generateConfigByKey("medicalMall.func.switch");
         if (jsonObject != null) {
-            this.isMedicalMall = jsonObject.getString("isMedicalMall");
-            this.statics = jsonObject.getString("statics");
-            this.isAudit = jsonObject.getString("isAudit");
-            this.isResource = jsonObject.getString("isResource");
+            this.isMedicalMall = Objects.equals(jsonObject.getString("isMedicalMall"), "1");
+            this.isStatics = Objects.equals(jsonObject.getString("statics"), "1");
+            this.isAudit = Objects.equals(jsonObject.getString("isAudit"), "1");
+            this.isResource = Objects.equals(jsonObject.getString("isResource"), "1");
         }
     }
 

fs-service/src/main/java/com/fs/hisStore/mapper/SysOperLogScrmMapper.java

@@ -52,7 +52,7 @@ public interface SysOperLogScrmMapper  extends BaseMapper<SysOperLogScrm>
 
     void insertBatchByIds(@Param("entity") List<SysOperLogScrm> sysOperLogScrm);
     //selectOperLogByMainId
-    List<SysOperLogScrm> selectOperLogByMainId(Long mainId);
+    List<SysOperLogScrm> selectSotreOperLogByMainId(Long mainId);
 
     int updateByIncloudIdStr(SysOperLogScrm operLog);
 }

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

@@ -38,7 +38,7 @@ public class FsHisStoreAuditLogScrmServiceImpl implements IFsHisStoreAuditLogScr
     public void addAudit(Long id, String reason, String attachImage) {
         List<Long> ids = new ArrayList<>();
         ids.add(id);
-        addBatchAudit(ids, null, null);
+        addBatchAudit(ids, reason, attachImage);
     }
 
     @Override
@@ -49,7 +49,7 @@ public class FsHisStoreAuditLogScrmServiceImpl implements IFsHisStoreAuditLogScr
     //selectOperLogByMainId
     @Override
     public List<SysOperLogScrm> selectOperLogByMainId(Long id) {
-        return sysOperLogScrmMapper.selectOperLogByMainId(id);
+        return sysOperLogScrmMapper.selectSotreOperLogByMainId(id);
     }
 
 

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fs.his.mapper.FsUserComplaintMapper">
+<mapper namespace="com.fs.his.mapper.FsHisComplaintMapper">
 
     <resultMap type="FsUserComplaint" id="FsUserComplaintResult">
         <result property="id"    column="id"    />
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsUserComplaintVo">
-        select id, user_id,user_name template_id, content, phone, urls,trade_image, account, create_time, is_handle, remarks from fs_user_complaint
+        select id, user_id,user_name ,template_id, content, phone, urls,trade_image, account, create_time, is_handle, remarks from fs_user_complaint
     </sql>
 
     <select id="selectFsUserComplaintList" parameterType="FsUserComplaint" resultType="com.fs.his.vo.FsUserComplaintVo">

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

@@ -105,9 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 
 	<!-- 根据mainId获取操作日志 -->
-	<select id="selectOperLogByMainId" resultMap="SysOperLogResult">
+	<select id="selectSotreOperLogByMainId" resultMap="SysOperLogResult">
 		<include refid="selectOperLogVo"/>
-		where main_id = #{mainId} and status = 0
+		where main_id = #{mainId} and status = 0 and main_type = '店铺' and business_type = 10
 	</select>
 
 	<!--updateByIncloudIdStr-->

fs-user-app/src/main/java/com/fs/app/controller/FsUserComplaintController.java

@@ -5,15 +5,14 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.his.domain.FsComplaintTemplate;
-import com.fs.his.domain.FsUserComplaint;
+import com.fs.his.domain.FsHisComplaint;
 import com.fs.his.service.IFsComplaintTemplateService;
-import com.fs.his.service.IFsUserComplaintService;
+import com.fs.his.service.IFsHisComplaintService;
 import com.fs.his.utils.ComplaintTreeUtil;
 import com.fs.his.vo.FsComplaintTemplateVO;
 import com.fs.his.vo.FsUserComplaintVo;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -29,7 +28,7 @@ import java.util.List;
 public class FsUserComplaintController extends AppBaseController
 {
     @Autowired
-    private IFsUserComplaintService fsUserComplaintService;
+    private IFsHisComplaintService fsUserComplaintService;
     @Autowired
     private IFsComplaintTemplateService fsComplaintTemplateService;
 
@@ -70,10 +69,10 @@ public class FsUserComplaintController extends AppBaseController
      */
 //    @PreAuthorize("@ss.hasPermi('his:complaint:list')")
     @GetMapping("/list")
-    public TableDataInfo list(FsUserComplaint fsUserComplaint)
+    public TableDataInfo list(FsHisComplaint fsHisComplaint)
     {
         startPage();
-        List<FsUserComplaintVo> list = fsUserComplaintService.selectFsUserComplaintList(fsUserComplaint);
+        List<FsUserComplaintVo> list = fsUserComplaintService.selectFsUserComplaintList(fsHisComplaint);
         return getDataTable(list);
     }
 
@@ -93,11 +92,11 @@ public class FsUserComplaintController extends AppBaseController
      */
     @Login
     @PostMapping
-    public AjaxResult add(@RequestBody FsUserComplaint fsUserComplaint)
+    public AjaxResult add(@RequestBody FsHisComplaint fsHisComplaint)
     {
         String userId = getUserId();
-        fsUserComplaint.setUserId(Long.valueOf(userId));
-        return toAjax(fsUserComplaintService.insertFsUserComplaint(fsUserComplaint));
+        fsHisComplaint.setUserId(Long.valueOf(userId));
+        return toAjax(fsUserComplaintService.insertFsUserComplaint(fsHisComplaint));
     }
 
     /**
@@ -105,9 +104,9 @@ public class FsUserComplaintController extends AppBaseController
      */
     @Login
     @PutMapping
-    public AjaxResult edit(@RequestBody FsUserComplaint fsUserComplaint)
+    public AjaxResult edit(@RequestBody FsHisComplaint fsHisComplaint)
     {
-        return toAjax(fsUserComplaintService.updateFsUserComplaint(fsUserComplaint));
+        return toAjax(fsUserComplaintService.updateFsUserComplaint(fsHisComplaint));
     }
 
     /**