Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-26 43c69b2a7ee65a2664b5749cd33cdd3afe50d791

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -107,22 +107,35 @@
        loginUserInfoVO.setUserId(userId);
        R r = userService.putUserAuthentication(loginUserInfoVO);
        if (R.isOk(r)) {
            //通过不发通知
            //通过发通知
            SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
            sysUserNoticeVO.setUserId(userId);
            sysUserNoticeVO.setType(3);
            sysUserNoticeVO.setTitle("实名制审核通过");
            sysUserNoticeVO.setBusinessType(6);
            sysUserNoticeVO.setBusinessContent("恭喜你，你已经通过了实名制认证");
            sysUserNoticeVO.setStatus(0);
            sysUserNoticeVO.setBusinessStatus(2);
            R r1 = userService.addNotice(sysUserNoticeVO);
            if (R.isOk(r1)) {
                log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }
        } else {
            //未通过发通知
            /**
            SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
            sysUserNoticeVO.setUserId(userId);
            sysUserNoticeVO.setType(3);
            sysUserNoticeVO.setTitle("实名制审核未通过");
            sysUserNoticeVO.setBusinessType(6);
//            sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
            sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg()));
//            sysUserNoticeVO.setBusinessId(activityId);R
            sysUserNoticeVO.setStatus(0);
            sysUserNoticeVO.setBusinessStatus(1);
            R r1 = userService.addNotice(sysUserNoticeVO);
            if (R.isOk(r1)) {
                log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }
             */
        }
        return r;
    }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java

