Merge remote-tracking branch 'origin/master'

44323

2023-09-05 63b6d78b7f906d7464eca710695bef600772651d

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java

@@ -11,6 +11,8 @@
import com.dsh.course.feignClient.account.model.TCityManager;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.competition.model.*;
import com.dsh.course.feignClient.course.CourseClient;
import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.course.mapper.UserMapper;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.SuccessTip;
@@ -32,6 +34,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
@@ -59,6 +62,9 @@

    @Resource
    private UserMapper userMapper;

    @Autowired
    private CourseClient courseClient;


    /**
@@ -182,6 +188,38 @@
            return ERROR;
        }
    }
    @RequestMapping(value = "/storeChange")
    @ResponseBody
    public Object storeChange(Integer oneId) {
        try {
            return storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getCityCode, oneId));
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }
    @RequestMapping(value = "/packageChange")
    @ResponseBody
    public Object packageChange(Integer oneId) {
        try {
            List<TCoursePackage> list = courseClient.queryByTypeId(oneId);
            return list;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }
    @RequestMapping(value = "/timeChange")
    @ResponseBody
    public Object timeChange(Integer oneId) {
        try {
            List<Map<String,Object>> list = courseClient.queryByConfigId(oneId);
            return list;
        }catch (Exception e){
            e.printStackTrace();
            return ERROR;
        }
    }


    @RequestMapping(value = "/cancel")