代码提交

k94314517

2024-08-01 b5c218b2ed749a3e710c92c4770759773de4fc0c

代码提交

 server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java

@@ -102,13 +102,13 @@
                throw new BusinessException(ResponseStatus.DATA_EMPTY);
            }
            if(Objects.isNull(member.getOpenid())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已注销,请重新登录");
                throw new BusinessException(ResponseStatus.USER_DISABLE_TIME.getCode(),"用户已注销,请重新登录");
            }
            if(Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
                throw new BusinessException(ResponseStatus.USER_DISABLE_TIME.getCode(),"用户已删除,请联系管理员");
            }
            if(!Constants.equalsInteger(member.getStatus(),Constants.ZERO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
                throw new BusinessException(ResponseStatus.USER_DISABLE_TIME.getCode(),"用户已禁用,请联系管理员");
            }
            request.setAttribute(JwtTokenUtil.UserId_Name, memberId);
            request.setAttribute(JwtTokenUtil.UserType, ZTConstants.CUSTOMER);
@@ -132,10 +132,10 @@
                throw new BusinessException(ResponseStatus.DATA_EMPTY);
            }
            if(Constants.equalsInteger(users.getIsdeleted(),Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
                throw new BusinessException(ResponseStatus.USER_DISABLE_TIME.getCode(),"用户已删除,请联系管理员");
            }
            if(!StringUtils.equals(users.getStatus(),Constants.ONE+"")){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
                throw new BusinessException(ResponseStatus.USER_DISABLE_TIME.getCode(),"用户状态异常,请重新登录");
            }
            request.setAttribute(JwtTokenUtil.UserId_Name, userId);
            request.setAttribute(JwtTokenUtil.UserType, ZTConstants.BUSINESS);

 server/service/src/main/java/com/doumee/core/constants/ResponseStatus.java

@@ -26,6 +26,7 @@
    MASSIVE_REQUEST(5101, "请求过于频繁"),
    NOT_ALLOWED(5110, "不允许的操作"),
    TOKEN_EXCEED_TIME(5111, "TOKEN过期"),
    USER_DISABLE_TIME(5112, "用户已禁用"),
    NO_LOGIN(5112, "未登录"),
    ;


 server/service/src/main/java/com/doumee/dao/web/reqeust/WxPhoneRequest.java

@@ -29,4 +29,6 @@
    @ApiModelProperty(value = "sessionKey")
    private String sessionKey;

    @ApiModelProperty(value = "openid")
    private String openid;
}

 server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java

