From 4e85cf00c3a77b7165f4d349da21e94b2b528909 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 10:05:41 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java | 70 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 34 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 f835ca2..9ce9182 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
@@ -55,7 +55,7 @@
//查询协议配置
List<THuiminAgreementSetting> tHuiminAgreementSettingList = huiminAgreementSettingService.list(new LambdaQueryWrapper<THuiminAgreementSetting>()
.eq(THuiminAgreementSetting::getAgreementId, huiminAgreement.getId()));
- huiminAgreement.setTHuiminAgreementSettingList(tHuiminAgreementSettingList);
+ huiminAgreement.setSettingList(tHuiminAgreementSettingList);
}
return huiminAgreement;
}
@@ -67,40 +67,42 @@
@Transactional(rollbackFor = Exception.class)
public void insert(@RequestBody THuiminAgreement tHuiminAgreement){
Integer operatorId = tHuiminAgreement.getOperatorId();
- if (tHuiminAgreement.getObjectType().equals(1)) {
- tHuiminAgreement.setOperatorId(null);
- }
- huiminAgreementService.saveOrUpdate(tHuiminAgreement);
- List<THuiminAgreementSetting> tHuiminAgreementSettingList = tHuiminAgreement.getTHuiminAgreementSettingList();
- if (CollUtil.isNotEmpty(tHuiminAgreementSettingList)) {
- if (tHuiminAgreement.getObjectType().equals(2) || tHuiminAgreement.getObjectType().equals(1) && Objects.isNull(operatorId)) {
- //删除之前的协议配置
- huiminAgreementSettingService.remove(new LambdaQueryWrapper<THuiminAgreementSetting>().eq(THuiminAgreementSetting::getAgreementId, tHuiminAgreement.getId()));
- //保存协议配置
- tHuiminAgreementSettingList.forEach(t -> {
- t.setAgreementId(tHuiminAgreement.getId());
- });
- huiminAgreementSettingService.saveBatch(tHuiminAgreementSettingList);
- } else {
- THuiminAgreement agreement = huiminAgreementService.lambdaQuery()
- .eq(THuiminAgreement::getOperatorId, operatorId)
- .last("LIMIT 1").one();
- if (Objects.isNull(agreement)) {
- agreement = new THuiminAgreement();
- agreement.setOperatorId(operatorId);
- huiminAgreementService.save(agreement);
- }
- //删除之前的协议配置
- huiminAgreementSettingService.remove(new LambdaQueryWrapper<THuiminAgreementSetting>()
- .eq(THuiminAgreementSetting::getAgreementId, agreement.getId()));
- //保存协议配置
- THuiminAgreement finalAgreement = agreement;
- tHuiminAgreementSettingList.forEach(t -> {
- t.setAgreementId(finalAgreement.getId());
- });
- huiminAgreementSettingService.saveBatch(tHuiminAgreementSettingList);
+ //如果是平台账号，需要设置operatorId为null
+ List<THuiminAgreementSetting> tHuiminAgreementSettingList = tHuiminAgreement.getSettingList();
+ //如果是运营商账号或平台账号默认配置
+ if (tHuiminAgreement.getObjectType().equals(2) || tHuiminAgreement.getObjectType().equals(1) && Objects.isNull(operatorId)) {
+ if (tHuiminAgreement.getObjectType().equals(1)) {
+ tHuiminAgreement.setOperatorId(null);
}
-
+ huiminAgreementService.saveOrUpdate(tHuiminAgreement);
+ //删除之前的协议配置
+ huiminAgreementSettingService.remove(new LambdaQueryWrapper<THuiminAgreementSetting>().eq(THuiminAgreementSetting::getAgreementId, tHuiminAgreement.getId()));
+ //保存协议配置
+ tHuiminAgreementSettingList.forEach(t -> {
+ t.setAgreementId(tHuiminAgreement.getId());
+ });
+ } else {
+ //平台配置运营商的协议配置
+ THuiminAgreement agreement = huiminAgreementService.lambdaQuery()
+ .eq(THuiminAgreement::getOperatorId, operatorId)
+ .last("LIMIT 1").one();
+ if (Objects.isNull(agreement)) {
+ agreement = new THuiminAgreement();
+ agreement.setOperatorId(operatorId);
+ }
+ agreement.setStoreNoHuiminCardIntro(tHuiminAgreement.getStoreNoHuiminCardIntro());
+ huiminAgreementService.saveOrUpdate(agreement);
+ //删除之前的协议配置
+ huiminAgreementSettingService.remove(new LambdaQueryWrapper<THuiminAgreementSetting>()
+ .eq(THuiminAgreementSetting::getAgreementId, agreement.getId()));
+ //保存协议配置
+ THuiminAgreement finalAgreement = agreement;
+ tHuiminAgreementSettingList.forEach(t -> {
+ t.setAgreementId(finalAgreement.getId());
+ });
+ }
+ if (CollUtil.isNotEmpty(tHuiminAgreementSettingList)) {
+ huiminAgreementSettingService.saveBatch(tHuiminAgreementSettingList);
}
}
}
--
Gitblit v1.7.1