优化 结束/开启第一轮、第二轮接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dealer/DealerRoundController.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.dealer.domain.dto.TurnRoundInfoReq;
 import com.ruoyi.dealer.service.DealerRoundInfoService;
 import com.ruoyi.dealer.service.IDealerRoundResultService;
 import com.ruoyi.system.domain.SysConfig;
@@ -27,9 +28,9 @@ public class DealerRoundController extends BaseController {
     private IDealerRoundResultService resultService;
 
     @Log(title = "结束第一轮次或者第二轮次", businessType = BusinessType.INSERT)
-    @GetMapping(value = "/end")
-    public AjaxResult endRoundInfo() {
-        List<SysConfig> sysConfigs = dealerRoundInfoService.endRound();
+    @GetMapping(value = "/turnRound")
+    public AjaxResult turnRoundInfo(@RequestBody TurnRoundInfoReq turnRoundInfoReq) {
+        List<SysConfig> sysConfigs = dealerRoundInfoService.turnRoundInfo(turnRoundInfoReq);
         return AjaxResult.success(sysConfigs);
     }
 

ruoyi-system/src/main/java/com/ruoyi/dealer/domain/dto/RoundInfoDto.java → ruoyi-system/src/main/java/com/ruoyi/dealer/domain/dto/TurnRoundInfoReq.java

@@ -3,8 +3,8 @@ package com.ruoyi.dealer.domain.dto;
 import lombok.Data;
 
 @Data
-public class RoundInfoDto {
+public class TurnRoundInfoReq {
     private Integer roundTime;
-    // private String reward;
+     private Boolean roundOver;
 
 }

ruoyi-system/src/main/java/com/ruoyi/dealer/service/DealerRoundInfoService.java

@@ -3,6 +3,7 @@ package com.ruoyi.dealer.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.dealer.domain.dto.DealerBigScreenDynamicRes;
 import com.ruoyi.dealer.domain.dto.DealerRoundInfo;
+import com.ruoyi.dealer.domain.dto.TurnRoundInfoReq;
 import com.ruoyi.dealer.domain.dto.WechatDealerRoundInfoReq;
 import com.ruoyi.system.domain.SysConfig;
 
@@ -21,5 +22,5 @@ public interface DealerRoundInfoService extends IService<DealerRoundInfo> {
 
     List<DealerBigScreenDynamicRes> dynamicList(Integer roundId);
 
-    List<SysConfig> endRound();
+    List<SysConfig> turnRoundInfo(TurnRoundInfoReq turnRoundInfoReq);
 }

ruoyi-system/src/main/java/com/ruoyi/dealer/service/impl/DealerRoundInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.dealer.domain.DealerBaseInfo;
 import com.ruoyi.dealer.domain.DealerRoundResult;
 import com.ruoyi.dealer.domain.dto.DealerBigScreenDynamicRes;
 import com.ruoyi.dealer.domain.dto.DealerRoundInfo;
+import com.ruoyi.dealer.domain.dto.TurnRoundInfoReq;
 import com.ruoyi.dealer.domain.dto.WechatDealerRoundInfoReq;
 import com.ruoyi.dealer.mapper.DealerRoundInfoMapper;
 import com.ruoyi.dealer.service.DealerRoundInfoService;
@@ -150,16 +151,18 @@ public class DealerRoundInfoServiceImpl extends ServiceImpl<DealerRoundInfoMappe
     }
 
     @Override
-    public List<SysConfig> endRound() {
-        SysConfig sysConfig = configService.selectConfigObjByKey(Constants.DEALER_ROUND_OVER);
-        sysConfig.setConfigValue("true");
-        configService.updateConfig(sysConfig);
+    public List<SysConfig> turnRoundInfo(TurnRoundInfoReq turnRoundInfoReq) {
+        SysConfig sysConfigRoundOver = configService.selectConfigObjByKey(Constants.DEALER_ROUND_OVER);
+        sysConfigRoundOver.setConfigValue(turnRoundInfoReq.getRoundOver().toString());
+        configService.updateConfig(sysConfigRoundOver);
 
         SysConfig sysConfigRound = configService.selectConfigObjByKey(Constants.DEALER_ROUND);
+        sysConfigRound.setConfigValue(turnRoundInfoReq.getRoundTime().toString());
+        configService.updateConfig(sysConfigRound);
 
         List<SysConfig> list = new ArrayList<>();
         list.add(sysConfigRound);
-        list.add(sysConfig);
+        list.add(sysConfigRoundOver);
         return list;
     }