1.优化

xianghan
Commit 6ee21062 ... 6ee21062d64c7a7ac00596e30d1b285e7c25c845 authored 2022-05-27 09:11:56 +0800 by xianghan
Showing 3 changed files with 62 additions and 35 deletions
member-service-impl/src/main/java/com/topdraw/business/process/domian/weixin/BindBean.java
member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
--- a/member-service-impl/src/main/java/com/topdraw/business/process/domian/weixin/BindBean.java
View file @6ee2106
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/domian/weixin/BindBean.java
View file @6ee2106
@@ -12,5 +12,7 @@ public class BindBean extends WeiXinUserBean {
    @NotNull(message = "platformAccount can't be null" , groups = {BindGroup.class})
    private String platformAccount;
+    private String memberCode;
 }
--- a/member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
View file @6ee2106
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
View file @6ee2106
@@ -198,10 +198,12 @@ public class UserOperationController {
        if (Objects.nonNull(iptvUserInfo)) {
            subscribeBean.setIptvUserInfo(iptvUserInfo);
+            Object sourceInfo1 = iptvUserInfo.get("sourceInfo");
-            String sourceInfo = iptvUserInfo.get("sourceInfo").toString();
+            if (Objects.nonNull(sourceInfo1)) {
-            if (StringUtils.isNotBlank(sourceInfo))
+                String sourceInfo = sourceInfo1.toString();
-                subscribeBean.setSourceInfo(sourceInfo);
+                if (StringUtils.isNotBlank(sourceInfo))
+                    subscribeBean.setSourceInfo(sourceInfo);
+            }
            String headimgurl = iptvUserInfo.get("headimgurl").toString();
            String nickname = iptvUserInfo.get("nickname").toString();
@@ -213,7 +215,8 @@ public class UserOperationController {
            if (StringUtils.isNotBlank(headimgurl)) {
                String headimgurlDecode = URLDecoder.decode(headimgurl, "UTF-8");
-                subscribeBean.setHeadimgurl(headimgurlDecode);
+                String headImgUrl = this.downloadWeixinImge(headimgurlDecode);
+                subscribeBean.setHeadimgurl(headImgUrl);
            }
        } else {
@@ -449,11 +452,16 @@ public class UserOperationController {
        log.info("UserOperationController ==> changeMainAccount ==>> param  ==> [{}]",resources);
        Long memberId = resources.getMemberId();
+        String memberCode = resources.getMemberCode();
+        if (StringUtils.isBlank(memberCode) && Objects.nonNull(memberId)) {
+            memberCode = this.memberService.findCodeById(memberId);
+        }
        String platformAccount = resources.getPlatformAccount();
-        String code = this.memberService.findCodeById(memberId);
+        if (StringUtils.isBlank(platformAccount))
+            throw new BadRequestException(GlobeExceptionMsg.IPTV_PLATFORM_ACCOUNT_IS_NULL);
        UserTv userTv = new UserTv();
-        userTv.setMemberCode(code);
+        userTv.setMemberCode(memberCode);
        userTv.setPlatformAccount(platformAccount);
        this.userOperationService.changeMainAccount(userTv);
--- a/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
View file @6ee2106
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
View file @6ee2106
@@ -411,10 +411,11 @@ public class UserOperationServiceImpl implements UserOperationService {
        String headImgUrl = resources.getHeadimgurl();
        // 小屏账户
-        UserWeixinDTO userWeixinDTO = this.findFirstByUnionIdAndAppIdAndOpenId(unionId,appId, openId);
+        UserWeixinDTO _userWeixinDTO = this.findFirstByUnionIdAndAppIdAndOpenId(unionId,appId, openId);
        MemberDTO memberDTO = null;
-        if (Objects.isNull(userWeixinDTO.getId())) {
+        if (Objects.isNull(_userWeixinDTO.getId()) || StringUtils.isBlank(_userWeixinDTO.getUnionid()) ||
+                Objects.isNull(_userWeixinDTO.getMemberId())) {
            UserWeixin userWeixin = new UserWeixin();
            BeanUtils.copyProperties(resources,userWeixin);
@@ -429,7 +430,7 @@ public class UserOperationServiceImpl implements UserOperationService {
        } else {
            // 修改微信账户关注状态
-            UserWeixinDTO _userWeixinDTO = this.doUpdateUserWeiXinStatus(userWeixinDTO, SUBSCRIBE_STATUS);
+            _userWeixinDTO = this.doUpdateUserWeiXinStatus(_userWeixinDTO, SUBSCRIBE_STATUS);
            // 小屏会员
            memberDTO = this.findMemberByAppIdAndOpenId(appId,openId);
@@ -448,22 +449,21 @@ public class UserOperationServiceImpl implements UserOperationService {
                }
            }
+        }
-            // 修改会员信息
+        // 修改会员信息
-            MemberDTO _memberDTO1 = this.doUpdateMemberByMemberDTO(memberDTO);
+        MemberDTO _memberDTO1 = this.doUpdateMemberByMemberDTO(memberDTO);
-            // 同步至iptv
+        // 同步至iptv
-            ((UserOperationServiceImpl)AopContext.currentProxy()).asyncSubscribe(new MemberAndWeixinUserDTO(_memberDTO1, _userWeixinDTO));
+        ((UserOperationServiceImpl)AopContext.currentProxy()).asyncSubscribe(new MemberAndWeixinUserDTO(_memberDTO1, _userWeixinDTO));
-            // 大屏信息
+        // 大屏信息
-            JSONObject iptvUserInfo = resources.getIptvUserInfo();
+        JSONObject iptvUserInfo = resources.getIptvUserInfo();
-            if (Objects.nonNull(iptvUserInfo)) {
+        if (Objects.nonNull(iptvUserInfo)) {
-                // 大屏账户
+            // 大屏账户
-                String platformAccount = iptvUserInfo.getString("platformAccount");
+            String platformAccount = iptvUserInfo.getString("platformAccount");
-                // 绑定
+            // 绑定
-                this.bind(memberDTO, platformAccount);
+            this.bind(memberDTO, platformAccount);
-            }
        }
@@ -663,7 +663,7 @@ public class UserOperationServiceImpl implements UserOperationService {
        String platformAccount = resources.getPlatformAccount();
        String memberCode = resources.getMemberCode();
-        this.memberService.findByCode(memberCode);
+        MemberDTO memberDTO = this.memberService.findByCode(memberCode);
        UserTvDTO userTvDTO = this.findByPlatformAccount(platformAccount);
        if (Objects.isNull(userTvDTO))
@@ -671,9 +671,15 @@ public class UserOperationServiceImpl implements UserOperationService {
        // 解绑（置空大屏信息）
        MemberDTO _memberDTO = this.minaUnbind_(this.findMemberByCode(memberCode));
+        if (Objects.isNull(_memberDTO)) {
+            _memberDTO = memberDTO;
+        }
        // 置空主账号
        UserTvDTO _userTvDTO = this.resetMainAccount(memberCode, userTvDTO.getId(), autoModel, bindMemberCode);
+        if (Objects.isNull(_userTvDTO)){
+            _userTvDTO = userTvDTO;
+        }
        // 同步至iptv
        ((UserOperationServiceImpl)AopContext.currentProxy()).asyncUnbind(new MemberAndUserTvDTO(_memberDTO, _userTvDTO));
@@ -1007,6 +1013,9 @@ public class UserOperationServiceImpl implements UserOperationService {
        // 大屏是否绑定主账号,如果绑定了主账户则不操作大屏账户表
        UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, memberDTO.getCode(), "auto");
+        if (Objects.isNull(_userTvDTO)) {
+            _userTvDTO = userTvDTO;
+        }
        // 修改会员
        MemberDTO _memberDTO = this.doUpdateMemberByMemberDTO(memberDTO);
@@ -1176,22 +1185,30 @@ public class UserOperationServiceImpl implements UserOperationService {
            if (StringUtils.isBlank(bindMemberCode)) {
-                // 有其他绑定的小程序会员
+                // 有其他绑定的小程序会员，排除自己
                List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(id);
                if (!CollectionUtils.isEmpty(memberDTOList)) {
-                    // 按绑定时间倒排
+                    List<MemberDTO> collect =
-                    memberDTOList.sort(new Comparator<MemberDTO>() {
+                            memberDTOList.stream().filter(memberDTO ->
-                        @Override
+                                    !memberDTO.getCode().equalsIgnoreCase(memberCode)).collect(Collectors.toList());
-                        public int compare(MemberDTO memberDTO, MemberDTO t1) {
-                            return t1.getBindIptvTime().compareTo(memberDTO.getBindIptvTime());
-                        }
-                    });
-                    // 绑定新的主账号
+                    if (!CollectionUtils.isEmpty(collect)) {
-                    UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, memberDTOList.get(0).getCode(), "manual");
-                    return _userTvDTO;
+                        // 按绑定时间倒排
+                        collect.sort(new Comparator<MemberDTO>() {
+                            @Override
+                            public int compare(MemberDTO memberDTO, MemberDTO t1) {
+                                return t1.getBindIptvTime().compareTo(memberDTO.getBindIptvTime());
+                            }
+                        });
+                        // 绑定新的主账号
+                        UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, memberDTOList.get(0).getCode(), "manual");
+                        return _userTvDTO;
+                    }
                } else {