bug修改

无关风月

2025-05-08 9486766c806fe1d9e082b2fd02ea1cc558f1b443

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

@@ -21,7 +21,7 @@
import java.util.Objects;

/**
 * 惠民卡控制器
 * 玩湃惠民卡控制器
 *
 * @author fengshuonan
 * @Date 2025-03-29 17:40:11
@@ -38,7 +38,7 @@
    private TOperatorService operatorService;

    /**
     * 跳转到惠民卡首页
     * 跳转到玩湃惠民卡首页
     */
    @RequestMapping("")
    public String index(Model model) {
@@ -60,9 +60,8 @@
        THuiminAgreement huiminAgreement = huiminAgreementClient.selectByObjectType(huiminAgreementQuery);
        model.addAttribute("objectType", objectType);
        model.addAttribute("item", huiminAgreement);
        model.addAttribute("tHuiminAgreementSettingList", Objects.nonNull(huiminAgreement) ? JSONArray.toJSONString(huiminAgreement.getTHuiminAgreementSettingList()) : "");
        //查询运营商列表
        model.addAttribute("operatorList", operatorService.list(new QueryWrapper<TOperator>().eq("state", 1)));
        model.addAttribute("operatorList", operatorService.list(new QueryWrapper<TOperator>().eq(Objects.nonNull(operatorId), "id",operatorId).eq("state", 1)));
        model.addAttribute("operatorId", operatorId);
        return PREFIX + "tHuiminAgreement_add.html";
    }
@@ -70,29 +69,23 @@
    @ResponseBody
    public Object save(THuiminAgreement tHuiminAgreement) {
        tHuiminAgreement.setObjectType(UserExt.getUser().getObjectType());
        String agreementSettings = tHuiminAgreement.getAgreementSettings();
        List<THuiminAgreementSetting> tHuiminAgreementSettings = JSONArray.parseArray(agreementSettings, THuiminAgreementSetting.class);
        tHuiminAgreement.setTHuiminAgreementSettingList(tHuiminAgreementSettings);

        huiminAgreementClient.insert(tHuiminAgreement);
        return SUCCESS_TIP;
    }
    @RequestMapping(value = "/selectAgreementByOperationId")
    @ResponseBody
    public ResultUtil<String> selectAgreementByOperationId(Integer operatorId) {
        String tHuiminAgreementSettings = "";
    public ResultUtil<THuiminAgreement> selectAgreementByOperationId(Integer operatorId) {
        Integer objectType = UserExt.getUser().getObjectType();
        HuiminAgreementQuery huiminAgreementQuery = new HuiminAgreementQuery();
        huiminAgreementQuery.setOperatorId(operatorId);
        huiminAgreementQuery.setObjectType(Objects.isNull(operatorId) ? 1 : 2);
        huiminAgreementQuery.setObjectType(objectType);
        THuiminAgreement huiminAgreement = huiminAgreementClient.selectByObjectType(huiminAgreementQuery);
        if (Objects.nonNull(huiminAgreement)) {
            //查询协议配置
            tHuiminAgreementSettings = JSONArray.toJSONString(huiminAgreement.getTHuiminAgreementSettingList());
        }
        return ResultUtil.success(tHuiminAgreementSettings);
        return ResultUtil.success(huiminAgreement);
    }
/*
    *//**
     * 跳转到修改惠民卡
     * 跳转到修改玩湃惠民卡
     *//*
    @RequestMapping("/tHuiminAgreement_update/{tHuiminAgreementId}")
    public String tHuiminAgreementUpdate(@PathVariable Integer tHuiminAgreementId, Model model) {
@@ -103,7 +96,7 @@
    }

    *//**
     * 获取惠民卡列表
     * 获取玩湃惠民卡列表
     *//*
    @RequestMapping(value = "/list")
    @ResponseBody
@@ -112,7 +105,7 @@
    }

    *//**
     * 新增惠民卡
     * 新增玩湃惠民卡
     *//*
    @RequestMapping(value = "/add")
    @ResponseBody
@@ -122,7 +115,7 @@
    }

    *//**
     * 删除惠民卡
     * 删除玩湃惠民卡
     *//*
    @RequestMapping(value = "/delete")
    @ResponseBody
@@ -132,7 +125,7 @@
    }

    *//**
     * 修改惠民卡
     * 修改玩湃惠民卡
     *//*
    @RequestMapping(value = "/update")
    @ResponseBody
@@ -142,7 +135,7 @@
    }

    *//**
     * 惠民卡详情
     * 玩湃惠民卡详情
     *//*
    @RequestMapping(value = "/detail/{tHuiminAgreementId}")
    @ResponseBody