代码提交

k94314517

2024-07-18 39f561130fdd53bdc385e4cae9595e0db0f76c66

代码提交

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

@@ -16,6 +16,16 @@
     * OpenID
     */
    private String openId;
    /**
     * collect
     * collect_cancel
     * like
     * like_cancel
     * view
     * share
     * download
     */
    private String actionType;


}

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

@@ -32,6 +32,17 @@
        String VIDEO_REC ="video_rec";
        String REAL_CASE ="real_case";
    }

    public interface ActionType{
        String COLLECT ="collect";
        String COLLECT_CANCEL ="collect_cancel";
        String LIKE ="like";
        String LIKE_CANCEL ="like_cancel";
        String VIEW ="view";
        String SHARE ="share";
        String DOWNLOAD ="download";
    }

    public interface IntegerUrl{
        String USER_UPDATE_URL ="/customer/api/sync";
        String USER_GET_TOKEN_URL ="/customer/api/login";
@@ -40,7 +51,8 @@
        String TAG_LIST_URL ="/content/api/tag";
        String CONTENT_LIST_URL ="/content/api/page";
        String CONTENT_INFO_URL ="/content/api/detail/";
        String COLLECT_DO_URL ="/content/api/collect";
//        String COLLECT_DO_URL ="/content/api/collect";
        String COLLECT_DO_URL ="/content/api/addAction";
        String VIEW_DO_URL ="/content/api/view";
        String SHARE_DO_URL ="/content/api/share";
        String LIKE_DO_URL ="/content/api/like";

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

@@ -33,25 +33,13 @@
    @ApiModelProperty(value = "发布组织")
    private String publishDepartment;

    @ApiModelProperty(value = "内容打开方式(内部页面page、视频video、富文本text、外部链接link)\n")
    private String openType;

    @ApiModelProperty(value = "内部页面地址")
    private String pageUrl;

    @ApiModelProperty(value = "视频链接")
    private String videoUrl;

    @ApiModelProperty(value = "富文本内容")
    private String content;

    @ApiModelProperty(value = "外部链接")
    private String linkUrl;

    @ApiModelProperty(value = "封面图片")
    private String coverImage;

    @ApiModelProperty(value = "关联产品类型名称")
    private String infoProTypeName;
    @ApiModelProperty(value = "内容打开方式(内部页面page、视频video、富文本text、外部链接link)")
    private String openType;

    @ApiModelProperty(value = "跳转内容")
    private String openContent;

}

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

@@ -23,13 +23,13 @@
    private String content;
    private String coverImage;
    private String id;
    private String isCollection;
    private Boolean isCollection;
    private String langCode;
    /**
     * äº§å“å‚数列表
     */
    private List<ZTProductParamInfoResponse> productParamList;
    private String publishDate;
    private String publishDt;
    private String publishDepartment;
    /**
     * å®žæ™¯å›¾åˆ—表
@@ -49,4 +49,7 @@
    private String shareCount;
    private String sort;
    private String type;
    private String video;
    private String intro;

}

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

@@ -23,7 +23,7 @@
    private String content;
    private String coverImage;
    private String id;
    private String isCollection;
    private Boolean isCollection;
    private String langCode;
    /**
     * äº§å“å‚数列表
@@ -49,4 +49,6 @@
    private String shareCount;
    private String sort;
    private String type;
    private String contentType;

}

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

@@ -25,7 +25,7 @@
    /**
     * å‘布日期
     */
    private String publishDate;
    private String publishDt;
    /**
     * æ ‡é¢˜
     */

 server/service/src/main/java/com/doumee/core/wx/AccessToken.java

ÎļþÒÑɾ³ý

 server/service/src/main/java/com/doumee/core/wx/TemplateData.java

ÎļþÒÑɾ³ý

 server/service/src/main/java/com/doumee/core/wx/WXConstant.java

ÎļþÒÑɾ³ý

 server/service/src/main/java/com/doumee/core/wx/WxMiniUtilService.java

ÎļþÒÑɾ³ý

 server/service/src/main/java/com/doumee/core/wx/WxMsgVO.java

ÎļþÒÑɾ³ý

 server/service/src/main/java/com/doumee/core/wx/WxPayProperties.java

ÎļþÒÑɾ³ý

 server/service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConfig.java

ÎļþÒÑɾ³ý

 server/service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java

ÎļþÒÑɾ³ý

 server/service/src/main/java/com/doumee/dao/business/model/Shop.java

@@ -244,6 +244,10 @@
    @TableField(exist = false)
    private BigDecimal distance;

    @ApiModelProperty(value = "距离显示", example = "1")
    @TableField(exist = false)
    private String distanceStr;

    @ApiModelProperty(value = "门店导购列表 ", example = "1")
    @TableField(exist = false)
    private List<Users> usersList;

 server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java

@@ -27,60 +27,12 @@
    List<ZTTagInfoResponse> getCataLogTagList(ZTCatalogListRequest param);

    /**
     * çˆ¶å­çº§åˆ†ç±»æ•°æ®  åˆ†ç±»+标签
     * @param ztCatalogListRequest
     * @return
     */
