Pu Zhibing
2024-12-27 6c0d8fb2db64b8982c4162c7527e72841547110b
UserAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -215,7 +215,7 @@
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/ad02d59ae74342359270f62a024fa9c6.png");
            userInfo.setAvatar("https://anhenew.obs.cn-north-4.myhuaweicloud.com/admin/cca63b23e3a84c89a01e5204c1819497.png");
            //用户所属企业
            if(null != registAreaCode){
@@ -284,8 +284,7 @@
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/ad02d59ae74342359270f62a024fa9c6.png");
            userInfo.setAvatar("https://anhenew.obs.cn-north-4.myhuaweicloud.com/admin/cca63b23e3a84c89a01e5204c1819497.png");
            this.insert(userInfo);
@@ -402,7 +401,7 @@
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/ad02d59ae74342359270f62a024fa9c6.png");
            userInfo.setAvatar("https://anhenew.obs.cn-north-4.myhuaweicloud.com/admin/cca63b23e3a84c89a01e5204c1819497.png");
            //用户所属企业
            if(null != registAreaCode){
@@ -826,7 +825,13 @@
     * @throws Exception
     */
    @Override
    public Map<String, Object> queryUserInfo(Integer uid) throws Exception {
    public Map<String, Object> queryUserInfo(String code, Integer uid) throws Exception {
        Map<String, String> map = weChatUtil.code2Session(code);
        UserInfo userInfo = userInfoMapper.selectById(uid);
        if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
            userInfo.setAppletsOpenId(map.get("openid"));
            userInfoMapper.updateById(userInfo);
        }
        return userInfoMapper.queryUserInfo(uid, null);
    }
@@ -1272,7 +1277,7 @@
     */
    public String getDefaultName(){
        int num = this.selectCount(new EntityWrapper<UserInfo>().ne("flag", 3)) + 1000001;
        return "HQ" + String.valueOf(num).substring(1);
        return "AH" + String.valueOf(num).substring(1);
    }
@@ -1312,7 +1317,7 @@
     */
    private synchronized void addCoupon(UserInfo userInfo) throws Exception{
        //添加优惠券
        List<Map<String, Object>> list = userActivityRegisteredService.query(userInfo.getCompanyId());
        List<Map<String, Object>> list = userActivityRegisteredService.query(null == userInfo.getCompanyId() ? 1 : userInfo.getCompanyId());
        int num = 0;
        for(Map<String, Object> map : list){
            if(null != map){