From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerV1InnerServiceSMOImpl.java | 76 +++++++++++++++++++++++++++++++++-----
1 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerV1InnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerV1InnerServiceSMOImpl.java
index 5ad2c63..4c90821 100644
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerV1InnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerV1InnerServiceSMOImpl.java
@@ -16,18 +16,28 @@
package com.java110.user.smo.impl;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.account.AccountDto;
+import com.java110.intf.acct.IAccountInnerServiceSMO;
+import com.java110.po.account.AccountPo;
import com.java110.user.dao.IOwnerV1ServiceDao;
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.dto.owner.OwnerDto;
import com.java110.po.owner.OwnerPo;
+import com.java110.utils.lock.DistributedLock;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 绫昏〃杩帮細 鏈嶅姟涔嬪墠璋冪敤鐨勬帴鍙ｅ疄鐜扮被锛屼笉瀵瑰鎻愪緵鎺ュ彛鑳藉姏 鍙敤浜庢帴鍙ｅ缓璋冪敤
@@ -43,28 +53,64 @@
@Autowired
private IOwnerV1ServiceDao ownerV1ServiceDaoImpl;
+ @Autowired
+ private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
@Override
- public int saveOwner(@RequestBody OwnerPo ownerPo) {
+ public int saveOwner(@RequestBody OwnerPo ownerPo) {
int saveFlag = ownerV1ServiceDaoImpl.saveOwnerInfo(BeanConvertUtil.beanCovertMap(ownerPo));
+
+ //涓氫富 寮�閫� 鐜伴噾璐︽埛锛屼笉鐒堕厤鍚堝晢鍩� 浼氬瓨鍦╞ug
+ addAccountDto(ownerPo.getMemberId(), ownerPo.getCommunityId());
return saveFlag;
}
- @Override
- public int updateOwner(@RequestBody OwnerPo ownerPo) {
+ private void addAccountDto(String ownerId, String communityId) {
+ if (StringUtil.isEmpty(ownerId)) {
+ return;
+ }
+
+ //寮�濮嬮攣浠ｇ爜
+ String requestId = DistributedLock.getLockUUID();
+ String key = this.getClass().getSimpleName() + "AddCountDto" + ownerId;
+ try {
+ DistributedLock.waitGetDistributedLock(key, requestId);
+ AccountPo accountPo = new AccountPo();
+ accountPo.setAmount("0");
+ accountPo.setAcctId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_acctId));
+ accountPo.setObjId(ownerId);
+ accountPo.setObjType(AccountDto.OBJ_TYPE_PERSON);
+ accountPo.setAcctType(AccountDto.ACCT_TYPE_CASH);
+ OwnerDto tmpOwnerDto = new OwnerDto();
+ tmpOwnerDto.setMemberId(ownerId);
+ tmpOwnerDto.setCommunityId(communityId);
+ List<OwnerDto> ownerDtos = queryOwners(tmpOwnerDto);
+ Assert.listOnlyOne(ownerDtos, "涓氫富涓嶅瓨鍦�");
+ accountPo.setAcctName(ownerDtos.get(0).getName());
+ accountPo.setPartId(communityId);
+ accountPo.setLink(ownerDtos.get(0).getLink());
+ accountInnerServiceSMOImpl.saveAccount(accountPo);
+ } finally {
+ DistributedLock.releaseDistributedLock(requestId, key);
+ }
+ }
+
+ @Override
+ public int updateOwner(@RequestBody OwnerPo ownerPo) {
int saveFlag = ownerV1ServiceDaoImpl.updateOwnerInfo(BeanConvertUtil.beanCovertMap(ownerPo));
return saveFlag;
}
- @Override
- public int deleteOwner(@RequestBody OwnerPo ownerPo) {
- ownerPo.setStatusCd("1");
- int saveFlag = ownerV1ServiceDaoImpl.updateOwnerInfo(BeanConvertUtil.beanCovertMap(ownerPo));
- return saveFlag;
+ @Override
+ public int deleteOwner(@RequestBody OwnerPo ownerPo) {
+ ownerPo.setStatusCd("1");
+ int saveFlag = ownerV1ServiceDaoImpl.updateOwnerInfo(BeanConvertUtil.beanCovertMap(ownerPo));
+ return saveFlag;
}
@Override
- public List<OwnerDto> queryOwners(@RequestBody OwnerDto ownerDto) {
+
+ public List<OwnerDto> queryOwners(@RequestBody OwnerDto ownerDto) {
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
@@ -82,11 +128,21 @@
@Override
public int queryOwnersCount(@RequestBody OwnerDto ownerDto) {
- return ownerV1ServiceDaoImpl.queryOwnersCount(BeanConvertUtil.beanCovertMap(ownerDto)); }
+ return ownerV1ServiceDaoImpl.queryOwnersCount(BeanConvertUtil.beanCovertMap(ownerDto));
+ }
@Override
public int queryOwnersBindCount(@RequestBody OwnerDto ownerDto) {
return ownerV1ServiceDaoImpl.queryOwnersBindCount(BeanConvertUtil.beanCovertMap(ownerDto));
}
+ @Override
+ public List<Map> queryOwnerMembersCount(@RequestBody List<String> ownerIds) {
+
+ Map info = new HashMap();
+ info.put("ownerIds", ownerIds.toArray(new String[ownerIds.size()]));
+ List<Map> result = ownerV1ServiceDaoImpl.queryOwnerMembersCount(info);
+ return result;
+ }
+
}
--
Gitblit v1.8.0