Merge branch 'master' of https://github.com/java110/MicroCommunity

wuxw

2019-04-28 2633f776bb8fdb0b1efe3a56293b6a1bb04616a7

Merge branch 'master' of https://github.com/java110/MicroCommunity

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

@@ -3,14 +3,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.listener.AbstractServiceApiDataFlowListener;
import com.java110.common.constant.BusinessTypeConstant;
import com.java110.common.constant.CommonConstant;
import com.java110.common.constant.ServiceCodeConstant;
import com.java110.common.cache.MappingCache;
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;
@@ -68,8 +68,8 @@
    /**
     * 添加小区成员
     *
     * @param paramInJson
     * @return
     * @param paramInJson 接口请求数据封装
     * @return 封装好的 data数据
     */
    private JSONObject addCommunityMember(JSONObject paramInJson) {

@@ -82,6 +82,9 @@
        businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
        businessCommunityMember.put("memberId", paramInJson.getString("memberId"));
        businessCommunityMember.put("memberTypeCd", 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;

 Api/src/main/java/com/java110/api/listener/floor/SaveFloorListener.java

@@ -3,16 +3,15 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.listener.AbstractServiceApiDataFlowListener;
import com.java110.common.constant.BusinessTypeConstant;
import com.java110.common.constant.CommonConstant;
import com.java110.common.constant.CommunityMemberTypeConstant;
import com.java110.common.constant.ServiceCodeConstant;
import com.java110.common.cache.MappingCache;
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.core.factory.GenerateCodeFactory;
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;
@@ -142,6 +141,7 @@
        businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
        businessCommunityMember.put("memberId", paramInJson.getString("floorId"));
        businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.FLOOR);
        businessCommunityMember.put("auditStatusCd", StatusConstant.STATUS_CD_AUDIT_COMPLETE);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);

        return business;

 CommunityService/src/main/java/com/java110/community/dao/impl/CommunityServiceDaoImpl.java

@@ -25,6 +25,7 @@

    /**
     * 小区信息封装
     *
     * @param businessCommunityInfo 小区信息 封装
     * @throws DAOException
     */
@@ -42,6 +43,7 @@

    /**
     * 小区属性信息分装
     *
     * @param businessCommunityAttr 小区属性信息封装
     * @throws DAOException
     */
@@ -60,6 +62,7 @@

    /**
     * 保存小区照片信息
     *
     * @param businessCommunityPhoto 小区照片
     * @throws DAOException
     */
@@ -77,6 +80,7 @@

    /**
     * 保存小区证件信息
     *
     * @param businessCommunityCerdentials 小区证件
     * @throws DAOException
     */
@@ -94,6 +98,7 @@

    /**
     * 查询小区信息
     *
     * @param info bId 信息
     * @return 小区信息
     * @throws DAOException
@@ -116,6 +121,7 @@

    /**
     * 查询小区属性
     *
     * @param info bId 信息
     * @return 小区属性
     * @throws DAOException
@@ -131,6 +137,7 @@

    /**
     * 查询小区照片
     *
     * @param info bId 信息
     * @return
     * @throws DAOException
@@ -146,6 +153,7 @@

    /**
     * 查询小区证件
     *
     * @param info bId 信息
     * @return
     * @throws DAOException
@@ -161,6 +169,7 @@

    /**
     * 保存小区信息 到 instance
     *
     * @param info   bId 信息
     * @throws DAOException
     */
@@ -198,9 +207,9 @@
    }



    /**
     * 查询小区信息（instance）
     *
     * @param info bId 信息
     * @return
     * @throws DAOException
@@ -222,6 +231,7 @@

    /**
     * 小区属性查询（instance）
     *
     * @param info bId 信息
     * @return
     * @throws DAOException
@@ -237,6 +247,7 @@

    /**
     * 小区照片查询（instance）
     *
     * @param info bId 信息
     * @return
     * @throws DAOException
@@ -251,9 +262,9 @@
    }



    /**
     * 修改小区信息
     *
     * @param info 修改信息
     * @throws DAOException
     */
@@ -270,6 +281,7 @@

    /**
     * 修改小区属性信息（instance）
     *
     * @param info 修改信息
     * @throws DAOException
     */
