From d46ca134f82fd106bfbbbd71aef7184805e6d7e7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 09:17:54 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 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 3a08b29..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,11 +16,18 @@
*/
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;
import org.springblade.modules.property.mapper.PropertyCompanyMapper;
import org.springblade.modules.property.service.IPropertyCompanyService;
@@ -46,6 +53,11 @@
@Autowired
private IDeptService deptService;
+ @Autowired
+ private IWxPayService wxPayService;
+
+ @Autowired
+ private IAliPayService aliPayService;
/**
* 自定义分页
*
@@ -121,4 +133,45 @@
// 删除机构,删除物业公司
return removeByIds(toIntList) && deptService.removeByIds(deptIds);
}
+
+ @Override
+ public PropertyCompanyVO getUserCompayDistrict(String houseCode) {
+ return baseMapper.getUserCompayDistrict(houseCode);
+ }
+
+ /**
+ * 物业公司 自定义详情查询
+ * @param propertyCompany
+ * @return
+ */
+ @Override
+ 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