From 0ccd94c863ac71b46bff3cc15feabec53650738f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:23:52 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java
index 057f573..f3c3549 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java
@@ -1,14 +1,24 @@
package com.dsh.guns.modular.system.controller.code;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.feignClient.activity.HuiminAgreementClient;
+import com.dsh.course.feignClient.activity.model.HuiminAgreementQuery;
import com.dsh.course.feignClient.activity.model.THuiminAgreement;
+import com.dsh.course.feignClient.activity.model.THuiminAgreementSetting;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
+import com.dsh.guns.modular.system.model.TOperator;
+import com.dsh.guns.modular.system.service.TOperatorService;
+import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+import java.util.Objects;
/**
* 惠民卡控制器
@@ -24,6 +34,8 @@
@Autowired
private HuiminAgreementClient huiminAgreementClient;
+ @Autowired
+ private TOperatorService operatorService;
/**
* 跳转到惠民卡首页
@@ -31,15 +43,48 @@
@RequestMapping("")
public String index(Model model) {
Integer objectType = UserExt.getUser().getObjectType();
+ Integer operatorId = null;
+ if (objectType.equals(2)){
+ //查询运营商
+ TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>()
+ .eq("userId", UserExt.getUser().getId())
+ .ne("state", 3)
+ .last("LIMIT 1"));
+ if (Objects.nonNull(operator)) {
+ operatorId = operator.getId();
+ }
+ }
+ HuiminAgreementQuery huiminAgreementQuery = new HuiminAgreementQuery();
+ huiminAgreementQuery.setOperatorId(operatorId);
+ huiminAgreementQuery.setObjectType(objectType);
+ THuiminAgreement huiminAgreement = huiminAgreementClient.selectByObjectType(huiminAgreementQuery);
model.addAttribute("objectType", objectType);
+ model.addAttribute("item", huiminAgreement);
+ //查询运营商列表
+ 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";
}
@RequestMapping(value = "/save")
@ResponseBody
public Object save(THuiminAgreement tHuiminAgreement) {
+ tHuiminAgreement.setObjectType(UserExt.getUser().getObjectType());
+ String agreementSettings = tHuiminAgreement.getAgreementSettings();
+ List<THuiminAgreementSetting> tHuiminAgreementSettings = JSONArray.parseArray(agreementSettings, THuiminAgreementSetting.class);
+ tHuiminAgreement.setSettingList(tHuiminAgreementSettings);
huiminAgreementClient.insert(tHuiminAgreement);
return SUCCESS_TIP;
}
+ @RequestMapping(value = "/selectAgreementByOperationId")
+ @ResponseBody
+ public ResultUtil<THuiminAgreement> selectAgreementByOperationId(Integer operatorId) {
+ Integer objectType = UserExt.getUser().getObjectType();
+ HuiminAgreementQuery huiminAgreementQuery = new HuiminAgreementQuery();
+ huiminAgreementQuery.setOperatorId(operatorId);
+ huiminAgreementQuery.setObjectType(objectType);
+ THuiminAgreement huiminAgreement = huiminAgreementClient.selectByObjectType(huiminAgreementQuery);
+ return ResultUtil.success(huiminAgreement);
+ }
/*
*//**
* 跳转到修改惠民卡
--
Gitblit v1.7.1