@@ -286,6 +298,7 @@

    /**
     * 修改 小区照片信息
     *
     * @param info 修改信息
     * @throws DAOException
     */
@@ -303,6 +316,7 @@

    /**
     * 小区成员加入信息
     *
     * @param businessCommunityMember 小区成员信息 封装
     * @throws DAOException 操作数据库异常
     */
@@ -318,6 +332,7 @@

    /**
     * 成员加入 保存信息至instance
     *
     * @param info
     * @throws DAOException
     */
@@ -335,6 +350,7 @@
    /**
     * 查询小区成员加入信息（business过程）
     * 根据bId 查询小区信息
     *
     * @param info bId 信息
     * @return 小区信息
     * @throws DAOException
@@ -356,6 +372,7 @@
    /**
     * 查询小区成员加入信息（instance过程）
     * 根据bId 查询小区信息
     *
     * @param info bId 信息
     * @return 小区信息
     * @throws DAOException
@@ -373,8 +390,10 @@

        return memberCommunitys.get(0);
    }

    /**
     * 修改小区成员加入信息
     *
     * @param info 修改信息
     * @throws DAOException
     */

 CommunityService/src/main/java/com/java110/community/listener/AbstractCommunityBusinessServiceDataFlowListener.java

@@ -15,7 +15,6 @@
import java.util.Map;

/**
 *
 * 小区 服务侦听 父类
 * Created by wuxw on 2018/7/4.
 */
@@ -26,6 +25,7 @@

    /**
     * 获取 DAO工具类
     *
     * @return
     */
    public abstract ICommunityServiceDao getCommunityServiceDaoImpl();
@@ -33,6 +33,7 @@
    /**
     * 刷新 businessCommunityInfo 数据
     * 主要将 数据库 中字段和 接口传递字段建立关系
     *
     * @param businessCommunityInfo
     */
    protected void flushBusinessCommunityInfo(Map businessCommunityInfo,String statusCd){
@@ -46,8 +47,9 @@
    }

    /**
        刷新 businessCommunityAttr 数据
     * 刷新 businessCommunityAttr 数据
     * 主要将 数据库 中字段和 接口传递字段建立关系
     *
     * @param businessCommunityAttr
     * @param statusCd
     */
@@ -61,6 +63,7 @@

    /**
     * 刷新 businessCommunityPhoto 数据
     *
     * @param businessCommunityPhoto
     * @param statusCd
     */
@@ -73,10 +76,10 @@
    }



    /**
     * 刷新 businessCommunityMember 数据
     * 主要将 数据库 中字段和 接口传递字段建立关系
     *
     * @param businessCommunityMember
     */
    protected void flushBusinessCommunityMember(Map businessCommunityMember,String statusCd){
@@ -85,11 +88,13 @@
        businessCommunityMember.put("communityMemberId",businessCommunityMember.get("community_member_id"));
        businessCommunityMember.put("memberId",businessCommunityMember.get("member_id"));
        businessCommunityMember.put("memberTypeCd",businessCommunityMember.get("member_type_cd"));
        businessCommunityMember.put("auditStatusCd", businessCommunityMember.get("audit_status_cd"));
        businessCommunityMember.put("statusCd", statusCd);
    }

    /**
     * 当修改数据时，查询instance表中的数据 自动保存删除数据到business中
     *
     * @param businessCommunity 小区信息
     */
    protected void autoSaveDelBusinessCommunity(Business business, JSONObject businessCommunity){
@@ -113,6 +118,7 @@

    /**
     * 当修改数据时，查询instance表中的数据 自动保存删除数据到business中
     *
     * @param business 当前业务
     * @param communityAttr 小区属性
     */
@@ -136,6 +142,7 @@

    /**
     * 当修改数据时，查询instance表中的数据 自动保存删除数据到business中
     *
     * @param business
     * @param businessCommunityPhoto 小区照片
     */
@@ -158,9 +165,9 @@
    }



    /**
     * 当修改数据时，查询instance表中的数据 自动保存删除数据到business中
     *
     * @param businessCommunityMember 小区信息
     */
    protected void autoSaveDelBusinessCommunityMember(Business business, JSONObject businessCommunityMember){
@@ -177,6 +184,7 @@
        currentCommunityMember.put("communityMemberId",currentCommunityMember.get("community_member_id"));
        currentCommunityMember.put("memberId",currentCommunityMember.get("member_id"));
        currentCommunityMember.put("memberTypeCd",currentCommunityMember.get("member_type_cd"));
        currentCommunityMember.put("auditStatusCd", currentCommunityMember.get("audit_status_cd"));
        currentCommunityMember.put("operate",StatusConstant.OPERATE_DEL);
        getCommunityServiceDaoImpl().saveBusinessCommunityMember(currentCommunityMember);
    }

 CommunityService/src/main/java/com/java110/community/listener/MemberJoinedCommunityListener.java