//    List<ZTCatalogInfoResponse> getZTCatalogInfoResponse(ZTCatalogListRequest ztCatalogListRequest);

    /**
     * å†…容分页
     * @param ztContentListRequest
     * @return
     */
    ZTBasePageResponse<ZTContentListResponse> pageContentList(ZTContentListRequest ztContentListRequest);

    /**
     * å†…容详情
     * @param id  ä¸šåŠ¡ä¸»é”®
     * @param userType ç”¨æˆ·ç±»åž‹
     * @param userId ç”¨æˆ·ä¸»é”®
     * @return
     */
    ZTContentInfoResponse getContentInfo(String id, String userType, Long userId);

    /**
     * æ”¶è—ä¸šåŠ¡
     * è¡Œä¸ºä¸šåŠ¡æŽ¥å£
     * @param userId
     * @param userType
     * @param articleId
     */
    void collectContent(Long userId,String userType,String articleId);

    /**
     * å–œæ¬¢ä¸šåŠ¡
     * @param userId
     * @param userType
     * @param articleId
     */
    void likeContent(Long userId,String userType,String articleId);

    /**
     * å†…容分享
     * @param userId
     * @param userType
     * @param articleId
     */
    void shareContent(Long userId,String userType,String articleId);


    /**
     * å†…容浏览
     * @param userId
     * @param userType
     * @param articleId
     */
    void viewContent(Long userId,String userType,String articleId);
    void actionDo(Long userId,String userType,String articleId,String actionType);

    /**
     * æ³¨é”€ç”¨æˆ·
@@ -115,4 +67,84 @@
     * @return
     */
    ZTCusCarouselImageResponse getZhongTaiCarouselImageDetail(ZTDataDetailRequest ztDataDetailRequest);

    /**
     * ä¸­å° å’¨è¯¢åˆ—表接口
     * @param ztContentListRequest
     * @return
     */
    ZTBasePageResponse<ZTProductNewsInfoResponse> getZhongTaiProductNewsPage(ZTContentListRequest ztContentListRequest);

    /**
     * ä¸­å° äº§å“åˆ—表接口
     * @param ztContentListRequest
     * @return
     */
    ZTBasePageResponse<ZTProductInfoResponse> getZhongTaiProductPage(ZTContentListRequest ztContentListRequest);

    /**
     * ä¸­å° å®žæ™¯æ¡ˆä¾‹æŽ¥å£
     * @param ztContentListRequest
     * @return
     */
    ZTBasePageResponse<ZTRealcaseInfoResponse> getZhongTaiRealcasePage(ZTContentListRequest ztContentListRequest);

    /**
     * ä¸­å° è§†é¢‘列表分页
     * @param ztContentListRequest
     * @return
     */
    ZTBasePageResponse<ZTVideoInfoResponse> getZhongTaiVideoPage(ZTContentListRequest ztContentListRequest);

    /**
     * ä¸­å° å…¨å±‹æ¡ˆä¾‹åˆ—表分页
     * @param ztContentListRequest
     * @return
     */
    ZTBasePageResponse<ZTCaseInfoResponse> getZhongTaiWholecasePage(ZTContentListRequest ztContentListRequest);

    /**
     * ä¸­å° å¿—说装修
     * @param ztContentListRequest
     * @return
     */
    ZTBasePageResponse<ZTZbDecoInfoResponse> getZhongTaiZbDecoPage(ZTContentListRequest ztContentListRequest);


    /**
     * ä¸­å° - äº§å“è¯¦æƒ…
     * @param id
     * @param userType
     * @param userId
     * @return
     */
    ZTProductInfoResponse getProductInfo(String id,String userType,Long userId);

    /**
     * ä¸­å° - å…¨å±‹èµ„讯详情
     * @param id
     * @param userType
     * @param userId
     * @return
     */
    ZTCaseInfoResponse getWholecaseInfo(String id,String userType,Long userId);

    /**
     * ä¸­å° - äº§å“èµ„讯详情
     * @param id
     * @param userType
     * @param userId
     * @return
     */
    ZTProductNewsInfoResponse getProductNewsInfo(String id,String userType,Long userId);

    /**
     * ä¸­å° - å®žæ™¯æ¡ˆä¾‹
     * @param id
     * @param userType
     * @param userId
     * @return
     */
    ZTRealcaseInfoResponse getRealcaseInfo(String id,String userType,Long userId);

}

 server/service/src/main/java/com/doumee/service/business/MemberService.java

