10.12

44323

2023-10-11 232d3efb20f87f9c60faeda7bae4bc96e5687bd3

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

@@ -85,7 +85,7 @@
        Integer objectType = UserExt.getUser().getObjectType();
        System.out.println(objectType);
        model.addAttribute("userType",objectType);
        return PREFIX + "TQuestionAdd.html";
        return PREFIX + "TCouponAdd.html";
    }

    @RequestMapping("/coupon_record/{id}")
@@ -173,31 +173,26 @@

    @RequestMapping("/storeDetailsOfSearch")
    @ResponseBody
    public Object listOfStore(Integer provinceId,Integer cityId,Integer operatorId,String storeName){
        String provinceCode = null;
        String cityCode = null;
        if (ToolUtil.isNotEmpty(provinceId)){
            Region provinceRegion = regiService.getById(provinceId);
            provinceCode = provinceRegion.getCode();
        }
        if (ToolUtil.isNotEmpty(cityId)){
            Region cityRegion = regiService.getById(cityId);
            cityCode = cityRegion.getCode();
        }
    public Object listOfStore(String provinceId,String cityId,Integer operatorId,String storeName){


        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        List<Map<String,Object>> storeList = storeService.queryListOfpage(provinceCode,cityCode,operatorId,storeName,page);
        List<Map<String,Object>> storeList = storeService.queryListOfpage(provinceId,cityId,operatorId,storeName,page);
        if (storeList.size() > 0 ){
            for (Map<String, Object> stringObjectMap : storeList) {
                String provinceName = (String) stringObjectMap.get("province");
                String cityName = (String) stringObjectMap.get("city");
                stringObjectMap.put("provinceCity",provinceName+cityName);
                Integer managerId = (Integer) stringObjectMap.get("operatorId");
                if (managerId==null){
                if (managerId==0){
                    stringObjectMap.put("accountName","平台");
                }else{
                    TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
                    if (ToolUtil.isNotEmpty(operator)){
                        stringObjectMap.put("accountName",operator.getName());
                    }else{
                        stringObjectMap.put("accountName","平台");

                    }
                }

@@ -241,8 +236,11 @@
        ofSearch.setState(state);
        ofSearch.setCityCode(cityCode);
        ofSearch.setStoreId(storeId);
        return client.getCouponListOfSearch(ofSearch);
        return client.getCouponListOfSearch1(ofSearch);
    }



    @RequestMapping(value = "/listRecord")
    @ResponseBody
    public Object listRecord(Integer id,String name, Integer type, String phone) {
@@ -296,10 +294,13 @@
    // 通过市 获取运营商
    @RequestMapping(value = "/getOperator")
    @ResponseBody
    public Object getOperator(Integer city){
    public Object getOperator(String city){
        List<TOperatorCity> name = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("name", city));
        List<Integer> collect = name.stream().map(TOperatorCity::getOperatorId)
                .collect(Collectors.toList());
        if (collect.size()==0){
            return new ArrayList<>();
        }
        return operatorService.list(new QueryWrapper<TOperator>().in("id",collect));
    }