Просмотр исходного кода

没有配置的商户类型,小区成员默认不做审核处理

吴学文 лет назад: 7
Родитель
Сommit
b31bc02c29

+ 5 - 5
Api/src/main/java/com/java110/api/listener/community/CommunityMemberJoinedListener.java

@@ -4,15 +4,13 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiDataFlowListener;
 import com.java110.common.cache.MappingCache;
-import com.java110.common.constant.BusinessTypeConstant;
-import com.java110.common.constant.CommonConstant;
-import com.java110.common.constant.MappingConstant;
-import com.java110.common.constant.ServiceCodeConstant;
+import com.java110.common.constant.*;
 import com.java110.common.util.Assert;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.AppService;
 import com.java110.event.service.api.ServiceDataFlowEvent;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -84,7 +82,9 @@ public class CommunityMemberJoinedListener extends AbstractServiceApiDataFlowLis
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
         businessCommunityMember.put("memberId", paramInJson.getString("memberId"));
         businessCommunityMember.put("memberTypeCd", paramInJson.getString("memberTypeCd"));
-        businessCommunityMember.put("auditStatusCd", MappingCache.getValue(MappingConstant.DOMAIN_COMMUNITY_MEMBER_AUDIT, paramInJson.getString("memberTypeCd")));
+        String auditStatusCd = MappingCache.getValue(MappingConstant.DOMAIN_COMMUNITY_MEMBER_AUDIT, paramInJson.getString("memberTypeCd"));
+        auditStatusCd = StringUtils.isEmpty(auditStatusCd) ? StatusConstant.STATUS_CD_AUDIT_COMPLETE : auditStatusCd;
+        businessCommunityMember.put("auditStatusCd", auditStatusCd);
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
 
         return business;

+ 1 - 1
WebService/src/main/java/com/java110/web/smo/impl/NavServiceSMOImpl.java

@@ -102,7 +102,7 @@ public class NavServiceSMOImpl extends BaseComponentSMO implements INavServiceSM
         for (int communityIndex = 0; communityIndex < communitys.size(); communityIndex++) {
             tempCommunity = communitys.getJSONObject(communityIndex);
 
-            if (!StatusConstant.STATUS_CD_VALID.equals(tempCommunity.getString("statusCd"))) {
+            if (!StatusConstant.STATUS_CD_AUDIT_COMPLETE.equals(tempCommunity.getString("auditStatusCd"))) {
                 continue;
             }
             newCommunity = new JSONObject();

+ 3 - 1
WebService/src/main/resources/components/enter-community/enterCommunity.js

@@ -46,9 +46,11 @@
                     return "入驻审核";
                 }else if(_statusCd == '1001'){
                     return "退出审核";
+                }else if(_statusCd == '0000'){
+                    return "入驻成功";
                 }
 
-                return "在用";
+                return "未知";
             }
         }
     });

+ 7 - 1
WebService/src/main/resources/components/store-enter-community/storeEnterCommunity.js

@@ -67,6 +67,7 @@
                    );
              },
             _saveEnterCommunity:function(_communityInfo){
+                vc.loading('open');
                 var _param = {
                     communityId:_communityInfo.communityId
                 };
@@ -80,13 +81,18 @@
                              function(json,res){
                                 if(res.status == 200){
                                     vc.emit('enterCommunity','listMyCommunity',{
-                                    })
+                                    });
+                                    $('#storeEnterCommunityModel').modal('hide');
+
+                                    vc.loading('close');
                                     return ;
                                 }
                                 vc.component.storeEnterCommunityInfo.errorInfo = json;
                              },function(errInfo,error){
                                 console.log('请求失败处理');
                                 vc.component.storeEnterCommunityInfo.errorInfo = json;
+                                vc.loading('close');
+
                              }
                            );
 

+ 5 - 0
java110-common/src/main/java/com/java110/common/constant/StatusConstant.java

@@ -51,6 +51,11 @@ public class StatusConstant {
      */
     public final static String STATUS_CD_AUDIT_INVALID = "1001";
 
+    /**
+     * 入驻成功
+     */
+    public final static String STATUS_CD_AUDIT_COMPLETE = "0000";
+
     public final static String REQUEST_BUSINESS_TYPE = "Q";
     public final static String REQUEST_BUSINESS_TYPE_BUSINESS = "B";
     public final static String REQUEST_BUSINESS_TYPE_INSTANCE = "I";