修改bug

liujie

2023-10-17 a1e4cfc3de4f3f3f3956b769bc7af40d097c8a4c

 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;
@@ -66,7 +62,14 @@
    @Autowired
    private CityManagerClient cityManagerClient;


    /**
     * 获取所有场地
     */
    @RequestMapping("/base/site/getList")
    @ResponseBody
    public List<Site> getList(){
        return siteService.list(new QueryWrapper<Site>().ne("state",3));
    }
    /**
     * 获取场地预约记录
     */
@@ -106,15 +109,43 @@
     * @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();
        }
    }


    /**
     * 添加场地管理
     * @return
     */
    @RequestMapping("/base/site/addSiteBooking")
    public Object addSiteBooking(@RequestBody SiteBooking siteBooking){
        if(siteBooking.getId()!= null ){

            return siteBookingService.updateById(siteBooking);
        }else {
            return siteBookingService.save(siteBooking);
        }
    }

    @RequestMapping("/base/site/listById")
    public Site listById(@RequestParam("id") Integer id){
        Site byId = siteService.getById(id);
        return byId;
    }


    @RequestMapping("/base/site/listBooks")
    public  List<SiteBooking> listBooks(@RequestParam("id") Integer id){
        List<SiteBooking> siteId = siteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id));
        return siteId;
    }
    @ResponseBody
    @PostMapping("/base/site/querySiteType")
    @ApiOperation(value = "获取场地类型", tags = {"用户—预约场地"})
@@ -486,6 +517,32 @@


    @ResponseBody
    @PostMapping("/base/site/queryByCode")
    public Integer queryByCode(@RequestBody String code){

        return siteBookingService.queryByCode(code);
    }


    @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(){
        List<SiteVo> siteVos = new ArrayList<>();