代码提交

fs-qw-task/src/main/java/com/fs/app/controller/CommonController.java

@@ -101,10 +101,6 @@ public class CommonController {
     @Autowired
     private IQwSopTempRulesService tempRulesService;
     @Autowired
-    private FsCourseRedPacketLogMapper fsCourseRedPacketLogMapper;
-    @Autowired
-    private ICompanyService companyService;
-    @Autowired
     private IQwSopTempVoiceService qwSopTempVoiceService;
 
     @Autowired
@@ -342,14 +338,4 @@ public class CommonController {
         }
         return R.ok();
     }
-    @GetMapping("/updateRedPack")
-    public R updateRedPack(String start , String end    ){
-        LocalDateTime startTime = DateUtil.parseLocalDateTime(start);
-        LocalDateTime endTime = DateUtil.parseLocalDateTime(end);
-        List<RedPacketMoneyVO> redPacketMoneyVOS = fsCourseRedPacketLogMapper.selectFsCourseRedPacketLogHourseByCompany(startTime, endTime);
-        for (RedPacketMoneyVO redPacketMoneyVO : redPacketMoneyVOS) {
-            companyService.subtractCompanyMoneyHourse(redPacketMoneyVO.getMoney(),redPacketMoneyVO.getCompanyId(), startTime.toLocalTime(), endTime.toLocalTime());
-        }
-        return R.ok();
-    }
 }

fs-service/src/main/java/com/fs/company/service/ICompanyService.java

@@ -161,6 +161,4 @@ public interface ICompanyService
      * @return
      */
     List<CompanyUser> selectCompanyListByIds(String result);
-
-    void subtractCompanyMoneyHourse(BigDecimal money, Long companyId, LocalTime start, LocalTime end);
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -1318,28 +1318,4 @@ public class CompanyServiceImpl implements ICompanyService
     public List<CompanyUser> selectCompanyListByIds(String result) {
         return companyMapper.selectCompanyListByIds(result);
     }
-    @Override
-    @Transactional
-    public void subtractCompanyMoneyHourse(BigDecimal money, Long companyId, LocalTime start, LocalTime end) {
-        if(companyId!=null&&companyId>0){
-            Company company=companyMapper.selectCompanyByIdForUpdate(companyId);
-            if(company!=null){
-                logger.info("每个小时扣除红包金额:{}", money);
-                company.setMoney(company.getMoney().subtract(money));
-                companyMapper.updateCompany(company);
-                CompanyMoneyLogs log=new CompanyMoneyLogs();
-                log.setCompanyId(company.getCompanyId());
-                if(end != null && start.getHour() != end.getHour()){
-                    log.setRemark("扣除"+start.getHour() + "到" + end.getHour() +"点红包金额");
-                }else{
-                    log.setRemark("扣除"+start.getHour()+"点红包金额");
-                }
-                log.setMoney(money.multiply(new BigDecimal(-1)));
-                log.setLogsType(15);
-                log.setBalance(company.getMoney());
-                log.setCreateTime(new Date());
-                moneyLogsMapper.insertCompanyMoneyLogs(log);
-            }
-        }
-    }
 }

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

@@ -23,4 +23,5 @@ public class MedicalMallConfig {
     private boolean isAudit;
     // 资源配置
     private boolean isResource;
+    private boolean isStores;
 }

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

@@ -100,9 +100,6 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
     @Autowired
     private FsStoreScrmServiceImpl fsStoreScrmService;
 
-    @Autowired
-    private MedicalMallConfig medicalMallConfig;
-
     @Autowired
     private CloudHostProper cloudHostProper;
 
@@ -758,7 +755,9 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
 
     @Override
     public List<FsStoreProductListQueryVO> selectFsStoreProductListQuery(FsStoreProductQueryParam param) {
-        boolean stores = medicalMallConfig.isStores();
+        SysConfig config = configService.selectConfigByConfigKey("medicalMall.func.switch");
+        MedicalMallConfig medicalMallConfig = JSON.parseObject(config.getConfigValue(), MedicalMallConfig.class);
+        boolean stores = medicalMallConfig != null && medicalMallConfig.isStores();
         param.setIsStores(stores?1:0);
         return fsStoreProductMapper.selectFsStoreProductListQuery(param);
     }
@@ -791,6 +790,8 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
 
     @Override
     public List<FsStoreProductListQueryVO> selectFsStoreProductNewQuery(int count) {
+        SysConfig config = configService.selectConfigByConfigKey("medicalMall.func.switch");
+        MedicalMallConfig medicalMallConfig = JSON.parseObject(config.getConfigValue(), MedicalMallConfig.class);
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", count);
         map.put("config", medicalMallConfig);
@@ -799,6 +800,8 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
 
     @Override
     public List<FsStoreProductListQueryVO> selectFsStoreProductHotQuery(int count) {
+        SysConfig config = configService.selectConfigByConfigKey("medicalMall.func.switch");
+        MedicalMallConfig medicalMallConfig = JSON.parseObject(config.getConfigValue(), MedicalMallConfig.class);
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", count);
         map.put("config", medicalMallConfig);

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

@@ -23,7 +23,7 @@ import java.util.List;
  * @date 2025-08-27
  */
 @RestController
-@RequestMapping("/store/app/user/complaint")
+//@RequestMapping("/store/app/user/complaint")
 public class FsUserComplaintScrmController extends AppBaseController
 {
     @Autowired

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

@@ -16,7 +16,7 @@ import java.util.List;
 
 @Api("看课投诉相关接口")
 @RestController
-@RequestMapping("/store/app/user/complaint")
+//@RequestMapping("/store/app/user/complaint")
 public class UserCourseComplaintScrmController extends AppBaseController {
 
     @Autowired