修改bug

puzhibing

2024-03-21 b1069cdbce2086877055c32a19a0ab51b29331a8

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

@@ -13,6 +13,7 @@
import com.dsh.course.feignClient.account.model.CoachSerchVO;
import com.dsh.course.feignClient.course.*;
import com.dsh.course.feignClient.course.model.*;
import com.dsh.course.feignClient.other.BallClient;
import com.dsh.course.feignClient.other.model.Site;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
@@ -289,6 +290,12 @@
            System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
//        model.addAttribute("couponIds", "3,2");
        }


           Integer able  =  coursePackageClient.queryAble(id);

        model.addAttribute("able",able);

        return PREFIX + "coursePackage_edit.html";
    }

@@ -387,6 +394,7 @@
            System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
//        model.addAttribute("couponIds", "3,2");
        }

        return PREFIX + "coursePackage_info.html";
    }

@@ -425,6 +433,39 @@
        }
        model.addAttribute("role",UserExt.getUser().getObjectType());
        model.addAttribute("type",tCoursePackage.getType());
        List<TCoursePackageDiscount> tCoursePackageDiscounts = coursePackageDiscountClient.queryByCoursePackageId1(tCoursePackage.getId());
        if (tCoursePackageDiscounts.size()>0){
            TCoursePackageDiscount tCoursePackageDiscount = tCoursePackageDiscounts.get(0);
            model.addAttribute("audit",tCoursePackageDiscount.getAuditStatus());
            StringBuilder stringBuilder = new StringBuilder(" ");
            // 如果折扣未通过
            if (tCoursePackageDiscount.getAuditStatus() == 3){
                model.addAttribute("state","未通过");
                for (TCoursePackageDiscount coursePackageDiscount : tCoursePackageDiscounts) {
                    stringBuilder.append(coursePackageDiscount.getAuditRemark()+",");
                }
                if (!stringBuilder.equals("")){
                    String string = stringBuilder.toString();
                    String substring = string.substring(0, string.length() - 1);
                    model.addAttribute("reasons",substring);
                }else{
                    model.addAttribute("reasons",stringBuilder);
                }
            }else{
                model.addAttribute("reasons",stringBuilder);
            }
            if(tCoursePackageDiscount.getAuditStatus() == 2){
                model.addAttribute("state","已通过");
            }
            if (tCoursePackageDiscount.getAuditStatus() == 1){
                model.addAttribute("state","待审核");
            }
        }else{
            model.addAttribute("audit",2);
            model.addAttribute("state",0);
            model.addAttribute("reasons","");
        }

        model.addAttribute("coursePackagePaymentConfig", JSON.toJSONString(list));
        return PREFIX + "coursePackageDiscount.html";
    }
@@ -709,7 +750,7 @@
//            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);
    }
@@ -731,6 +772,14 @@
        return new ResultUtil(0,null,null,null,null);
    }


    @ResponseBody
    @PostMapping("/queryStore1//{id}")
    public ResultUtil queryCity6(){

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

    /**
     * 根据城市code获取门店
     * @param cityCode
@@ -746,9 +795,30 @@


    @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));
    @PostMapping("/queryStore1/{cityCode}/{$operationId}")
    public ResultUtil queryStore1(@PathVariable("cityCode") String cityCode,
                                  @PathVariable("$operationId") String operationId){
        Integer operatorId= 0;
        Integer type= 0;
        if (operationId.equals("平台")){
            type = 1;
            operatorId = null;
        }else{
            operatorId = Integer.valueOf(operationId);
            type = 2;
        }
        QueryWrapper<TStore> wrapper = new QueryWrapper<>();
        wrapper.select("id","name");
        wrapper.eq("cityCode", cityCode);
        wrapper.eq("state", 1);
        wrapper.eq("type", type);
        if (type!=1){
            // 如果不是勾选的平台 是选择的运营商 那么筛选运营商id
            wrapper.eq("operatorId",operatorId);
        }
        List<TStore> list = storeService.list(
                wrapper
        );
//        Map<String,Integer> map = new LinkedHashMap<>();
        List<SelectDto>  selectDtos = new ArrayList<>();
        Map<String,Integer> map = new HashMap<>();
@@ -814,6 +884,62 @@
    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;
    }
    /**
     * 根据门店id获取场地(智慧球场添加使用 过滤掉已经添加过的场地)
     * @param storeId
     * @return
     */
    @Autowired
    private BallClient ballClient;

    @ResponseBody
    @PostMapping("/querySite3/{id}")
    public List<Site> querySite3(@PathVariable("id") Integer storeId){

        return ballClient.getSiteList(storeId);
    }
    @ResponseBody
    @PostMapping("/querySite3/")
    public Object querySite3(){

        return new ResultUtil(0,0,null,null,null);
    }
    /**
     * 根据门店id获取场地(智慧球场编辑使用 过滤掉已经添加过的场地 包含当前的场地)
     * @param storeId
     * @return
     */
    @ResponseBody
    @PostMapping("/querySite5/{id}")
    public List<Site> querySite5(@PathVariable("id") Integer storeId){

        return ballClient.getSiteList1(storeId);
    }
    /**
     * 根据门店id获取场地
     * @param storeId
     * @return
     */
    @ResponseBody
    @PostMapping("/querySite1")
    public List<TSite> querySite1(Integer storeId,Integer type){
        List<TSite> list = new ArrayList<>();
        if (type==1){
            list = siteService.list(new QueryWrapper<TSite>()
                    .select("id","name")
                    .eq("storeId", storeId)
                    .eq("state", 1)
                    .eq("ishalf",type));
        }else{
            list = siteService.list(new QueryWrapper<TSite>()
                    .select("id","name")
                    .eq("storeId", storeId)
                    .eq("state", 1)
                    );
        }

        return list;
    }

@@ -999,16 +1125,17 @@
    @ResponseBody
    @PostMapping("/updateCoursePackage")
    public ResultUtil updateCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig){

//        System.out.println("=======getClassStartTime============"+classStartTime);
        String startTime = coursePackage.getClassStartTime();
        JSONArray jsonArray = JSON.parseArray(startTime);
        String s = startTime.replaceAll(" ", "");

        JSONArray jsonArray = JSON.parseArray(s);
        System.out.println("=======jsonArray==========="+jsonArray);

        List<String> first = new ArrayList<>();
        List<String> second = new ArrayList<>();
        for (int i = 0; i < jsonArray.size(); i++) {
//            JSONObject jsonObject = JSON.parseObject(jsonArray.getString(i));
//          JSONObject jsonObject = JSON.parseObject(jsonArray.getString(i));

            String jsonString = jsonArray.getString(i);
            String[] split = jsonString.split("-");
@@ -1060,7 +1187,7 @@
    public ResultUtil editCoursePackageState1(Integer id, Integer state){
        TCoursePackage coursePackage = new TCoursePackage();
        coursePackage.setId(id);
        coursePackage.setStatus(state);
        coursePackage.setState(state);
        coursePackageService.editCoursePackageState(coursePackage);
        return ResultUtil.success();
    }
@@ -1232,7 +1359,7 @@
     */
    @ResponseBody
    @PostMapping("/makeUpMissedLessons")
    public ResultUtil makeUpMissedLessons(Long id){
    public ResultUtil makeUpMissedLessons(Integer id){
        System.out.println("==========coursePackage补课PaymentId======"+id);
        return coursePackageService.makeUpMissedLessons(id);
    }