@@ -21,7 +21,7 @@

/**
 * 小区成员加入 侦听
 *
 * <p>
 * businessCommunityMember
 * Created by wuxw on 2018/5/18.
 */
@@ -29,14 +29,16 @@
@Transactional
public class MemberJoinedCommunityListener extends AbstractCommunityBusinessServiceDataFlowListener{

    private final static Logger logger = LoggerFactory.getLogger(MemberJoinedCommunityListener.class);
    private static final int CURRENT_ORDER = 5;

    private static Logger logger = LoggerFactory.getLogger(MemberJoinedCommunityListener.class);

    @Autowired
    ICommunityServiceDao communityServiceDaoImpl;

    @Override
    public int getOrder() {
        return 5;
        return CURRENT_ORDER;
    }

    @Override
@@ -46,6 +48,7 @@

    /**
     * 保存小区信息 business 表中
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     */
@@ -62,6 +65,7 @@

    /**
     * business 数据转移到 instance
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     */
@@ -84,6 +88,7 @@

    /**
     * 撤单
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     */
@@ -108,6 +113,7 @@

    /**
     * 处理 businessCommunityMember 节点
     *
     * @param business 总的数据节点
     * @param businessCommunityMember 小区成员节点
     */
@@ -136,6 +142,7 @@

    /**
     * 刷新 小区ID
     *
     * @param data
     */
    private void flushCommunityMemberId(JSONObject data) {
@@ -145,6 +152,7 @@
        businessCommunityMember.put("communityMemberId",communityMemberId);

    }

    public ICommunityServiceDao getCommunityServiceDaoImpl() {
        return communityServiceDaoImpl;
    }

 WebService/src/main/java/com/java110/web/smo/impl/CommunityServiceSMOImpl.java

@@ -66,6 +66,7 @@

    /**
     * 查询未入驻的小区
     *
     * @param pd
     * @return
     */
@@ -112,6 +113,7 @@

    /**
     * 商户入驻申请接口
     *
     * @param pd
     * @return
     */
@@ -146,6 +148,7 @@

    /**
     * 退出小区
     *
     * @param pd
     * @return
     */
@@ -198,6 +201,7 @@
        }

    }

    public RestTemplate getRestTemplate() {
        return restTemplate;
    }

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

@@ -102,7 +102,7 @@
        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();

 WebService/src/main/resources/components/add-floor/addFloor.js

@@ -58,8 +58,11 @@
                });
            },
            saveFloorInfo:function(){
                vc.loading('open');
                if(!vc.component.addFloorValidate()){
                    vc.component.addFloorInfo.errorInfo = vc.validate.errInfo;
                    vc.loading('close');

                    return ;
                }

@@ -79,15 +82,21 @@
                            //关闭model
                            $('#addFloorModel').modal('hide');
                            vc.component.clearAddFloorInfo();
                            vc.component.$emit('addFloor_reload_event',{});
                            vc.emit('listFloor','listFloorData',{});
                            vc.loading('close');

                            return ;
                        }
                        vc.component.addFloorInfo.errorInfo = json;
                             vc.loading('close');

                     },
                     function(errInfo,error){
                        console.log('请求失败处理');

                        vc.component.addFloorInfo.errorInfo = errInfo;
                             vc.loading('close');

                     });
            },
            clearAddFloorInfo:function(){

 WebService/src/main/resources/components/enter-community/enterCommunity.html

@@ -48,10 +48,10 @@
                                {{community.cityCode}}
                            </td>
                            <td>
                                {{_showCommunityStatus(community.statusCd)}}
                                {{_showCommunityStatus(community.auditStatusCd)}}
                            </td>
                            <td class="text-right">
                                <div class="btn-group" v-if="community.statusCd == 0">
                                <div class="btn-group" v-if="community.auditStatusCd == '0000'">
                                    <button class="btn-white btn btn-xs" v-on:click="_openExitCommunityModel(community)">申请退出</button>
                                </div>
                            </td>

 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 "未知";
            }
        }
    });

 WebService/src/main/resources/components/floor/listFloor.html