@@ -105,7 +105,7 @@
     * @param code
     * @return
     */
    AccountResponse wxLogin(String code);
    AccountResponse wxLogin(String code,String iamId);

    /**
     * èŽ·å–手机号

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

@@ -122,7 +122,6 @@
        QueryWrapper<CustomerLog> wrapper = new QueryWrapper<>(customerLog);
        return customerLogMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<CustomerLog> findPage(PageWrap<CustomerLog> pageWrap) {
        IPage<CustomerLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -133,6 +132,104 @@
                            .eq(CustomerLog::getIsdeleted, Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getType()),CustomerLog::getType, pageWrap.getModel().getType())
                .eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Customer::getMemberId, pageWrap.getModel().getMemberId());

        if (pageWrap.getModel().getId() != null) {
            queryWrapper.eq(CustomerLog::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.eq(CustomerLog::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.ge(CustomerLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.le(CustomerLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.eq(CustomerLog::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.ge(CustomerLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.le(CustomerLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.eq(CustomerLog::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.eq(CustomerLog::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getOrderDate() != null) {
            queryWrapper.eq(CustomerLog::getOrderDate, pageWrap.getModel().getOrderDate());
        }
        if (pageWrap.getModel().getPlaDate() != null) {
            queryWrapper.eq(CustomerLog::getPlaDate, pageWrap.getModel().getPlaDate());
        }
        if (pageWrap.getModel().getDesignType() != null) {
            queryWrapper.eq(CustomerLog::getDesignType, pageWrap.getModel().getDesignType());
        }
        if (pageWrap.getModel().getHouseStatus() != null) {
            queryWrapper.eq(CustomerLog::getHouseStatus, pageWrap.getModel().getHouseStatus());
        }
        if (pageWrap.getModel().getDistrict() != null) {
            queryWrapper.eq(CustomerLog::getDistrict, pageWrap.getModel().getDistrict());
        }
        if (pageWrap.getModel().getArea() != null) {
            queryWrapper.eq(CustomerLog::getArea, pageWrap.getModel().getArea());
        }
        if (pageWrap.getModel().getInfo() != null) {
            queryWrapper.eq(CustomerLog::getInfo, pageWrap.getModel().getInfo());
        }
        if (pageWrap.getModel().getCostomerId() != null) {
            queryWrapper.eq(CustomerLog::getCostomerId, pageWrap.getModel().getCostomerId());
        }
        if (pageWrap.getModel().getHouseType() != null) {
            queryWrapper.eq(CustomerLog::getHouseType, pageWrap.getModel().getHouseType());
        }
        if (pageWrap.getModel().getSex() != null) {
            queryWrapper.eq(CustomerLog::getSex, pageWrap.getModel().getSex());
        }
        if (pageWrap.getModel().getAgeInfo() != null) {
            queryWrapper.eq(CustomerLog::getAgeInfo, pageWrap.getModel().getAgeInfo());
        }
        if (pageWrap.getModel().getStyleInfo() != null) {
            queryWrapper.eq(CustomerLog::getStyleInfo, pageWrap.getModel().getStyleInfo());
        }
        if (pageWrap.getModel().getProvinceName() != null) {
            queryWrapper.like(CustomerLog::getProvinceName, pageWrap.getModel().getProvinceName());
        }
        if (pageWrap.getModel().getCityName() != null) {
            queryWrapper.like(CustomerLog::getCityName, pageWrap.getModel().getCityName());
        }
        if (pageWrap.getModel().getProvicneCode() != null) {
            queryWrapper.eq(CustomerLog::getProvicneCode, pageWrap.getModel().getProvicneCode());
        }
        if (pageWrap.getModel().getCityCode() != null) {
            queryWrapper.eq(CustomerLog::getCityCode, pageWrap.getModel().getCityCode());
        }
        if (pageWrap.getModel().getPhone() != null) {
            queryWrapper.like(CustomerLog::getPhone, pageWrap.getModel().getPhone());
        }
        if (pageWrap.getModel().getType() != null) {
            queryWrapper.eq(CustomerLog::getType, pageWrap.getModel().getType());
        }
        if (pageWrap.getModel().getBudget() != null) {
            queryWrapper.eq(CustomerLog::getBudget, pageWrap.getModel().getBudget());
        }
        if (pageWrap.getModel().getCrmStatus() != null) {
            queryWrapper.eq(CustomerLog::getCrmStatus, pageWrap.getModel().getCrmStatus());
        }
        if (pageWrap.getModel().getCrmDate() != null) {
            queryWrapper.ge(CustomerLog::getCrmDate, Utils.Date.getStart(pageWrap.getModel().getCrmDate()));
            queryWrapper.le(CustomerLog::getCrmDate, Utils.Date.getEnd(pageWrap.getModel().getCrmDate()));
        }
        if (pageWrap.getModel().getCrmInfo() != null) {
            queryWrapper.eq(CustomerLog::getCrmInfo, pageWrap.getModel().getCrmInfo());
        }
        if (pageWrap.getModel().getQueryStartDate() != null) {
            queryWrapper.ge(CustomerLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getQueryStartDate()));
        }
        if (pageWrap.getModel().getQueryEndDate() != null) {
            queryWrapper.le(CustomerLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getQueryEndDate()));
        }

        queryWrapper.orderByDesc(CustomerLog::getCreateDate);
        PageData<CustomerLog> pageData = PageData.from(customerLogMapper.selectJoinPage(page,CustomerLog.class, queryWrapper));
        for (CustomerLog customerLog:pageData.getRecords()) {

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

@@ -60,14 +60,6 @@
        || StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(!(ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CHANPING)
            ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZIXUN)
            ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.QW_CASE)
                ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CAROUSEL_AD)
                ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.VIDEO_REC)
                ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.REAL_CASE))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"分类信息错误");
        }
        return zbomZhongTaiService.getCatalogList(ztCatalogListRequest);
    }

@@ -82,117 +74,15 @@
    }


    /**
     *  èŽ·å–父子级结构数据列表
     * å¿—说装修 zb_deco äº§å“ product_intro èµ„讯product_info å…¨å±‹æ¡ˆä¾‹ whole_case
     * èŽ·å–父子级结构数据
     * @return
     */
   /* @Override
    public List<ZTCatalogInfoResponse> getZTCatalogInfoResponse(ZTCatalogListRequest ztCatalogListRequest){
        if(Objects.isNull(ztCatalogListRequest)
                || StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU)
                ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CHANPING)
                ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZIXUN)
                ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.QW_CASE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"分类信息错误");
        }
        List<ZTCatalogInfoResponse>  ztCatalogInfoResponseList = zbomZhongTaiService.getCatalogList(ztCatalogListRequest);
        if(CollectionUtils.isNotEmpty(ztCatalogInfoResponseList)){
            for (ZTCatalogInfoResponse ztCatalogInfoResponse:ztCatalogInfoResponseList) {
                ZTCatalogListRequest ztCatalogTagListRequest = new ZTCatalogListRequest();
                ztCatalogTagListRequest.setCatalogCode(ztCatalogInfoResponse.getCode());
                List<ZTTagInfoResponse> ztTagInfoResponseList = zbomZhongTaiService.getTagList(ztCatalogTagListRequest);
                if(CollectionUtils.isNotEmpty(ztCatalogInfoResponseList)){
                    ztCatalogInfoResponse.setChildTagList(ztTagInfoResponseList);
                }
            }
        }
        return ztCatalogInfoResponseList;
    }*/


    /**
     * å†…容 åˆ†é¡µæ•°æ®
     * @param ztContentListRequest
     * @return
     */
    @Override
    public ZTBasePageResponse<ZTContentListResponse> pageContentList(ZTContentListRequest ztContentListRequest){
        if(Objects.isNull(ztContentListRequest)
            || Objects.isNull(ztContentListRequest.getPageNum())
            || Objects.isNull(ztContentListRequest.getPageSize())
            || StringUtils.isBlank(ztContentListRequest.getCatalogCode())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询 ä¸­å°
        ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
                Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ZTBasePageResponse<ZTContentListResponse> response = zbomZhongTaiService.pageContentList(ztContentListRequest);

        List<ZTContentListResponse> ztContentListResponseList = new ArrayList<>();

        ZTContentListResponse ztContentListResponse = new ZTContentListResponse();
        ztContentListResponse.setAuthor("测试人员");
        ztContentListResponse.setCoverImage("https://yjszhfn.jiangsu-10.zos.ctyun.cn/news/20240711/16f0490c-3ab1-4b66-aad8-be167476572c.jpg");
        ztContentListResponse.setFavoriteCount(1998);
        ztContentListResponse.setLikeCount(2223);
        ztContentListResponse.setPublishDepartment("测试组织");
        ztContentListResponse.setReadCount(10209);
        ztContentListResponse.setId("1");
        ztContentListResponse.setTitle("我是标题你好啊");
        ztContentListResponse.setSubtitle("我是副标题你们好啊");
        if(CollectionUtils.isNotEmpty(response.getRecords())){
            ztContentListResponseList.add(ztContentListResponse);
            response.setRecords(ztContentListResponseList);
        }else{
            response.getRecords().add(0, ztContentListResponse);
        }
        return response;
    }






    @Override
    public ZTContentInfoResponse getContentInfo(String id,String userType,Long userId){
        //查询 ä¸­å° TOKEN
        ZTBaseInfoResponse ztBaseInfoResponse  = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
        ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
        ztContentListRequest.setId(id);
        ZTContentInfoResponse response = zbomZhongTaiService.getContentInfo(ztContentListRequest);
        if(Objects.isNull(response)){
            response = new ZTContentInfoResponse();
            response.setAuthor("测试人员");
//            response.set("https://yjszhfn.jiangsu-10.zos.ctyun.cn/news/20240711/16f0490c-3ab1-4b66-aad8-be167476572c.jpg");
//            response.setFavoriteCount(1998);
//            response.setLikeCount(2223);
            response.setPublishDepartment("测试组织");
//            response.setReadCount(10209);
            response.setTitle("我是标题你好啊");
            response.setPicUrls("https://yjszhfn.jiangsu-10.zos.ctyun.cn/news/20240711/16f0490c-3ab1-4b66-aad8-be167476572c.jpg");
            response.setSubtitle("我是副标题你们好啊");
        }
        return response;
    }

    @Override
    public void collectContent(Long userId,String userType,String articleId){
    public void actionDo(Long userId,String userType,String articleId,String actionType){
        ZTBaseInfoResponse ztBaseInfoResponse  =  MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
        ZTActionDoRequest param = new ZTActionDoRequest();
        param.setOpenId(ztBaseInfoResponse.getOpenId());
        param.setUserType(userType);
        param.setArticleId(articleId);
        param.setToken(ztBaseInfoResponse.getToken());
        param.setActionType(actionType);
        ZTBaseResponse ztBaseResponse =  zbomZhongTaiService.collectDo(param);
        if(Objects.isNull(ztBaseResponse)){
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"中台接口响应失败");
@@ -202,82 +92,6 @@
            }
        }
    }

    @Override
    public void likeContent(Long userId,String userType,String articleId){
        ZTBaseInfoResponse ztBaseInfoResponse  =  MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
        ZTActionBatchDoRequest param = new ZTActionBatchDoRequest();
        param.setOpenId(ztBaseInfoResponse.getOpenId());
        param.setUserType(userType);
        param.setToken(ztBaseInfoResponse.getToken());
        List<ZTActionDoRequest> list = new ArrayList<>();
        ZTActionDoRequest ztActionDoRequest = new ZTActionDoRequest();
        ztActionDoRequest.setArticleId(articleId);
        param.setList(list);
        ZTBaseResponse ztBaseResponse =  zbomZhongTaiService.likeDo(param);
        if(Objects.isNull(ztBaseResponse)){
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"中台接口响应失败");
        }else{
            if(!ztBaseResponse.getSuccess()){
                throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"中台请求信息异常："+ztBaseResponse.getMsg());
            }
        }
    }


    @Override
    public void shareContent(Long userId,String userType,String articleId){
        ZTBaseInfoResponse ztBaseInfoResponse  =  MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
        ZTActionDoRequest param = new ZTActionDoRequest();
        param.setArticleId(articleId);
        param.setOpenId(ztBaseInfoResponse.getOpenId());
        param.setUserType(userType);
        param.setToken(ztBaseInfoResponse.getToken());
        ZTBaseResponse ztBaseResponse =  zbomZhongTaiService.shareDo(param);
        if(Objects.isNull(ztBaseResponse)){
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"中台接口响应失败");
        }else{
            if(!ztBaseResponse.getSuccess()){
                throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"中台请求信息异常："+ztBaseResponse.getMsg());
            }
        }
    }


    @Override
    public void viewContent(Long userId,String userType,String articleId){
        ZTBaseInfoResponse ztBaseInfoResponse  =  MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
        ZTActionDoRequest param = new ZTActionDoRequest();
        param.setArticleId(articleId);
        param.setOpenId(ztBaseInfoResponse.getOpenId());
        param.setUserType(userType);
        param.setToken(ztBaseInfoResponse.getToken());
        ZTBaseResponse ztBaseResponse =  zbomZhongTaiService.viewDo(param);
        if(Objects.isNull(ztBaseResponse)){
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"中台接口响应失败");
        }else{
            if(!ztBaseResponse.getSuccess()){
                throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"中台请求信息异常："+ztBaseResponse.getMsg());
            }
        }
    }

