From b716afd262ff60ff1db0b1e7c95800e7ad2b7202 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 07 七月 2025 11:07:37 +0800
Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 34f362a..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
*/
@@ -63,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();
@@ -76,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