From 7fa7302550e8dfba383634e4f13161e451667fe6 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 08 Jan 2024 17:10:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
index 7a6d211..91429c5 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
@@ -16,10 +16,16 @@
*/
package org.springblade.modules.property.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.pro.packaged.D;
import liquibase.pro.packaged.P;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.modules.pay.entity.AliPayInfo;
+import org.springblade.modules.pay.entity.WxPayInfo;
+import org.springblade.modules.pay.service.IAliPayService;
+import org.springblade.modules.pay.service.IWxPayService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.vo.PropertyCompanyDetailVO;
import org.springblade.modules.property.vo.PropertyCompanyVO;
@@ -47,6 +53,11 @@
@Autowired
private IDeptService deptService;
+ @Autowired
+ private IWxPayService wxPayService;
+
+ @Autowired
+ private IAliPayService aliPayService;
/**
* 自定义分页
*
@@ -137,4 +148,30 @@
public PropertyCompanyDetailVO getDetail(PropertyCompanyVO propertyCompany) {
return baseMapper.getDetail(propertyCompany);
}
+
+ @Override
+ public Boolean payConfig(WxPayInfo wxPayInfo, AliPayInfo aliPayInfo) {
+ boolean wx = wxPayService.saveOrUpdate(wxPayInfo);
+ boolean ali = aliPayService.saveOrUpdate(aliPayInfo);
+ return wx&&ali;
+ }
+
+ @Override
+ public PropertyCompanyDetailVO getPayConfig(PropertyCompanyVO propertyCompany) {
+
+
+ PropertyCompanyDetailVO detail = this.getDetail(propertyCompany);
+
+
+
+ AliPayInfo pA = new AliPayInfo();
+ pA.setPropertyCompanyId(detail.getId().toString());
+ detail.setAliPayInfo(aliPayService.getOne(Condition.getQueryWrapper(pA)));
+
+ WxPayInfo pW = new WxPayInfo();
+ pW.setPropertyCompanyId(detail.getId().toString());
+ detail.setWxPayInfo(wxPayService.getOne(Condition.getQueryWrapper(pW)));
+
+ return detail;
+ }
}
--
Gitblit v1.9.3