@@ -504,7 +504,6 @@
    public void batchAddLike(ZTBatchAddListRequest ztBatchAddListRequest){
        if(Objects.isNull(ztBatchAddListRequest)
                || StringUtils.isBlank(ztBatchAddListRequest.getArticleIds())
                || StringUtils.isBlank(ztBatchAddListRequest.getCustomerId())
                || StringUtils.isBlank(ztBatchAddListRequest.getPlatSourceId())
                || StringUtils.isBlank(ztBatchAddListRequest.getPlatSource())
        ){

 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -357,13 +357,75 @@
            return accountResponse;
    }

    public static void saveCustomerUser(ZbomZhongTaiService zbomZhongTaiService,CustomerUserMapper customerUserMapper,Users users,Member member){
        if(Objects.nonNull(users)&&Objects.nonNull(member.getId())) {
            CustomerUser customerUser = null;
            if (customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda()
//    public static void saveCustomerUser(ZbomZhongTaiService zbomZhongTaiService,CustomerUserMapper customerUserMapper,Users users,Member member){
//        if(Objects.nonNull(users)&&Objects.nonNull(member.getId())) {
//            CustomerUser customerUser = null;
//            if (customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda()
//                    .eq(CustomerUser::getIsdeleted, Constants.ZERO)
//                    .eq(CustomerUser::getUserId, users.getId())
//                    .eq(CustomerUser::getMemberId, member.getId())
//            ) <= Constants.ZERO) {
//                customerUser = new CustomerUser();
//                customerUser.setIsdeleted(Constants.ZERO);
//                customerUser.setUserId(users.getId());
//                customerUser.setCreateDate(new Date());
//                customerUser.setMemberId(member.getId());
//                customerUser.setPhone(users.getPhone());
//                customerUser.setIamUserId(users.getIamId());
//                customerUser.setName(users.getName());
//                customerUser.setUsername(users.getIamUsername());
//                customerUser.setAddr(users.getShopAddress());
//            }
//            //等待调起中台接口
//            ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest = new ZTCustomerBindingUsersRequest();
//            ztCustomerBindingUsersRequest.setName(member.getName());
//            ztCustomerBindingUsersRequest.setNickName(member.getNickname());
//            ztCustomerBindingUsersRequest.setPhone(member.getPhone());
//            ztCustomerBindingUsersRequest.setAvatarUrl(member.getImgurl());
//            ztCustomerBindingUsersRequest.setUptown(member.getDistrict());
//            ztCustomerBindingUsersRequest.setFullAddress(member.getAddress());
//            if(Objects.nonNull(member.getHousearea())){
//                ztCustomerBindingUsersRequest.setHouseArea(member.getHousearea().toString());
//            }
//            ztCustomerBindingUsersRequest.setOpenId(member.getOpenid());
//            ztCustomerBindingUsersRequest.setToken(member.getToken());
//            ztCustomerBindingUsersRequest.setUserType(ZTConstants.CUSTOMER);
//            ztCustomerBindingUsersRequest.setSourceCustomerId(member.getId().toString());
//            ztCustomerBindingUsersRequest.setDaoGouUserId(users.getIamId());
//            ztCustomerBindingUsersRequest.setDaoGouAccount(users.getIamUsername());
//            ztCustomerBindingUsersRequest.setPlatSource("2");
//            ZTBaseResponse ztBaseResponse = zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
//            if(Objects.nonNull(customerUser)){
//                if(Objects.nonNull(ztBaseResponse)){
//                    if(ztBaseResponse.getSuccess()){
//                        customerUser.setZtStatus(1);
//                        customerUser.setZtDate(new Date());
//                    }else{
//                        customerUser.setZtStatus(2);
//                        customerUser.setZtDate(new Date());
//                        customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
//                    }
//                } else{
//                    customerUser.setZtStatus(2);
//                    customerUser.setZtDate(new Date());
//                    customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
//                }
//                customerUserMapper.insert(customerUser);
//            }
//        }
//    }


    public static void saveCustomerUser(ZbomZhongTaiService zbomZhongTaiService, CustomerUserMapper customerUserMapper, Users users, Member member) {
        if (Objects.nonNull(users) && Objects.nonNull(member.getId())) {
            CustomerUser customerUser = customerUserMapper.selectOne(new QueryWrapper<CustomerUser>().lambda()
                    .eq(CustomerUser::getIsdeleted, Constants.ZERO)
                    .eq(CustomerUser::getUserId, users.getId())
                    .eq(CustomerUser::getMemberId, member.getId())) <= Constants.ZERO) {
                    .eq(CustomerUser::getMemberId, member.getId())
                    .orderByDesc(CustomerUser::getCreateDate)
                    .last(" limit 1")
            );
            if (Objects.isNull(customerUser)) {
                customerUser = new CustomerUser();
                customerUser.setIsdeleted(Constants.ZERO);
                customerUser.setUserId(users.getId());
@@ -375,46 +437,71 @@
                customerUser.setUsername(users.getIamUsername());
                customerUser.setAddr(users.getShopAddress());
            }
            //等待调起中台接口
            ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest = new ZTCustomerBindingUsersRequest();
            ztCustomerBindingUsersRequest.setName(member.getName());
            ztCustomerBindingUsersRequest.setNickName(member.getNickname());
            ztCustomerBindingUsersRequest.setPhone(member.getPhone());
            ztCustomerBindingUsersRequest.setAvatarUrl(member.getImgurl());
            ztCustomerBindingUsersRequest.setUptown(member.getDistrict());
            ztCustomerBindingUsersRequest.setFullAddress(member.getAddress());
            if(Objects.nonNull(member.getHousearea())){
                ztCustomerBindingUsersRequest.setHouseArea(member.getHousearea().toString());
            }
            ztCustomerBindingUsersRequest.setOpenId(member.getOpenid());
            ztCustomerBindingUsersRequest.setToken(member.getToken());
            ztCustomerBindingUsersRequest.setUserType(ZTConstants.CUSTOMER);
            ztCustomerBindingUsersRequest.setSourceCustomerId(member.getId().toString());
            ztCustomerBindingUsersRequest.setDaoGouUserId(users.getIamId());
            ztCustomerBindingUsersRequest.setDaoGouAccount(users.getIamUsername());
            ztCustomerBindingUsersRequest.setPlatSource("2");
            ZTBaseResponse ztBaseResponse = zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
            if(Objects.nonNull(customerUser)){
                if(Objects.nonNull(ztBaseResponse)){
                    if(ztBaseResponse.getSuccess()){
            //未绑定过
            if (Objects.isNull(customerUser.getId())) {
                ZTBaseResponse ztBaseResponse = MemberServiceImpl.syncZtCustomerUser(zbomZhongTaiService,member, users);
                if (Objects.nonNull(ztBaseResponse)) {
                    if (ztBaseResponse.getSuccess()) {
                        customerUser.setZtStatus(1);
                        customerUser.setZtDate(new Date());
                    }else{
                    } else {
                        customerUser.setZtStatus(2);
                        customerUser.setZtDate(new Date());
                        customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
                    }
                } else{
                } else {
                    customerUser.setZtStatus(2);
                    customerUser.setZtDate(new Date());
                    customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
                }
                customerUserMapper.insert(customerUser);
            } else {
                if (!Constants.equalsInteger(customerUser.getZtStatus(),Constants.ONE)) {
                    ZTBaseResponse ztBaseResponse = MemberServiceImpl.syncZtCustomerUser(zbomZhongTaiService,member, users);
                    if (Objects.nonNull(ztBaseResponse)) {
                        if (ztBaseResponse.getSuccess()) {
                            customerUser.setZtStatus(1);
                            customerUser.setZtDate(new Date());
                        } else {
                            customerUser.setZtStatus(2);
                            customerUser.setZtDate(new Date());
                            customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
                        }
                    } else {
                        customerUser.setZtStatus(2);
                        customerUser.setZtDate(new Date());
                        customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
                    }
                    customerUserMapper.updateById(customerUser);
                }
            }
        }
    }


    public  static ZTBaseResponse syncZtCustomerUser(ZbomZhongTaiService zbomZhongTaiService,Member member,Users users){
        //等待调起中台接口
        ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest = new ZTCustomerBindingUsersRequest();
        ztCustomerBindingUsersRequest.setName(member.getName());
        ztCustomerBindingUsersRequest.setNickName(member.getNickname());
        ztCustomerBindingUsersRequest.setPhone(member.getPhone());
        ztCustomerBindingUsersRequest.setAvatarUrl(member.getImgurl());
        ztCustomerBindingUsersRequest.setUptown(member.getDistrict());
        ztCustomerBindingUsersRequest.setFullAddress(member.getAddress());
        if(Objects.nonNull(member.getHousearea())){
            ztCustomerBindingUsersRequest.setHouseArea(member.getHousearea().toString());
        }
        ztCustomerBindingUsersRequest.setOpenId(member.getOpenid());
        ztCustomerBindingUsersRequest.setToken(member.getToken());
        ztCustomerBindingUsersRequest.setUserType(ZTConstants.CUSTOMER);
        ztCustomerBindingUsersRequest.setSourceCustomerId(member.getId().toString());
        ztCustomerBindingUsersRequest.setDaoGouUserId(users.getIamId());
        ztCustomerBindingUsersRequest.setDaoGouAccount(users.getIamUsername());
        ztCustomerBindingUsersRequest.setPlatSource("2");
        ZTBaseResponse ztBaseResponse = zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
        return ztBaseResponse;
    }

    @Override
    public String getWxMiniPhone(WxPhoneRequest wxPhoneRequest){
        try {

 server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java

@@ -445,6 +445,13 @@
            accountResponse.setPhone( Constants.desensitizationPhone(phone));
            if(Objects.isNull(users)){
                return accountResponse;
            }else{
                if(StringUtils.isNotBlank(wxPhoneRequest.getOpenid())){
                    usersMapper.update(null,new UpdateWrapper<Users>().lambda().set(Users::getOpenid,null)
                            .eq(Users::getOpenid,wxPhoneRequest.getOpenid()));
                    users.setOpenid(wxPhoneRequest.getOpenid());
                    usersMapper.updateById(users);
                }
            }
            accountResponse.setUsers(users);
            String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.BUSINESS,JSONObject.toJSON(users).toString(),redisTemplate);