From 4253f8db8f79616a4d714af3adafc62890f5fac9 Mon Sep 17 00:00:00 2001
From: sangzhigang <sangzhigang@hongruiinfo.com>
Date: 星期一, 20 十二月 2021 10:23:03 +0800
Subject: [PATCH] 1、优化采购管理2、优化小区审核工作流问题3、优化用户信息
---
service-api/src/main/java/com/java110/api/bmo/owner/impl/OwnerBMOImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/owner/impl/OwnerBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/owner/impl/OwnerBMOImpl.java
old mode 100644
new mode 100755
index 371ba99..8d4e073
--- a/service-api/src/main/java/com/java110/api/bmo/owner/impl/OwnerBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/owner/impl/OwnerBMOImpl.java
@@ -4,17 +4,17 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.owner.IOwnerBMO;
import com.java110.core.context.DataFlowContext;
-import com.java110.core.smo.community.ICommunityInnerServiceSMO;
-import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
-import com.java110.core.smo.common.IFileRelInnerServiceSMO;
-import com.java110.core.smo.user.IOwnerAppUserInnerServiceSMO;
-import com.java110.core.smo.user.IOwnerInnerServiceSMO;
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.po.community.CommunityMemberPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.file.FileRelPo;
@@ -35,6 +35,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Calendar;
import java.util.List;
import java.util.Map;
@@ -59,6 +60,7 @@
@Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
+
@Autowired
private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMOImpl;
@@ -116,6 +118,16 @@
OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
super.delete(dataFlowContext, ownerPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_INFO);
+ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setMemberId(paramInJson.getString("ownerId"));
+ //鏌ヨapp鐢ㄦ埛琛�
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+ if (ownerAppUserDtos != null && ownerAppUserDtos.size() > 0) {
+ for (OwnerAppUserDto ownerAppUser : ownerAppUserDtos) {
+ OwnerAppUserPo ownerAppUserPo = BeanConvertUtil.covertBean(ownerAppUser, OwnerAppUserPo.class);
+ super.delete(dataFlowContext, ownerAppUserPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_APP_USER);
+ }
+ }
}
@@ -160,9 +172,25 @@
JSONObject businessOwner = new JSONObject();
businessOwner.putAll(BeanConvertUtil.beanCovertMap(ownerDtos.get(0)));
businessOwner.putAll(paramInJson);
+
+ if (paramInJson.containsKey("wxPhoto")) {
+ businessOwner.put("link", paramInJson.getString("wxPhoto"));
+ }
businessOwner.put("state", ownerDtos.get(0).getState());
OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
- super.delete(dataFlowContext, ownerPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_INFO);
+ super.update(dataFlowContext, ownerPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_INFO);
+ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setMemberId(paramInJson.getString("ownerId"));
+ //鏌ヨapp鐢ㄦ埛琛�
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+ if (ownerAppUserDtos != null && ownerAppUserDtos.size() > 0) {
+ for (OwnerAppUserDto ownerAppUser : ownerAppUserDtos) {
+ OwnerAppUserPo ownerAppUserPo = BeanConvertUtil.covertBean(ownerAppUser, OwnerAppUserPo.class);
+ ownerAppUserPo.setLink(paramInJson.getString("link"));
+ ownerAppUserPo.setIdCard(paramInJson.getString("idCard"));
+ super.update(dataFlowContext, ownerAppUserPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_APP_USER);
+ }
+ }
}
/**
@@ -230,7 +258,12 @@
* @return 灏忓尯鎴愬憳淇℃伅
*/
public void addCommunityMember(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ //鏌ヨ灏忓尯鏄惁瀛樺湪
+ CommunityDto communityDto = new CommunityDto();
+ communityDto.setCommunityId(paramInJson.getString("communityId"));
+ List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+ Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨");
JSONObject businessCommunityMember = new JSONObject();
businessCommunityMember.put("communityMemberId", "-1");
@@ -238,6 +271,10 @@
businessCommunityMember.put("memberId", paramInJson.getString("ownerId"));
businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.OWNER);
businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
+ businessCommunityMember.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ Calendar endTime = Calendar.getInstance();
+ endTime.add(Calendar.MONTH, Integer.parseInt(communityDtos.get(0).getPayFeeMonth()));
+ businessCommunityMember.put("endTime", DateUtil.getFormatTimeString(endTime.getTime(), DateUtil.DATE_FORMATE_STRING_A));
CommunityMemberPo communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
super.insert(dataFlowContext, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
}
--
Gitblit v1.8.0