Merge remote-tracking branch 'origin/master'

nickchange

2023-11-15 951f90b82993acc835cdf58a9f1f39aeecd86674

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

@@ -321,6 +321,14 @@
        return regiService.list(new LambdaQueryWrapper<Region>()
                .eq(Region::getParentId,province));
    }
    @RequestMapping(value = "/getCity1")
    @ResponseBody
    public Object getCity1(String province){
        // 获取省的id
        Integer code = regiService.getOne(new QueryWrapper<Region>().eq("code", province)).getId();
        return regiService.list(new LambdaQueryWrapper<Region>()
                .eq(Region::getParentId,code));
    }
    // 通过市 获取运营商
    @RequestMapping(value = "/getOperator")
    @ResponseBody
@@ -370,14 +378,14 @@
        Integer objectType = UserExt.getUser().getObjectType();
        dataVo.setUserType(objectType);
        dataVo.setCityManagerId(UserExt.getUser().getObjectId());
        if(UserExt.getUser().getObjectType()==3){
        if(UserExt.getUser().getObjectType()==2){
            dataVo.setCompany(3);
            dataVo.setUserType(2);
        }else if(UserExt.getUser().getObjectType()==3){
            dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
            dataVo.setCompany(3);
        }
        dataVo.setObjType(UserExt.getUser().getObjectType());
        if(UserExt.getUser().getObjectType()==3){
            dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
            dataVo.setCompany(3);
        }else{
            dataVo.setUserType(1);
        }
        dataVo.setObjType(UserExt.getUser().getObjectType());
        client.insertIntoData(dataVo);