Merge branch 'ty_fix' into score_shop

Helius

2021-11-12 8b2e015759d11561638bdc0ecae070557b387451

Merge branch 'ty_fix' into score_shop

 zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java

@@ -74,6 +74,7 @@
        registry.addInterceptor(hostInterceptor).addPathPatterns("/**/wxapi/**")
                .addPathPatterns("/api/common/wxLogin/**")
                .addPathPatterns("/api/common/bindUser")
                .addPathPatterns("/api/user/xcxloginOut/**")
                .excludePathPatterns("/wxCommon/wxapi/wxpayCallback")
                .excludePathPatterns("/wxCommon/wxapi/rechargeCallBack");
    }

 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java

@@ -374,8 +374,7 @@
                    List<String> openIds = StrUtil.split(hasBind.getOpenIds(), ',');
                    openIds.remove(loginDto.getOpenId());

                    hasBind.setOpenIds(CollUtil.join(openIds, ","));
                    sysUsersService.modifyByModel(hasBind);
                    sysUsersService.modifyUserOpenId(CollUtil.join(openIds, ","), hasBind.getSuId());
                }
            }


 zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java

@@ -112,16 +112,15 @@
    }

    @ApiOperation(value = "小程序退出登陆", notes = "小程序退出登陆")
    @GetMapping(value = "/loginOut/{code}")
    public AjaxResult loginOut(HttpServletRequest request, String code) {
    @GetMapping(value = "/xcxloginOut/{code}")
    public AjaxResult xcxloginOut(HttpServletRequest request, @PathVariable("code") String code) {
        SysUsers hasBind = sysUsersService.findByOpenId(code, HostInterceptor.getCompanyId());
        if (hasBind != null) {
            if(StrUtil.isNotBlank(hasBind.getOpenIds())) {
                List<String> openIds = StrUtil.split(hasBind.getOpenIds(), ',');
                openIds.remove(code);

                hasBind.setOpenIds(CollUtil.join(openIds, ","));
                sysUsersService.modifyByModel(hasBind);
                sysUsersService.modifyUserOpenId(CollUtil.join(openIds, ","), hasBind.getSuId());
            }
        }
        String token=ApiUserLoginInterceptor.resolveToken(request,privateKey);

 zq-erp/src/main/java/com/matrix/system/common/dao/SysUsersDao.java

@@ -126,4 +126,6 @@
    public List<AppVersion> selectAppVersion();

    SysUsers selectUserByOpenId(@Param("openId") String openId, @Param("companyId") Long companyId);

    int updateUserOpenId(@Param("openId") String openId, @Param("suId") Long suId);
}

 zq-erp/src/main/java/com/matrix/system/common/service/SysUsersService.java

@@ -174,4 +174,6 @@
    public List<AppVersion> findAppVersion();

    SysUsers findByOpenId(String openId, Long companyId);

    int modifyUserOpenId(String openId, Long suId);
}

 zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java

@@ -275,4 +275,9 @@
    public SysUsers findByOpenId(String openId, Long companyId) {
        return sysUsersDao.selectUserByOpenId(openId, companyId);
    }

    @Override
    public int modifyUserOpenId(String openId, Long suId) {
        return sysUsersDao.updateUserOpenId(openId, suId);
    }
}

 zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml

@@ -1341,4 +1341,9 @@
        </if>
    </select>

    <update id="updateUserOpenId">
        update sys_users
        set open_ids=#{openId}
        where su_id=#{suId}
    </update>
</mapper>