提交

jiangping

2024-07-16 b0b94a084ed6c1a685caebb8dfb1a0d65fdd9ef6

提交

 server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java

@@ -19,6 +19,6 @@
    private String token;
    private String openId;
    @ApiModelProperty(value = "用户主键" , hidden = true)
    private Long userId;
    private String userId;

}

 server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBindCusFavoriteDoRequest.java

@@ -15,13 +15,13 @@
     */
    private List<String> articleIds;
    /**
     * 用户ID
     */
//    private String userId;
    /**
     * OpenID
     */
    private String openId;
    /**
     * 用户ID
     */
    private String userId;


}

 server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java

@@ -133,9 +133,7 @@
        g2.drawRect(0, 0, width - 1, height - 1);
        InputStream inputStream = bufferedImageToInputStream(bi);
        return inputStream;
//        String fileName = "8701EAC36DEC405A94C530F0E6796589.jpg"; //ID.nextGUID() + ".jpg";
//        GeneratePicUtil.saveFile(inputStream, filePath+ File.separator+fileName);
//        return filePath + File.separator+ fileName;

    }

    public  static MultipartFile getMultipartFile(InputStream inputStream, String fileName) {

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

@@ -146,7 +146,7 @@
    @Override
    public ZTContentInfoResponse getContentInfo(String id,String userType,Long userId){
        //查询 中台 TOKEN
        String token = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
        String token = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId.toString(),userType);
        ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
        ztContentListRequest.setToken(token);
        ztContentListRequest.setUserType(userType);

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

@@ -317,7 +317,7 @@
    public void updMemberDetail(EditMemberRequest editMemberRequest){
        Member member = memberMapper.selectById(editMemberRequest.getMemberId());
        ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new  ZTUserInfoUpdateRequest();
        ztUserInfoUpdateRequest.setOpenid(member.getOpenid());
        ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
        String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
        ztUserInfoUpdateRequest.setAppId(appId);
        ztUserInfoUpdateRequest.setPlatform(Constants.PLATFORM);
@@ -373,7 +373,7 @@



    public static String getZTToken(ZbomZhongTaiService zbomZhongTaiService, MemberMapper memberMapper, UsersMapper usersMapper, SystemDictDataBiz systemDictDataBiz, Long id, String userType){
    public static String getZTToken(ZbomZhongTaiService zbomZhongTaiService, MemberMapper memberMapper, UsersMapper usersMapper, SystemDictDataBiz systemDictDataBiz, String id, String userType){
        if(userType.equals(Constants.CUSTOMER)){
            Member member = memberMapper.selectById(id);
            if(Objects.isNull(member)){
@@ -439,11 +439,11 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已注销");
        }
        //校验用户token信息
        MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),Constants.CUSTOMER);
        MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId().toString(),Constants.CUSTOMER);
        //调起中台注销接口
        ZTBaseRequst ztBaseRequst = new ZTBaseRequst();
        ztBaseRequst.setUserType(Constants.CUSTOMER);
        ztBaseRequst.setOpenid(member.getOpenid());
        ztBaseRequst.setOpenId(member.getOpenid());
        ztBaseRequst.setToken(member.getToken());
        Boolean logoutFlag = zbomZhongTaiService.userLogout(ztBaseRequst);
        if(logoutFlag){