From b27efc697f2f81e0d0f247a2708e58af52a5df9b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 23 十月 2025 15:14:33 +0800
Subject: [PATCH] bug修改,后台新增修改用户积分
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java
index 9ce9182..623b6ca 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java
@@ -1,6 +1,7 @@
package com.dsh.activity.controller;
import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dsh.activity.entity.THuiminAgreement;
import com.dsh.activity.entity.THuiminAgreementSetting;
@@ -33,7 +34,7 @@
private HuiminAgreementSettingService huiminAgreementSettingService;
/**
- * 根据当前用户类型查询惠民卡协议
+ * 根据当前用户类型查询玩湃惠民卡协议
* @param query
* @return
*/
@@ -41,11 +42,14 @@
@PostMapping("/base/tHuiminAgreement/selectByObjectType")
public THuiminAgreement selectByObjectType(@RequestBody HuiminAgreementQuery query) {
THuiminAgreement huiminAgreement = null;
- if (query.getObjectType().equals(1)) {
+ if (query.getObjectType().equals(1) && Objects.isNull(query.getOperatorId())) {
//平台
huiminAgreement = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
.isNull(THuiminAgreement::getOperatorId));
-
+ }else if (query.getObjectType().equals(1) && Objects.nonNull(query.getOperatorId())){
+ //平台
+ huiminAgreement = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
+ .eq(THuiminAgreement::getOperatorId, query.getOperatorId()));
}else if (query.getObjectType().equals(2)) {
//运营商
huiminAgreement = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
@@ -60,12 +64,15 @@
return huiminAgreement;
}
/**
- * 保存惠民卡协议
+ * 保存玩湃惠民卡协议
* @param tHuiminAgreement
*/
@PostMapping("/base/tHuiminAgreement/save")
@Transactional(rollbackFor = Exception.class)
public void insert(@RequestBody THuiminAgreement tHuiminAgreement){
+ String agreementSettings = tHuiminAgreement.getAgreementSettings();
+ List<THuiminAgreementSetting> tHuiminAgreementSettings = JSONArray.parseArray(agreementSettings, THuiminAgreementSetting.class);
+ tHuiminAgreement.setSettingList(tHuiminAgreementSettings);
Integer operatorId = tHuiminAgreement.getOperatorId();
//如果是平台账号，需要设置operatorId为null
List<THuiminAgreementSetting> tHuiminAgreementSettingList = tHuiminAgreement.getSettingList();
@@ -73,6 +80,9 @@
if (tHuiminAgreement.getObjectType().equals(2) || tHuiminAgreement.getObjectType().equals(1) && Objects.isNull(operatorId)) {
if (tHuiminAgreement.getObjectType().equals(1)) {
tHuiminAgreement.setOperatorId(null);
+ boolean remove = huiminAgreementService.remove(new LambdaQueryWrapper<THuiminAgreement>()
+ .isNull(THuiminAgreement::getOperatorId));
+
}
huiminAgreementService.saveOrUpdate(tHuiminAgreement);
//删除之前的协议配置
--
Gitblit v1.7.1