From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
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
old mode 100644
new mode 100755
index 3ff637e..74d6d04
--- 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
@@ -11,6 +11,7 @@
import com.java110.dto.workflow.WorkflowDto;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.po.community.CommunityAttrPo;
import com.java110.po.community.CommunityMemberPo;
import com.java110.po.community.CommunityPo;
import com.java110.po.fee.PayFeeConfigPo;
@@ -25,6 +26,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;
@@ -39,10 +41,8 @@
@Service("communityBMOImpl")
public class CommunityBMOImpl extends ApiBaseBMO implements ICommunityBMO {
-
@Autowired
private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
-
@Autowired
private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
@@ -101,6 +101,13 @@
*/
public JSONObject addCommunityMember(JSONObject paramInJson) {
+ //鏌ヨ灏忓尯鏄惁瀛樺湪
+ CommunityDto communityDto = new CommunityDto();
+ communityDto.setCommunityId(paramInJson.getString("communityId"));
+ List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+
+ Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨");
+
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
business.put(CommonConstant.HTTP_SEQ, 2);
@@ -110,6 +117,10 @@
businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
businessCommunityMember.put("memberId", paramInJson.getString("memberId"));
businessCommunityMember.put("memberTypeCd", paramInJson.getString("memberTypeCd"));
+ 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));
String auditStatusCd = MappingCache.getValue(MappingConstant.DOMAIN_COMMUNITY_MEMBER_AUDIT, paramInJson.getString("memberTypeCd"));
auditStatusCd = StringUtils.isEmpty(auditStatusCd) ? StateConstant.AGREE_AUDIT : auditStatusCd;
businessCommunityMember.put("auditStatusCd", auditStatusCd);
@@ -532,11 +543,39 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
+ public void addAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+ paramInJson.put("attrId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ CommunityAttrPo communityAttrPo = BeanConvertUtil.covertBean(paramInJson, CommunityAttrPo.class);
+ super.insert(dataFlowContext, communityAttrPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMMUNITY_INFO);
+
+ }
+
+ /**
+ * 娣诲姞灏忓尯淇℃伅
+ *
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+ * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+ */
+ public void updateAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+ CommunityAttrPo communityAttrPo = BeanConvertUtil.covertBean(paramInJson, CommunityAttrPo.class);
+ super.insert(dataFlowContext, communityAttrPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);
+
+ }
+
+ /**
+ * 娣诲姞灏忓尯淇℃伅
+ *
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+ * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+ */
public void updateCommunityOne(JSONObject paramInJson, DataFlowContext dataFlowContext) {
CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
super.update(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);
-
}
}
--
Gitblit v1.8.0