10.18.1

nickchange

2023-10-18 92e2be60c2d92ab5c8524c76f97712cd9f66502d

 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java

@@ -5,9 +5,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.Site;
import com.dsh.other.entity.SiteBooking;
import com.dsh.other.entity.SiteType;
import com.dsh.other.entity.*;
import com.dsh.other.feignclient.account.CityManagerClient;
import com.dsh.other.feignclient.activity.UserCouponClient;
import com.dsh.other.feignclient.activity.model.QueryUserCouponByIdAndUserId;
@@ -19,9 +17,7 @@
import com.dsh.other.model.dto.siteDto.TSiteDTO;
import com.dsh.other.model.vo.siteVo.ExpireSiteSearchVO;
import com.dsh.other.model.vo.siteVo.SiteSearchVO;
import com.dsh.other.service.ISiteBookingService;
import com.dsh.other.service.ISiteService;
import com.dsh.other.service.ISiteTypeService;
import com.dsh.other.service.*;
import com.dsh.other.util.PayMoneyUtil;
import com.dsh.other.util.ResultUtil;
import com.dsh.other.util.TokenUtil;
@@ -113,12 +109,13 @@
     * @return
     */
    @RequestMapping("/base/site/addSite")
    public Object addSite(@RequestBody Site site){
    public Integer addSite(@RequestBody Site site){
        if(site.getId()!= null ){

            return siteService.updateById(site);
            siteService.updateById(site);
            return site.getId();
        }else {
            return siteService.save(site);
            boolean save = siteService.save(site);
            return site.getId();
        }
    }

@@ -208,10 +205,12 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "场地id", name = "id", dataType = "int", required = true),
            @ApiImplicitParam(value = "日期（2023-01-01）", name = "day", dataType = "string", required = true),
            @ApiImplicitParam(value = "选择场地的名称", name = "day", dataType = "string", required = true),
            @ApiImplicitParam(value = "半场名称", name = "day", dataType = "string", required = false)
    })
    public ResultUtil<List<QuerySiteTimes>> querySiteTimes(Integer id, String day){
    public ResultUtil<List<QuerySiteTimes>> querySiteTimes(Integer id, String day,String halfName,String siteName){
        try {
            List<QuerySiteTimes> list = siteService.querySiteTimes(id, day);
            List<QuerySiteTimes> list = siteService.querySiteTimes(id, day,halfName,siteName);
            return ResultUtil.success(list);
        }catch (Exception e){
            e.printStackTrace();
@@ -355,7 +354,11 @@
        try {
            HashMap<String, Object> map = new HashMap<>();
            SiteBooking byId = siteBookingService.getById(id);
            Integer storeId = byId.getStoreId();
            Store byId1 = service.getById(storeId);

            List<Integer> ids = getIds(byId.getSiteId());
            byId.setStorePhone(byId1.getPhone());
            map.put("data",byId);
            map.put("ids",ids);
            return ResultUtil.success(map);
@@ -527,13 +530,30 @@
    }


    @Autowired
   private StoreService service;

    @Autowired
    private IOperatorUserService operatorUserService;

    @ResponseBody
    @PostMapping("/base/site/queryOperator")
    public OperatorUser queryOperator(@RequestBody List<Integer> stores){

        Store one = service.getOne(new QueryWrapper<Store>().in("id", stores));
        OperatorUser o = operatorUserService.getById(one.getOperatorId());

        return o;
    }



    @ResponseBody
    @PostMapping("/base/site/getNewAddSiteList")
    public List<SiteVo> getAppUserSiteList(){
    public List<SiteVo> getAppUserSiteList(@RequestBody Integer storeId){
        List<SiteVo> siteVos = new ArrayList<>();

        List<Site> list = siteService.list(new QueryWrapper<Site>()
        List<Site> list = siteService.list(new QueryWrapper<Site>().eq("state",1).eq("storeId",storeId)
                .orderByDesc("insertTime"));
        if (list.size() > 0 ){
            for (Site site : list) {