diff --git a/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java index 74d6d04180d4f24e119dbf7a04fc8842085af67c..fe74f634c795ace8b8e28223b51cbd306ef202a2 100755 --- a/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java +++ b/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java @@ -488,6 +488,7 @@ public class CommunityBMOImpl extends ApiBaseBMO implements ICommunityBMO { */ public void addCommunityMembers(JSONObject paramInJson, DataFlowContext dataFlowContext) { + JSONObject businessCommunityMember = new JSONObject(); businessCommunityMember.put("communityMemberId", "-1"); businessCommunityMember.put("communityId", paramInJson.getString("communityId")); diff --git a/service-api/src/main/java/com/java110/api/bmo/floor/impl/FloorBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/floor/impl/FloorBMOImpl.java index 551489625a67e71d49807dfb6edc38807d5da026..18bb4cf7dccd28c57c22f64a5be38a44870d2554 100755 --- a/service-api/src/main/java/com/java110/api/bmo/floor/impl/FloorBMOImpl.java +++ b/service-api/src/main/java/com/java110/api/bmo/floor/impl/FloorBMOImpl.java @@ -4,16 +4,20 @@ import com.alibaba.fastjson.JSONObject; import com.java110.api.bmo.ApiBaseBMO; import com.java110.api.bmo.floor.IFloorBMO; import com.java110.core.context.DataFlowContext; +import com.java110.dto.community.CommunityDto; import com.java110.intf.community.ICommunityInnerServiceSMO; import com.java110.dto.CommunityMemberDto; import com.java110.po.community.CommunityMemberPo; import com.java110.po.floor.FloorPo; import com.java110.utils.constant.*; import com.java110.utils.exception.ListenerExecuteException; +import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; +import com.java110.utils.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Calendar; import java.util.List; /** @@ -118,12 +122,25 @@ public class FloorBMOImpl extends ApiBaseBMO implements IFloorBMO { */ public void addCommunityMember(JSONObject paramInJson, DataFlowContext context) { + //鏌ヨ灏忓尯鏄惁瀛樺湪 + 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"); businessCommunityMember.put("communityId", paramInJson.getString("communityId")); businessCommunityMember.put("memberId", paramInJson.getString("floorId")); businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.FLOOR); 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(context, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY); } 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 index 9ef46677d0dd0b69db25e4384df592562badb4df..056bd0978ba39677fb2bf0d4347b2ef3c40f6d02 100755 --- 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 @@ -35,6 +35,7 @@ import com.java110.utils.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Calendar; import java.util.List; import java.util.Map; @@ -234,7 +235,12 @@ public class OwnerBMOImpl extends ApiBaseBMO implements IOwnerBMO { * @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"); @@ -242,6 +248,10 @@ public class OwnerBMOImpl extends ApiBaseBMO implements IOwnerBMO { 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); }