//    public ZTBasePageResponse<ZTCollectInfoResponse> viewContent(Long userId,String userType,String articleId) {
//        ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService, memberMapper, usersMapper, systemDictDataBiz, userId, userType);
//        ZTActionDoRequest param = new ZTActionDoRequest();
//        param.setArticleId(articleId);
//        param.setOpenId(ztBaseInfoResponse.getOpenId());
//        param.setUserType(userType);
//        param.setToken(ztBaseInfoResponse.getToken());
//        ZTBaseResponse ztBaseResponse = zbomZhongTaiService.viewDo(param);
//        if (Objects.isNull(ztBaseResponse)) {
//            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "中台接口响应失败");
//        } else {
//            if (!ztBaseResponse.getSuccess()) {
//                throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "中台请求信息异常：" + ztBaseResponse.getMsg());
//            }
//        }
//    }

    @Override
    public ZTBasePageResponse<ZTCusFavoritesInfoResponse> getZhongTaiCusFavorite(ZTContentListRequest ztContentListRequest){
@@ -329,4 +143,154 @@
    }



    @Override
    public ZTBasePageResponse<ZTProductNewsInfoResponse> getZhongTaiProductNewsPage(ZTContentListRequest ztContentListRequest){
        if(Objects.isNull(ztContentListRequest)
                || Objects.isNull(ztContentListRequest.getPageNum())
                || Objects.isNull(ztContentListRequest.getPageSize())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询 ä¸­å°
        ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
                Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ZTBasePageResponse<ZTProductNewsInfoResponse> response = zbomZhongTaiService.pageProductNewsList(ztContentListRequest);
        return response;
    }


    @Override
    public ZTBasePageResponse<ZTProductInfoResponse> getZhongTaiProductPage(ZTContentListRequest ztContentListRequest){
        if(Objects.isNull(ztContentListRequest)
                || Objects.isNull(ztContentListRequest.getPageNum())
                || Objects.isNull(ztContentListRequest.getPageSize())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询 ä¸­å°
        ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
                Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ZTBasePageResponse<ZTProductInfoResponse> response = zbomZhongTaiService.pageProductList(ztContentListRequest);
        return response;
    }


    @Override
    public ZTBasePageResponse<ZTRealcaseInfoResponse> getZhongTaiRealcasePage(ZTContentListRequest ztContentListRequest){
        if(Objects.isNull(ztContentListRequest)
                || Objects.isNull(ztContentListRequest.getPageNum())
                || Objects.isNull(ztContentListRequest.getPageSize())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询 ä¸­å°
        ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
                Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ZTBasePageResponse<ZTRealcaseInfoResponse> response = zbomZhongTaiService.pageRealcaseList(ztContentListRequest);
        return response;
    }


    @Override
    public ZTBasePageResponse<ZTVideoInfoResponse> getZhongTaiVideoPage(ZTContentListRequest ztContentListRequest){
        if(Objects.isNull(ztContentListRequest)
                || Objects.isNull(ztContentListRequest.getPageNum())
                || Objects.isNull(ztContentListRequest.getPageSize())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询 ä¸­å°
        ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
                Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ZTBasePageResponse<ZTVideoInfoResponse> response = zbomZhongTaiService.pageVideoList(ztContentListRequest);
        return response;
    }

    @Override
    public ZTBasePageResponse<ZTCaseInfoResponse> getZhongTaiWholecasePage(ZTContentListRequest ztContentListRequest){
        if(Objects.isNull(ztContentListRequest)
                || Objects.isNull(ztContentListRequest.getPageNum())
                || Objects.isNull(ztContentListRequest.getPageSize())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询 ä¸­å°
        ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
                Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ZTBasePageResponse<ZTCaseInfoResponse> response = zbomZhongTaiService.pageWholecaseList(ztContentListRequest);
        return response;
    }


    @Override
    public ZTBasePageResponse<ZTZbDecoInfoResponse> getZhongTaiZbDecoPage(ZTContentListRequest ztContentListRequest){
        if(Objects.isNull(ztContentListRequest)
                || Objects.isNull(ztContentListRequest.getPageNum())
                || Objects.isNull(ztContentListRequest.getPageSize())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询 ä¸­å°
        ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
                Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ZTBasePageResponse<ZTZbDecoInfoResponse> response = zbomZhongTaiService.pageZbDecoList(ztContentListRequest);
        return response;
    }


    @Override
    public ZTProductInfoResponse getProductInfo(String id,String userType,Long userId){
        //查询 ä¸­å° TOKEN
        ZTBaseInfoResponse ztBaseInfoResponse  = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
        ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
        ztContentListRequest.setId(id);
        ZTProductInfoResponse response = zbomZhongTaiService.getProductInfo(ztContentListRequest);
        return response;
    }

    @Override
    public ZTCaseInfoResponse getWholecaseInfo(String id,String userType,Long userId){
        //查询 ä¸­å° TOKEN
        ZTBaseInfoResponse ztBaseInfoResponse  = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
        ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
        ztContentListRequest.setId(id);
        ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
        return response;
    }

    @Override
    public ZTProductNewsInfoResponse getProductNewsInfo(String id,String userType,Long userId){
        //查询 ä¸­å° TOKEN
        ZTBaseInfoResponse ztBaseInfoResponse  = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
        ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
        ztContentListRequest.setId(id);
        ZTProductNewsInfoResponse response = zbomZhongTaiService.getProductNewsInfo(ztContentListRequest);
        return response;
    }

    @Override
    public ZTRealcaseInfoResponse getRealcaseInfo(String id,String userType,Long userId){
        //查询 ä¸­å° TOKEN
        ZTBaseInfoResponse ztBaseInfoResponse  = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
        ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
        ztContentListRequest.setId(id);
        ZTRealcaseInfoResponse response = zbomZhongTaiService.getRealcaseInfo(ztContentListRequest);
        return response;
    }

}

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

@@ -265,7 +265,7 @@


    @Override
    public AccountResponse wxLogin(String code){
    public AccountResponse wxLogin(String code,String iamId){
        try {
//            èŽ·å–微信敏感数据
            WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
@@ -275,6 +275,13 @@
            }
//            String openId = code;
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
            Users users = new Users();
            if(StringUtils.isBlank(iamId)){
                users = usersMapper.selectOne(new QueryWrapper<Users>().lambda()
                        .eq(Users::getIamId,iamId)
                        .last("limit 1")
                );
            }
            if (member == null) {
                member = new Member();
                member.setNickname("微信用户"+ CodeVerifyUtils.createVerificationCode(4));
@@ -282,7 +289,12 @@
                member.setIsdeleted(Constants.ZERO);
                member.setOpenid(openId);
                member.setType(Constants.ZERO);
                //如果绑定了导购 åˆ™ç›´æŽ¥ä½¿ç”¨å·²ç»‘定导购信息 è·³è¿‡æ‰‹æœºå·ç»‘定的状态
                if(Objects.nonNull(users)){
                    member.setAuthStatus(Constants.TWO);
                }else{
                member.setAuthStatus(Constants.ZERO);
                }
                ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
                if(Objects.isNull(ztUserGetTokenResponse)){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"中台服务调起失败!");
@@ -290,7 +302,7 @@
                    member.setToken(ztUserGetTokenResponse.getToken());
                }
                memberMapper.insert(member);
                member =  this.getMemberInfo(member.getId());
                this.saveCustomerUser(users,member.getId());
            }else{
                ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
                if(Objects.isNull(ztUserGetTokenResponse)){
@@ -298,7 +310,9 @@
                }else{
                    member.setToken(ztUserGetTokenResponse.getToken());
                }
                this.saveCustomerUser(users,member.getId());
                member = this.getMemberInfo(member.getId());

            }
            //创建token
            JwtPayLoad payLoad = new JwtPayLoad(member.getId(),Constants.ZERO);
@@ -313,6 +327,29 @@
        }
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"微信登录异常！请联系管理员");
    }

    public void saveCustomerUser(Users users,Long memberId){
        if(!(Objects.nonNull(users)&&Objects.nonNull(memberId))){
            return;
        }
        if( customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda()
                        .eq(CustomerUser::getIsdeleted,Constants.ZERO)
                .eq(CustomerUser::getUserId,users.getId())
                .eq(CustomerUser::getMemberId,memberId)) <= Constants.ZERO ){
            CustomerUser customerUser = new CustomerUser();
            customerUser.setUserId(users.getId());
            customerUser.setCreateDate(new Date());
            customerUser.setMemberId(memberId);
            customerUser.setPhone(users.getPhone());
            customerUser.setIamUserId(users.getIamId());
            customerUser.setName(users.getName());
            customerUser.setUsername(users.getIamUsername());
            customerUser.setAddr(users.getShopAddress());
            customerUserMapper.insert(customerUser);
            //TODO ç­‰å¾…调起中台接口
        }
    }


    @Override
    public String getWxMiniPhone(WxPhoneRequest wxPhoneRequest){
@@ -418,6 +455,15 @@
        String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
                systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
        member.setPrefix(prefix);
        if( customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda().eq(CustomerUser::getIsdeleted,Constants.ZERO).eq(CustomerUser::getMemberId,member.getId()))>0){
            member.setAuthStatus(Constants.TWO);
        }else{
            if(StringUtils.isBlank(member.getPhone())){
                member.setAuthStatus(Constants.ZERO);
            }else{
                member.setAuthStatus(Constants.ONE);
            }
        }
       return member;
    }

@@ -443,11 +489,11 @@
                param.setOpenId(member.getOpenid());
                ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
                if(Objects.nonNull(ztUserGetTokenResponse)){
                    Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
//                    Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
                    member.setToken(ztUserGetTokenResponse.getToken());
                    memberMapper.update(new UpdateWrapper<Member>().lambda()
                            .set(Member::getToken,ztUserGetTokenResponse.getToken())
                            .set(Member::getTokenDate,date)//默认有效期为两小时
//                            .set(Member::getTokenDate,date)//默认有效期为两小时
                            .eq(Member::getId,member.getId()));
                    ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
                }else{

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

@@ -41,6 +41,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;

import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -897,33 +898,32 @@

    @Override
    public PageData<Shop> queryShopByLL(PageWrap<Shop> pageWrap) {
//        if(Objects.isNull(pageWrap.getModel())
//                || Objects.isNull(pageWrap.getModel().getLatitude())
//                || Objects.isNull(pageWrap.getModel().getLongitude())){
//            return null;
//        }
        if(Objects.isNull(pageWrap.getModel())
                || Objects.isNull(pageWrap.getModel().getLatitude())
                || Objects.isNull(pageWrap.getModel().getLongitude())){
            return null;
        }
        IPage<Shop> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Shop> queryWrapper = new MPJLambdaWrapper<>();
//        queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE" +
//                        " ,CONVERT (ST_Distance_Sphere (point ("+pageWrap.getModel().getLongitude()+", "+pageWrap.getModel().getLatitude()+" ), point ( LONGITUDE, LATITUDE )) /1000,decimal(15,2)) as distance ")
        queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE ")
        queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE " +
                " ,  (6371 * ACOS(COS(RADIANS("+pageWrap.getModel().getLatitude()+")) * COS(RADIANS(latitude)) * COS(RADIANS(longitude) - RADIANS("+pageWrap.getModel().getLongitude()+")) + SIN(RADIANS("+pageWrap.getModel().getLatitude()+")) * SIN(RADIANS(latitude)) ) ) as distance  " )
                .eq("isdeleted",Constants.ZERO)
//                .isNotNull("LATITUDE")
//                .isNotNull("LONGITUDE")
                .isNotNull("LATITUDE")
                .isNotNull("LONGITUDE")
                .eq("TYPE",Constants.TWO)
                .eq("SECOND_TYPE",Constants.THREE)
                .eq("STATUS",Constants.ONE);
//                .orderByAsc(" distance ")
                .eq("STATUS",Constants.ONE)
                .orderByAsc(" distance ");
        Utils.MP.blankToNull(pageWrap.getModel());
        PageData<Shop> pageData = PageData.from(shopMapper.selectPage(page, queryWrapper));
        String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
        StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
        for (Shop shop:pageData.getRecords()) {
            this.dealDistance(shop);
            //查询门店下导购数据
            List<Users> usersList =usersMapper.selectList(new QueryWrapper<Users>().lambda().eq(Users::getDepartmentId,shop.getId())
                    .eq(Users::getIsdeleted,Constants.ZERO)
                    .eq(Users::getStatus,Constants.ONE)
                    .eq(Users::getType,Constants.ZERO)
            );
            for (Users users:usersList) {
                if(StringUtils.isNotBlank(users.getImgurl())){
@@ -935,6 +935,29 @@
        return pageData;
    }

    /**
     * å¤„理门店距离显示
     * @param shop
     */
    public void dealDistance(Shop shop){
        if(Objects.isNull(shop.getDistance())){
            shop.setDistanceStr("-");
        }else{
            //距离小于1公里 æ˜¾ç¤ºç±³
            if(shop.getDistance().compareTo(BigDecimal.ONE)<Constants.ZERO){
                BigDecimal distanceM = shop.getDistance().multiply(new BigDecimal(1000).setScale(0));
                //100米之内
                if(distanceM.compareTo(new BigDecimal(100))<0){
                    shop.setDistanceStr("<100ç±³");
                }else{
                    shop.setDistanceStr(distanceM.divide(BigDecimal.valueOf(1)).setScale(2,BigDecimal.ROUND_HALF_UP) + "m");
                }
            }else{
                shop.setDistanceStr(shop.getDistance().divide(BigDecimal.valueOf(1)).setScale(2,BigDecimal.ROUND_HALF_UP) + "km");
            }
        }
    }

    @Override
    public Shop shopDetail(Long id,Long memberId) {
        QueryWrapper<Shop> queryWrapper = new QueryWrapper<Shop>();
@@ -942,8 +965,8 @@
            Member member = memberMapper.selectById(memberId);
            //如果人员没有经纬度信息，则不查询距离
            if(Objects.nonNull(member)&&Objects.nonNull(member.getLatitude())&&Objects.nonNull(member.getLongitude())){
                queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE," +
                        " CONVERT (ST_Distance_Sphere (point ("+member.getLongitude()+", "+member.getLatitude()+" ), point ( LONGITUDE, LATITUDE )) /1000,decimal(15,2)) as distance ");
                queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE " +
                        " ,  (6371 * ACOS(COS(RADIANS("+member.getLatitude()+")) * COS(RADIANS(latitude)) * COS(RADIANS(longitude) - RADIANS("+member.getLongitude()+")) + SIN(RADIANS("+member.getLatitude()+")) * SIN(RADIANS(latitude)) ) ) as distance  " );
            }
        }
        queryWrapper.eq("id",id);
@@ -956,8 +979,8 @@
        List<Users> usersList =usersMapper.selectList(new QueryWrapper<Users>().lambda().eq(Users::getDepartmentId,shop.getId())
                .eq(Users::getIsdeleted,Constants.ZERO)
                .eq(Users::getStatus,Constants.ONE)
                .eq(Users::getType,Constants.ZERO)
        );
        this.dealDistance(shop);
        for (Users users:usersList) {
            if(StringUtils.isNotBlank(users.getImgurl())){
                users.setImgurlFull(prefix + users.getImgurl());

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

@@ -743,7 +743,7 @@
        if(Objects.isNull(users)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(Constants.equalsInteger(users.getIsdeleted(),Constants.ZERO)){
        if(!Constants.equalsInteger(users.getIsdeleted(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"用户已禁用");
        }
        getUsersDetail(users);

 server/web/src/main/java/com/doumee/api/ScheduleTool.java

@@ -5,7 +5,6 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.system.SystemDictDataService;
import lombok.extern.slf4j.Slf4j;
@@ -51,30 +50,6 @@
    @Value("${debug_model}")
    private Boolean timing;

    /**
     * æ›´æ–°å¾®ä¿¡å…¬ä¼—号 ACCESS_TOKEN
     * @throws Exception
     */
    @Scheduled(fixedDelay=1000 * 60 * 90)
    public void updAccessToken(){
        DefaultSecurityManager securityManager = new DefaultSecurityManager();
        SecurityUtils.setSecurityManager(securityManager);

        String appId = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode();
        String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode();
        //生成微信token
        String url = WXConstant.GET_ACCESS_TOKEN_URL.replace("APPID",appId).replace("APPSECRET",appSecret);
        String response = HttpsUtil.get(url,false);
        JSONObject json = JSONObject.parseObject(response);
        System.out.println(json);
        SystemDictData systemDictData =  systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN);
        if(!Objects.isNull(systemDictData)){
            systemDictData.setCode(json.getString("access_token"));
            systemDictData.setUpdateTime(new Date());
            systemDictDataService.updateById(systemDictData);
            log.info(" æ›´æ–°å¾®ä¿¡å…¬ä¼—号 ACCESS_TOKEN =========> " + systemDictData.getCode() );
        }
    }




 server/web/src/main/java/com/doumee/api/web/CustomerApi.java

@@ -88,9 +88,10 @@
    @GetMapping("/wxLoginCustomer")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "微信code", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "iamId", value = "导购主键", required = false),
    })
    public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code) {
        return  ApiResponse.success(memberService.wxLogin(code));
    public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code,String iamId) {
        return  ApiResponse.success(memberService.wxLogin(code,iamId));
    }

    @LoginRequired
@@ -327,82 +328,20 @@
        return ApiResponse.success("查询成功",ztTagInfoResponseList);
    }

    @LoginRequired
    @ApiOperation(value = "内容分页 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/pageContentList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTContentListResponse>> pageContentList(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ZTBasePageResponse<ZTContentListResponse>  ztBasePageResponse= getZhongTaiDataService.pageContentList(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }


    @LoginRequired
    @ApiOperation(value = "内容详情 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/getContentInfo")
    @ApiOperation(value = "行为内容接口 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/actionDo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "actionType", value = "行为类型：收藏：collect;取消收藏：collect_cancel;喜欢：like;取消喜欢：like_cancel；浏览：view;分享：share;下载：download", required = true),
    })
    public ApiResponse<ZTContentInfoResponse> getContentInfo(@RequestParam String id) {
        ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,ZTConstants.CUSTOMER,getMemberId());
        return ApiResponse.success("查询成功",ztContentInfoResponse);
    }


    @LoginRequired
    @ApiOperation(value = "内容收藏 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/collectContent")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse collectContent(@RequestParam String id) {
        getZhongTaiDataService.collectContent(getMemberId(),ZTConstants.CUSTOMER,id);
    public ApiResponse actionDo(@RequestParam String id,@RequestParam String actionType) {
        getZhongTaiDataService.actionDo(getMemberId(),ZTConstants.CUSTOMER,id,actionType);
        return ApiResponse.success("操作成功");
    }

    @LoginRequired
    @ApiOperation(value = "内容喜欢 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/likeContent")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse likeContent(@RequestParam String id) {
        getZhongTaiDataService.likeContent(getMemberId(),ZTConstants.CUSTOMER,id);
        return ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation(value = "内容分享 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/shareContent")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse shareContent(@RequestParam String id) {
        getZhongTaiDataService.shareContent(getMemberId(),ZTConstants.CUSTOMER,id);
        return ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation(value = "内容浏览 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/viewContent")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse viewContent(@RequestParam String id) {
        getZhongTaiDataService.viewContent(getMemberId(),ZTConstants.CUSTOMER,id);
        return ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation(value = "定制服务列表", notes = "客户端小程序")
@@ -413,7 +352,6 @@
    public ApiResponse<List<News>> getCustomizedNewsList() {
        return ApiResponse.success("查询成功",newsService.getCustomizedNewsList(Constants.ONE,null,null));
    }


    @LoginRequired
    @ApiOperation(value = "定制服务详情", notes = "客户端小程序")
@@ -482,4 +420,141 @@
    }


    @LoginRequired
    @ApiOperation(value = "咨询分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiProductNewsPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTProductNewsInfoResponse>> getZhongTaiProductNewsPage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ZTBasePageResponse<ZTProductNewsInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductNewsPage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }


    @LoginRequired
    @ApiOperation(value = "产品分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiProductPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTProductInfoResponse>> getZhongTaiProductPage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ZTBasePageResponse<ZTProductInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductPage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }

    @LoginRequired
    @ApiOperation(value = "实景分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiRealcasePage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTRealcaseInfoResponse>> getZhongTaiRealcasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ZTBasePageResponse<ZTRealcaseInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiRealcasePage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }

    @LoginRequired
    @ApiOperation(value = "视频分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiVideoPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTVideoInfoResponse>> getZhongTaiVideoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ZTBasePageResponse<ZTVideoInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiVideoPage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }

    @LoginRequired
    @ApiOperation(value = "全屋案例分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiWholecasePage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTCaseInfoResponse>> getZhongTaiWholecasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ZTBasePageResponse<ZTCaseInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiWholecasePage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }

    @LoginRequired
    @ApiOperation(value = "志说装修分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiZbDecoPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTZbDecoInfoResponse>> getZhongTaiZbDecoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ZTBasePageResponse<ZTZbDecoInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiZbDecoPage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }


    @LoginRequired
    @ApiOperation(value = "全屋案例详情 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/getWholecaseInfo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse<ZTCaseInfoResponse> getWholecaseInfo(@RequestParam String id) {
        ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
        return ApiResponse.success("查询成功",ztCaseInfoResponse);
    }


    @LoginRequired
    @ApiOperation(value = "产品资讯详情 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/getProductNewsInfo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse<ZTProductNewsInfoResponse> getProductNewsInfo(@RequestParam String id) {
        ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,ZTConstants.CUSTOMER,getMemberId());
        return ApiResponse.success("查询成功",ztProductNewsInfoResponse);
    }



    @LoginRequired
    @ApiOperation(value = "实景案例 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/getRealcaseInfo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse<ZTRealcaseInfoResponse> getRealcaseInfo(@RequestParam String id) {
        ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
        return ApiResponse.success("查询成功",ztRealcaseInfoResponse);
    }



    @LoginRequired
    @ApiOperation(value = "产品详情 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/getProductInfo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse<ZTProductInfoResponse> getProductInfo(@RequestParam String id) {
        ZTProductInfoResponse ztProductInfoResponse= getZhongTaiDataService.getProductInfo(id,ZTConstants.CUSTOMER,getMemberId());
        return ApiResponse.success("查询成功",ztProductInfoResponse);
    }





}

 server/web/src/main/java/com/doumee/api/web/PersonnelApi.java

@@ -187,11 +187,8 @@
        return  ApiResponse.success(getCrmDataService.getCrmCustomerList(crmCustomerListRequest));
    }




    @LoginRequired
    @ApiOperation(value = "分类数据 - ä¸­å°", notes = "客户端小程序")
    @UserLoginRequired
    @ApiOperation(value = "分类数据 - ä¸­å°", notes = "员工端小程序")
    @PostMapping("/getCatalogList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
@@ -201,10 +198,8 @@
        return ApiResponse.success("查询成功",ztCatalogInfoResponseList);
    }



    @LoginRequired
    @ApiOperation(value = "标签数据 - ä¸­å°", notes = "客户端小程序")
    @UserLoginRequired
    @ApiOperation(value = "标签数据 - ä¸­å°", notes = "员工端小程序")
    @PostMapping("/getCataLogTagList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
@@ -214,78 +209,4 @@
        return ApiResponse.success("查询成功",ztTagInfoResponseList);
    }


    @LoginRequired
    @ApiOperation(value = "内容分页 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/pageContentList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTContentListResponse>> pageContentList(@RequestBody ZTContentListRequest ztContentListRequest) {
        ZTBasePageResponse<ZTContentListResponse>  ztBasePageResponse= getZhongTaiDataService.pageContentList(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }

    @LoginRequired
    @ApiOperation(value = "内容详情 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/getContentInfo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse<ZTContentInfoResponse> getContentInfo(@RequestParam String id) {
        ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id, ZTConstants.BUSINESS,getUserId());
        return ApiResponse.success("查询成功",ztContentInfoResponse);
    }


    @LoginRequired
    @ApiOperation(value = "内容收藏 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/collectContent")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse collectContent(@RequestParam String id) {
        getZhongTaiDataService.collectContent(getUserId(),ZTConstants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }

    @LoginRequired
    @ApiOperation(value = "内容喜欢 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/likeContent")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse likeContent(@RequestParam String id) {
        getZhongTaiDataService.likeContent(getUserId(),ZTConstants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation(value = "内容分享 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/shareContent")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse shareContent(@RequestParam String id) {
        getZhongTaiDataService.shareContent(getUserId(),ZTConstants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation(value = "内容浏览 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/viewContent")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse viewContent(@RequestParam String id) {
        getZhongTaiDataService.viewContent(getUserId(),ZTConstants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }
}