@@ -45,6 +45,9 @@
                            </td>
                            <td class="text-right">
                                <div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openDelFloorModel(floor)">修改</button>
                                </div>
                                <div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openDelFloorModel(floor)">删除</button>
                                </div>
                            </td>

 WebService/src/main/resources/components/floor/listFloor.js

@@ -13,7 +13,9 @@
            vc.component._listFloorData();
        },
        _initEvent:function(){

            vc.on('listFloor','listFloorData',function(){
                vc.component._listFloorData();
            });
        },
        methods:{
            _listFloorData:function(){

 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');

                             }
                           );


 docs/api/community/communityMemberJoined.md

@@ -27,6 +27,7 @@
|memberId|1|String|30|小区成员ID|-|
|communityId|1|String|30|小区ID|-|
|memberTypeCd|1|String|12|成员角色|-|
|auditStatusCd|1|String|4|审核状态|不需要审核时写0000|

###### 返回协议

@@ -49,13 +50,14 @@
SIGN:aabdncdhdbd878sbdudn898
请求报文：

无

返回报文：
{
    "memberId": "390001200001",
    "communityId": "1234444",
    "memberTypeCd": "12221222"
}

返回报文：

成功

```

 docs/services/community/communityMemberJoined.md

@@ -47,6 +47,7 @@
|businessCommunityMember|communityId|1|String|30|小区ID|小区ID|
|businessCommunityMember|memberId|1|String|30|成员ID|成员ID|
|businessCommunityMember|memberTypeCd|1|String|30|成员类型|成员类型|
|businessCommunityMember|auditStatusCd|1|String|4|审核状态|不需要审核的时直接写成0000|

###### 返回协议

@@ -91,7 +92,8 @@
        "communityMemberId": "-1",
        "communityId": "7020181217000001",
        "memberId": "3456789",
        "memberTypeCd": "390001200001"
        "memberTypeCd": "390001200001",
        "auditStatusCd":"0000"
      }
    },
    "attrs": [{

 java110-common/src/main/java/com/java110/common/constant/MappingConstant.java

@@ -4,111 +4,121 @@
 * 映射表配置
 * Created by wuxw on 2018/4/14.
 */
public class MappingConstant {
public final class MappingConstant {

    private MappingConstant(){

    }




    public  final static String KEY_LOG_ON_OFF = "LOG_ON_OFF";
    public  final static String KEY_COST_TIME_ON_OFF = "COST_TIME_ON_OFF";
    public  static final String KEY_LOG_ON_OFF = "LOG_ON_OFF";
    public  static final String KEY_COST_TIME_ON_OFF = "COST_TIME_ON_OFF";

    //私钥
    public final static String KEY_PRIVATE_STRING = "PRIVATE_STRING";
    public static final String KEY_PRIVATE_STRING = "PRIVATE_STRING";

    //公钥
    public final static String KEY_PUBLIC_STRING = "PUBLIC_STRING";
    public static final String KEY_PUBLIC_STRING = "PUBLIC_STRING";

    //私钥(外部系统)
    public final static String KEY_OUT_PRIVATE_STRING = "OUT_PRIVATE_STRING";
    public static final String KEY_OUT_PRIVATE_STRING = "OUT_PRIVATE_STRING";

    //公钥(外部系统)
    public final static String KEY_OUT_PUBLIC_STRING = "OUT_PUBLIC_STRING";
    public static final String KEY_OUT_PUBLIC_STRING = "OUT_PUBLIC_STRING";
    //解密 KEY_SIZE
    public final static String KEY_DEFAULT_DECRYPT_KEY_SIZE = "DEFAULT_DECRYPT_KEY_SIZE";
    public static final String KEY_DEFAULT_DECRYPT_KEY_SIZE = "DEFAULT_DECRYPT_KEY_SIZE";

    public  final static String KEY_RULE_ON_OFF = "RULE_ON_OFF";
    public  final static String VALUE_ON = "ON";
    public  final static String VALUE_OFF = "OFF";
    public  static final String KEY_RULE_ON_OFF = "RULE_ON_OFF";
    public  static final String VALUE_ON = "ON";
    public  static final String VALUE_OFF = "OFF";

    //不用调用规则校验的配置
    public  final static String KEY_NO_NEED_RULE_VALDATE_ORDER = "NO_NEED_RULE_VALDATE_ORDER";//Q
    public  static final String KEY_NO_NEED_RULE_VALDATE_ORDER = "NO_NEED_RULE_VALDATE_ORDER";//Q

    //不用保存订单也订单项信息的配置
    public  final static String KEY_NO_SAVE_ORDER = "NO_SAVE_ORDER";//Q
    public  static final String KEY_NO_SAVE_ORDER = "NO_SAVE_ORDER";//Q

    // 不用调用 下游系统的配置(一般不存在这种情况，这里主要是在没有下游系统的情况下测试中心服务用)
    public  final static String KEY_NO_INVOKE_BUSINESS_SYSTEM = "NO_INVOKE_BUSINESS_SYSTEM";//
    public  static final String KEY_NO_INVOKE_BUSINESS_SYSTEM = "NO_INVOKE_BUSINESS_SYSTEM";//

    // 不用调用 作废下游系统的配置(一般不存在这种情况，这里主要是在没有下游系统的情况下测试中心服务用)
    public  final static String KEY_NO_INVALID_BUSINESS_SYSTEM = "NO_INVALID_BUSINESS_SYSTEM";//
    public  static final String KEY_NO_INVALID_BUSINESS_SYSTEM = "NO_INVALID_BUSINESS_SYSTEM";//

    //需要调用服务生成各个ID
    public final static String KEY_NEED_INVOKE_GENERATE_ID = "NEED_INVOKE_SERVICE_GENERATE_ID";
    public static final String KEY_NEED_INVOKE_GENERATE_ID = "NEED_INVOKE_SERVICE_GENERATE_ID";

    //默认掩码
    public final static String KEY_DEFAULT_SECURITY_CODE = "DEFAULT_SECURITY_CODE";
    public static final String KEY_DEFAULT_SECURITY_CODE = "DEFAULT_SECURITY_CODE";

    // 生成 编码路径
    public final static String KEY_CODE_PATH = "CODE_PATH";
    public static final String KEY_CODE_PATH = "CODE_PATH";



    /**
     * 中心服务地址
     */
    public final static String KEY_CENTER_SERVICE_URL = "CENTER_SERVICE_URL";
    public static final String KEY_CENTER_SERVICE_URL = "CENTER_SERVICE_URL";

    public final static String KEY_API_SERVICE_URL = "API_SERVICE_URL";
    public static final String KEY_API_SERVICE_URL = "API_SERVICE_URL";

    /**
     * 控制中心服务APP_ID
     */
    public final static String KEY_CONSOLE_SERVICE_APP_ID = "CONSOLE_SERVICE_APP_ID";
    public static final String KEY_CONSOLE_SERVICE_APP_ID = "CONSOLE_SERVICE_APP_ID";

    public final static String KEY_CONSOLE_SECURITY_CODE = "CONSOLE_SECURITY_CODE";
    public static final String KEY_CONSOLE_SECURITY_CODE = "CONSOLE_SECURITY_CODE";

    /**
     * 控制服务是否调用接口解密处理
     */
    public final static String KEY_CONSOLE_SERVICE_SECURITY_ON_OFF = "CONSOLE_SERVICE_SECURITY_ON_OFF";
    public static final String KEY_CONSOLE_SERVICE_SECURITY_ON_OFF = "CONSOLE_SERVICE_SECURITY_ON_OFF";

    /**
     * 用户秘钥
     */
    public final static String KEY_USER_PASSWORD_SECRET = "USER_PASSWORD_SECRET";
    public static final String KEY_USER_PASSWORD_SECRET = "USER_PASSWORD_SECRET";

    /**
     * JWT 秘钥
     */
    public final static String KEY_JWT_SECRET = "JWT_SECRET";
    public static final String KEY_JWT_SECRET = "JWT_SECRET";

    /**
     * JWT 秘钥
     */
    public final static String KEY_JWT_EXPIRE_TIME = "JWT_EXPIRE_TIME";
    public static final String KEY_JWT_EXPIRE_TIME = "JWT_EXPIRE_TIME";

    /**
     * 员工默认密码
     */
    public final static String KEY_STAFF_DEFAULT_PASSWORD = "STAFF_DEFAULT_PASSWORD";
    public static final String KEY_STAFF_DEFAULT_PASSWORD = "STAFF_DEFAULT_PASSWORD";


    /**
     * 默认权限
     */
    public final static String DOMAIN_DEFAULT_PRIVILEGE_ADMIN = "DEFAULT_PRIVILEGE_ADMIN";
    public static final String DOMAIN_DEFAULT_PRIVILEGE_ADMIN = "DEFAULT_PRIVILEGE_ADMIN";


    /**
     * 默认权限
     */
    public final static String DOMAIN_DEFAULT_PRIVILEGE = "DEFAULT_PRIVILEGE";
    public static final String DOMAIN_DEFAULT_PRIVILEGE = "DEFAULT_PRIVILEGE";


    /**
     * 商户类型转 小区成员角色
     */
    public final static String DOMAIN_STORE_TYPE_2_COMMUNITY_MEMBER_TYPE = "STORE_TYPE_2_COMMUNITY_MEMBER_TYPE";
    public static final String DOMAIN_STORE_TYPE_2_COMMUNITY_MEMBER_TYPE = "STORE_TYPE_2_COMMUNITY_MEMBER_TYPE";


    /**
     * 小区成员审核
     */
    public static final String DOMAIN_COMMUNITY_MEMBER_AUDIT = "COMMUNITY_MEMBER_AUDIT";

    




 java110-common/src/main/java/com/java110/common/constant/StatusConstant.java

@@ -51,6 +51,11 @@
     */
    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";

 java110-config/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml

@@ -237,21 +237,21 @@

    <!--小区成员加入 add by wuxw 2018-10-27 saveBusinessCommunityMember-->
    <insert id="saveBusinessCommunityMember" parameterType="Map">
        insert into business_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,month,operate)
        values(#{communityMemberId},#{bId},#{communityId},#{memberId},#{memberTypeCd},#{month},#{operate})
        insert into business_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,month,operate,audit_status_cd)
        values(#{communityMemberId},#{bId},#{communityId},#{memberId},#{memberTypeCd},#{month},#{operate},#{auditStatusCd})
    </insert>

    <!-- 小区成员加入 instance表中 add by wuxw 2018-10-27 -->
    <insert id="saveCommunityMemberInstance" parameterType="Map">
        insert into s_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,status_cd)
        select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,'1000'
        insert into s_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,status_cd,audit_status_cd)
        select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,'0',ms.audit_status_cd
        from business_community_member ms where
        ms.operate = 'ADD' and ms.b_id=#{bId}
    </insert>

    <!-- 查询小区成员 add by wuxw 2018-10-27 getBusinessCommunityMember-->
    <select id="getBusinessCommunityMember" parameterType="Map" resultType="Map">
        select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.operate
        select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.operate,ms.audit_status_cd
        from business_community_member ms where 1 = 1
        <if test="operate != null and operate != ''">
            and ms.operate = #{operate}
@@ -267,7 +267,7 @@

    <!-- 查询小区成员  add by wuxw 2018-07-03 -->
    <select id="getCommunityMember" parameterType="Map" resultType="Map">
        select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.status_cd
        select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.status_cd,ms.audit_status_cd
        from s_community_member ms
        where 1=1
        <if test="statusCd != null and statusCd != ''">
@@ -288,6 +288,9 @@
        <if test="newBId != null and newBId != ''">
            ,ms.b_id = #{newBId}
        </if>
        <if test="auditStatusCd !=null and auditStatusCd !=''">
            ,ms.audit_status_cd = #{auditStatusCd}
        </if>
        where 1=1
        <if test="bId != null and bId !=''">
            and ms.b_id = #{bId}