更新bug修改

puzhibing

2024-02-05 640ff18d2d7f4be02ddb7f8f75e899f05545eb98

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

@@ -199,17 +199,21 @@
                String cityName = (String) stringObjectMap.get("city");
                stringObjectMap.put("provinceCity",provinceName+cityName);
                Integer managerId = (Integer) stringObjectMap.get("operatorId");
                if (managerId==0){
                if (managerId == null){
                    stringObjectMap.put("accountName","平台");
                }else{
                    TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
                    if (ToolUtil.isNotEmpty(operator)){
                        stringObjectMap.put("accountName",operator.getName());
                    }else{
                    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","平台");
                        }
                    }
                }


            }
        }
@@ -238,6 +242,9 @@
            ofSearch.setStoreIds(storeIds);
            ofSearch.setObjType(UserExt.getUser().getObjectType());
            ofSearch.setOperatorId(UserExt.getUser().getObjectId());
            // 查询当前门店属于哪个运营商
            List<TOperatorCity> operatorId = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", UserExt.getUser().getObjectId()));
            ofSearch.setOperatorCities(operatorId);
        }
        if (UserExt.getUser().getObjectType()==3) {
            ofSearch.setStoreId(UserExt.getUser().getObjectId());
@@ -245,9 +252,13 @@
        }
        // 运营商可以查看平台添加的优惠券应只展示使用范围为全国通用、
        // 指定城市有运营商管辖的、指定门店有运营商旗下门店
        List<Map<String, Object>> couponListOfSearch = client.getCouponListOfSearch(ofSearch);

        return client.getCouponListOfSearch(ofSearch);
        return couponListOfSearch;
    }
    /**
     * 根据运营商ID 获取运营商管理的省市
     */

    /**
     * 获取 优惠券管理
@@ -266,6 +277,8 @@
        ofSearch.setState(state);
        ofSearch.setCityCode(cityCode);
        ofSearch.setStoreId(storeId);
        ofSearch.setObjType(UserExt.getUser().getObjectType());
        ofSearch.setOperatorId(UserExt.getUser().getObjectId());
        return client.getCouponListOfSearch1(ofSearch);
    }

@@ -381,9 +394,11 @@
        if(UserExt.getUser().getObjectType()==2){
            dataVo.setCompany(3);
            dataVo.setUserType(2);
            dataVo.setCityManagerId(UserExt.getUser().getObjectId());
        }else if(UserExt.getUser().getObjectType()==3){
            dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
            dataVo.setCompany(3);
            dataVo.setUserType(3);
        }else{
            dataVo.setUserType(1);
        }