10.16

nickchange

2023-10-16 ea2e322e4564a177b49ad38fda2d42780632ea0d

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

@@ -16,6 +16,7 @@
import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.TSite;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.model.dto.SelectDto;
import com.dsh.guns.modular.system.service.ICoursePackageService;
import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.service.ITSiteService;
@@ -417,7 +418,7 @@
    }

    /**
     * 跳转到优惠卷选择表页
     * 跳转到优惠券选择表页
     * @param model
     * @param id
     * @return
@@ -546,6 +547,16 @@
    }


    @GetMapping("/queryProvince")
    @ResponseBody
    public List<Map<String, Object>> queryProvince(){

        List<Map<String, Object>> list = storeService.queryProvince(null);

        return list;
    }


    /**
     * 跳转到审核详情页
     * @param model
@@ -613,6 +624,7 @@
    @ResponseBody
    @PostMapping("/queryCity")
    public List<Map<String, Object>> queryCity(String code){

        Integer objectType = UserExt.getUser().getObjectType();
        Integer objectId = UserExt.getUser().getObjectId();
        String cityCode = null;
@@ -620,9 +632,33 @@
            CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
            cityCode = cityManager.getCityCode();
        }
        System.out.println("======="+storeService.queryCity(code, cityCode));
        return storeService.queryCity(code, cityCode);
    }


    @ResponseBody
    @PostMapping("/queryCity1/{code}")
    public ResultUtil queryCity1(@PathVariable("code") String code){
        Integer objectType = UserExt.getUser().getObjectType();
        Integer objectId = UserExt.getUser().getObjectId();
        String cityCode = null;
        if(objectType == 2){//城市管理员
            CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
            cityCode = cityManager.getCityCode();
        }
        System.out.println("======="+storeService.queryCity(code, cityCode));
//        return storeService.queryCity(code, cityCode);
        return new ResultUtil(0,null,null,storeService.queryCity(code, cityCode),null);
    }


    @ResponseBody
    @PostMapping("/queryCity1/")
    public ResultUtil queryCity2(){

        return new ResultUtil(0,null,null,null,null);
    }

    /**
     * 根据城市code获取门店
@@ -633,8 +669,49 @@
    @PostMapping("/queryStore")
    public List<TStore> queryStore(String cityCode){
        List<TStore> list = storeService.list(new QueryWrapper<TStore>().eq("cityCode", cityCode).eq("state", 1));
        System.out.println("====list="+list);
        return list;
    }


    @ResponseBody
    @PostMapping("/queryStore1/{cityCode}")
    public ResultUtil queryStore1(@PathVariable("cityCode") String cityCode){
        List<TStore> list = storeService.list(new QueryWrapper<TStore>().select("id","name").eq("cityCode", cityCode).eq("state", 1));
//        Map<String,Integer> map = new LinkedHashMap<>();
        List<SelectDto>  selectDtos = new ArrayList<>();
        Map<String,Integer> map = new HashMap<>();
//        for (TStore store : list) {
//            SelectDto selectDto = new SelectDto();
//            selectDto.setId(Long.valueOf(store.getId()));
//            selectDto.setValue(store.getName());
//               selectDtos.add(selectDto);
//
//        }
//        map.put("options",selectDtos);

        return new ResultUtil(0,0,null,list,null);
    }

    @ResponseBody
    @PostMapping("/queryStore1/")
    public ResultUtil queryStore2(){
//        List<TStore> list = storeService.list(new QueryWrapper<TStore>().select("id","name").eq("cityCode", cityCode).eq("state", 1));
////        Map<String,Integer> map = new LinkedHashMap<>();
//        List<SelectDto>  selectDtos = new ArrayList<>();
//        Map<String,Integer> map = new HashMap<>();
////        for (TStore store : list) {
//            SelectDto selectDto = new SelectDto();
//            selectDto.setId(Long.valueOf(store.getId()));
//            selectDto.setValue(store.getName());
//               selectDtos.add(selectDto);
//
//        }
//        map.put("options",selectDtos);

        return new ResultUtil(0,0,null,null,null);
    }


    /**
     * 根据门店id获取场地
@@ -642,12 +719,19 @@
     * @return
     */
    @ResponseBody
    @PostMapping("/querySite")
    public List<TSite> querySite(Integer storeId){
        List<TSite> list = siteService.list(new QueryWrapper<TSite>().eq("storeId", storeId).eq("state", 1));
    @PostMapping("/querySite/{id}")
    public List<TSite> querySite(@PathVariable("id") Integer storeId){
        System.out.println("==storeId==="+storeId);
        List<TSite> list = siteService.list(new QueryWrapper<TSite>().select("id","name").eq("storeId", storeId).eq("state", 1));
        return list;
    }


    @ResponseBody
    @PostMapping("/querySite/")
    public ResultUtil querySite1(){
         return new ResultUtil(0,0,null,null,null);
    }
    /**
     * 获取城市教练
     * @param cityCode
@@ -752,6 +836,9 @@
        coursePackage.setStatus(1);
        coursePackage.setState(1);
        coursePackage.setInsertTime(new Date());
        // 详情多图片
        String substring = coursePackage.getDetailDrawing().substring(0, coursePackage.getDetailDrawing().length() - 1);
        coursePackage.setDetailDrawing(substring);
        coursePackageService.addCoursePackage(coursePackage, coursePackagePaymentConfig);
        return ResultUtil.success();
    }
@@ -779,8 +866,10 @@

            String jsonString = jsonArray.getString(i);
            String[] split = jsonString.split("-");
            System.out.println("============"+split);
            if (split.length>1){
            first.add(split[0]);
            second.add(split[1]);
            second.add(split[1]);}

        }
        String firstString = String.join(",",first);