@@ -90,8 +90,8 @@
                ComMngPopulationServeExcelVO vo = new ComMngPopulationServeExcelVO();
                if(oneData.get(0) == null){
                    ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                    importErrorVO.setErrorPosition("第" + index + "行,第1列");
                    importErrorVO.setErrorMsg("名字不可为空,请填写姓名");
                    importErrorVO.setErrorPosition("第" + index + "行，第1列");
                    importErrorVO.setErrorMsg("名字不可为空，请填写姓名");
                    populationImportErrorVOList.add(importErrorVO);
                    index++;
                    continue;
@@ -99,8 +99,8 @@
                vo.setName(oneData.get(0));
                if(StringUtils.isEmpty(oneData.get(1))){
                    ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                    importErrorVO.setErrorPosition("第" + index + "行,第2列");
                    importErrorVO.setErrorMsg("身份证号不可为空,请填写身份证号");
                    importErrorVO.setErrorPosition("第" + index + "行，第2列");
                    importErrorVO.setErrorMsg("身份证号不可为空，请填写身份证号");
                    populationImportErrorVOList.add(importErrorVO);
                    index++;
                    continue;
@@ -111,8 +111,8 @@
                //判断身份证号码位数
                if(oneData.get(1).length() != 18){
                    ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                    importErrorVO.setErrorPosition("第" + index + "行,第2列");
                    importErrorVO.setErrorMsg("身份证号位数有误,请检查身份证号码是否正确");
                    importErrorVO.setErrorPosition("第" + index + "行，第2列");
                    importErrorVO.setErrorMsg("身份证号位数有误，请检查身份证号码是否正确");
                    populationImportErrorVOList.add(importErrorVO);
                    index++;
                    continue;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java

@@ -29,7 +29,7 @@
    @ApiModelProperty("消息标题")
    private String title;

    @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表")
    @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表 10 房屋审核通知")
    private Integer businessType;

    @ApiModelProperty("业务标题")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java

@@ -28,9 +28,7 @@
        boolean result=false;
        String headerkey="Authorization";
        String headervalue="Basic ";
        Long time = System.currentTimeMillis();
        String basicStr = CLIENT_ID + ":" + SECRET + ":" + time;
        log.info("请求时间戳：" + time);
        String basicStr = CLIENT_ID + ":" + SECRET + ":" + System.currentTimeMillis();
        String encodeToString = Base64.getEncoder().encodeToString(basicStr.getBytes());
        JSONObject jsonObject=new JSONObject();
        jsonObject.put("idNumber",idcard);
@@ -39,7 +37,7 @@
        log.info("请求公安实名认证接口，请求地址：" + URL);
        log.info("请求公安实名认证接口，请求参数：" + param);
        log.info("请求公安实名认证接口，请求头参数：" + headervalue + encodeToString);
        String postByJson = HttpClientUtil.sendPostByJson(URL, param, 0, headerkey, headervalue + encodeToString);
        String postByJson = HttpClientUtil.sendPostByJson(URL, param, 0, headerkey, "Basic MjA5MjI2MTkzNDY1MTkzMjY3MjpkZTFjMGRiYi05MTk3LTQ3MjQtOWNjMi1hYTk0ZTMwYTA3MmY6MTYxOTQyMTMyMzgxMg==");
        log.info("请求公安实名认证接口，返回参数：" + postByJson);
        int code = JSONObject.parseObject(postByJson).getIntValue("code");
        if (0==code) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/HouseApi.java

@@ -70,7 +70,7 @@
            sysUserNoticeVO.setUserId(comOpsHouseVO.getUserId());
            sysUserNoticeVO.setType(3);
            sysUserNoticeVO.setTitle("房源审核通过");
            sysUserNoticeVO.setBusinessType(1);
            sysUserNoticeVO.setBusinessType(10);
            sysUserNoticeVO.setBusinessTitle("您提交的" + comOpsHouseVO.getTitle() +"房屋出租审核已经审核通过");
            sysUserNoticeVO.setBusinessId(comOpsHouseVO.getId());
            sysUserNoticeVO.setStatus(0);
@@ -79,6 +79,22 @@
            if (R.isOk(r2)) {
                log.info("新增房屋出租通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }
        }else if(R.isOk(r) && 2==comOpsHouseVO.getStatus()){
            //您提交的xxxx房屋出租审核已经审核通过/被驳回
            //审核驳回添加提示信息
            SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
            sysUserNoticeVO.setUserId(comOpsHouseVO.getUserId());
            sysUserNoticeVO.setType(3);
            sysUserNoticeVO.setTitle("房源审核被驳回");
            sysUserNoticeVO.setBusinessType(10);
            sysUserNoticeVO.setBusinessTitle("您提交的" + comOpsHouseVO.getTitle() +"房屋出租审核已经被驳回");
            sysUserNoticeVO.setBusinessId(comOpsHouseVO.getId());
            sysUserNoticeVO.setStatus(0);
            sysUserNoticeVO.setBusinessStatus(1);
            R r2 = userService.addNotice(sysUserNoticeVO);
            if (R.isOk(r2)) {
                log.info("新增房屋出租通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }
        }
        return r;
    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java

@@ -73,7 +73,7 @@
            "AND a.`status` in (3,4) \n" +
            " </if> " +
            "<if test='comActActivityVO.isApplets != null and comActActivityVO.isApplets ==1'>" +
            "AND a.`status` != 1 \n" +
            "AND a.`status` != 1 AND  a.`status` != 6  \n" +
            " </if> " +
            "<if test='comActActivityVO.beginAt != null '>" +
            "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java

@@ -62,9 +62,12 @@
            "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != &quot;&quot;'>" +
            "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%')  \n" +
            " </if> " +
            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish==null'>" +
            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.status!=3 and comActMicroWishVO.isPageMyWish==null'>" +
            "AND w.`status` = #{comActMicroWishVO.status} \n" +
            " </if> " +
            "<if test='comActMicroWishVO.status == 3  and comActMicroWishVO.isPageMyWish==null'>" +
            "AND ( w.`status` = 3 or  w.`status` = 5 )\n" +
            " </if> " +
            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" +
            "AND w.`status` in (1,2) \n" +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -180,7 +180,7 @@
            " AND cmv.`alley` LIKE concat(#{pageInputUserDTO.areaName},'%') " +
            " </if> " +
            "<if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags != &quot;&quot;'>" +
            " AND cmp.label LIKE concat(#{pageInputUserDTO.tags},'%') " +
            " AND cmp.label like concat('%',#{pageInputUserDTO.tags},'%') " +
            " </if> " +
            " order by cmp.create_at desc " +
            "</script>")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java

@@ -71,7 +71,10 @@
            "AND d.status in (1,3) \n" +
            " </if> " +
            "<if test='pageComOpsHouseDTO.houseCommunityName != null and pageComOpsHouseDTO.houseCommunityName.trim() != &quot;&quot;'>" +
            " and d.`house_community_name` LIKE concat( '%', #{pageComOpsHouseDTO.houseCommunityName}, '%' ) \n" +
            " and (" +
                " d.`house_community_name` LIKE concat( '%', #{pageComOpsHouseDTO.houseCommunityName}, '%' ) " +
                " or d.title like concat( '%', #{pageComOpsHouseDTO.houseCommunityName}, '%' ) " +
            "    )  \n" +
            " </if> " +
            "<if test='pageComOpsHouseDTO.mobile != null and pageComOpsHouseDTO.mobile.trim() != &quot;&quot;'>" +
            " and d.`mobile` LIKE concat( #{pageComOpsHouseDTO.mobile}, '%' ) \n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java

@@ -20,7 +20,7 @@

    @Select("<script>" +
            "select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`," +
            "sale,sale_volume,store_detail,create_at from com_shop_store c" +
            "sale,sale_volume,store_detail,create_at, store_describe from com_shop_store c" +
            " <where>" +
            "c.delete_status=1 and c.status = 1" +
            "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != &quot;&quot;'>" +
@@ -45,7 +45,7 @@

    @Select("<script>" +
            "select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`," +
            "sale,sale_volume,store_detail,create_at from com_shop_store c" +
            "sale,sale_volume,store_detail,create_at,store_describe from com_shop_store c" +
            " <where>" +
            " and c.delete_status=1 " +
            "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != &quot;&quot;'>" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -209,7 +209,7 @@
            if (result) {
                ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                importErrorVO.setErrorMsg("导入实有人口已存在(" + vo.getCardNo() + ")");
                importErrorVO.setErrorPosition("第" + index + "行,第2列");
                importErrorVO.setErrorPosition("第" + index + "行，第2列");
                populationImportErrorVOList.add(importErrorVO);
                index++;
                continue;
@@ -224,7 +224,7 @@
            if (comMngVillageDO == null) {
                ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                importErrorVO.setErrorMsg("查无:" + vo.getRoad() + "小区/房租地址，请先新建地址");
                importErrorVO.setErrorPosition("第" + index + "行,第7,8列");
                importErrorVO.setErrorPosition("第" + index + "行，第7、8列");
                populationImportErrorVOList.add(importErrorVO);
                index++;
                continue;