代码提交

k94314517

2024-07-29 4388856f491fb6806e1f34841a773f79947166b4

代码提交

 server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java

@@ -50,4 +50,5 @@
    ZTCusCarouselImageResponse carouselImageDetail(ZTDataDetailRequest param);
    ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest param);
    ZTBaseResponse batchAddLike(ZTBatchAddListRequest param);
    ZTBaseResponse customerBinDingUsers(ZTCustomerBindingUsersRequest param);
}

 server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java

@@ -772,4 +772,18 @@
        return null;
    }


    @Override
    public  ZTBaseResponse customerBinDingUsers(ZTCustomerBindingUsersRequest param){
        ZTBaseResponse result = sendHttpRequest(
                ZTConstants.IntegerUrl.CUSTOMER_BINDING_USERS,
                ZTConstants.IntegerName.CUSTOMER_BINDING_USERS_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<Object>>(){});

        return result;
    }

}

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

@@ -79,6 +79,7 @@
        String REALCASE_INFO_URL ="/content/api/realCaseDetail";
        String FAVORITES_PAGE_URL ="/behavior/api/favoritesPageList";
        String BATCH_ADD_LIKE_URL ="/content/api/batchAddLike";
        String CUSTOMER_BINDING_USERS ="/api/bind";


    }
@@ -122,5 +123,6 @@
        String FAVORITES_NAME ="获取我的喜欢/收藏列表";

        String BATCH_ADD_LIKE_NAME ="批量绑定喜欢给客户";
        String CUSTOMER_BINDING_USERS_NAME ="客户绑定导购";
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,162 @@
package com.doumee.biz.zbom.model.zhongtai.response;

import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


/**
 * å®¢æˆ·ç»‘定员工信息
 */
@Data
public class ZTCustomerBindingUsersRequest extends ZTBaseRequst {


    /**
     * åŸŽå¸‚
     */
    private String address;
    /**
     * å¹´é¾„
     */
    private String age;
    /**
     * åº”用码
     */
    private String appCode;
    /**
     * AppID
     */
    private String appId;
    /**
     * å®¢æˆ·å¤´åƒ
     */
    private String avatarUrl;
    /**
     * ç”Ÿæ—¥
     */
    private String birthday;
    /**
     * å®¢æˆ·æ¸ é“来源编码
     */
    private String channelSourceCode;
    /**
     * å®¢æˆ·å•ä½
     */
    private String customerCompany;
    /**
     * å®¢æˆ·çº§åˆ«
     */
    private String customerLevel;
    /**
     * å®¢æˆ·æ‰€å±žè¡Œä¸š
     */
    private String customerTrade;
    /**
     * å¯¼è´­è´¦å·
     */
    private String daoGouAccount;
    /**
     * å¯¼è´­ç±»åž‹
     */
    private String daoGouType;
    /**
     * å¯¼è´­ç”¨æˆ·Id
     */
    private String daoGouUserId;
    /**
     * ç”µå­é‚®ç®±
     */
    private String email;
    /**
     * è¯¦ç»†åœ°å€
     */
    private String fullAddress;
    /**
     * æ€§åˆ«
     */
    private String gender;
    /**
     * æˆ¿å±‹é¢ç§¯
     */
    private String houseArea;
    /**
     * æˆ¿å±‹æˆ·åž‹
     */
    private String houseLayout;
    /**
     * èº«ä»½è¯
     */
    private String idCard;
    /**
     * åç§°
     */
    private String name;
    /**
     * æ˜µç§°
     */
    private String nickName;
    /**
     * OpenID
     */
    private String openId;
    /**
     * æ‰‹æœºå·ç 
     */
    private String phone;
    /**
     * å¹³å°ç±»åž‹
     */
    private String platform;
    /**
     * å¹³å°æ¥æº 1-pad  2-小程序
     */
    private String platSource;
    /**
     * èŒä¸š
     */
    private String position;
    /**
     * æ„å‘产品编码，用逗号隔开
     */
    private String productCode;
    /**
     * æŽ¨èäºº
     */
    private String referee;
    /**
     * å¤‡æ³¨
     */
    private String remark;
    /**
     * æ¥æºç³»ç»Ÿå®¢æˆ·ID
     */
    private String sourceCustomerId;
    /**
     * å­åº”用码
     */
    private String subAppCode;
    /**
     * ä¸­å°ç”¨æˆ·å”¯ä¸€ç¼–码
     */
    private String token;
    /**
     * UnionID
     */
    private String unionId;
    /**
     * å°åŒº
     */
    private String uptown;
    /**
     * CMS账号
     */
    private String userName;
    /**
     * å¾®ä¿¡å·
     */
    private String weixin;



}

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

@@ -164,4 +164,10 @@
     * @return
     */
    void batchAddLike(ZTBatchAddListRequest param);

    /**
     * ä¸­å° å®¢æˆ·ç»‘定导购
     * @param ztCustomerBindingUsersRequest
     */
    void customerBinDingUsers(ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest);
}

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

@@ -239,9 +239,7 @@
        PageData<CustomerLog> pageData = PageData.from(customerLogMapper.selectJoinPage(page,CustomerLog.class, queryWrapper));
        for (CustomerLog customerLog:pageData.getRecords()) {
            if(Objects.nonNull(pageWrap.getModel().getIsHiddenPhone())&& Constants.equalsInteger(pageWrap.getModel().getIsHiddenPhone(),Constants.ZERO)){
                customerLog.setPhone(
                        Constants.desensitizationPhone(customerLog.getPhone())
                );
                customerLog.setPhone(Constants.desensitizationPhone(customerLog.getPhone()));
                if(Constants.equalsInteger(customerLog.getType(),Constants.TWO)&& StringUtils.isNotBlank(customerLog.getMemberName())){
                    customerLog.setName(customerLog.getMemberName());
                }

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

@@ -285,12 +285,13 @@
        ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
        ztContentListRequest.setId(id);
        ZTProductInfoResponse response = zbomZhongTaiService.getProductInfo(ztContentListRequest);
        if(Objects.nonNull(response)){
        if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
            //查询导购信息 è¿›è¡Œä¿¡æ¯ç»‘定与返回
            if(StringUtils.isNotBlank(salesId)){
                Users users = usersMapper.selectById(salesId);
                if(Objects.nonNull(users)){
                    MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
                Member member = memberMapper.selectById(userId);
                if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
                    MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,userId,member.getOpenid());
                    String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
                            StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
                    if(StringUtils.isNotBlank(users.getImgurl())){
@@ -337,17 +338,13 @@
        ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
        ztContentListRequest.setId(id);
        ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
        if(Objects.nonNull(response)){
//            if(StringUtils.isNotBlank(response.getPanorama())){
//                response.setPanorama(
//                        response.getPanorama().replace("https://720.","https://720-3.").replace("https://720-2.","https://720-3.")
//                );
//            }
        if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
            //查询导购信息 è¿›è¡Œä¿¡æ¯ç»‘定与返回
            if(StringUtils.isNotBlank(salesId)){
                Users users = usersMapper.selectById(salesId);
                if(Objects.nonNull(users)){
                    MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
                Member member = memberMapper.selectById(userId);
                if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
                    MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,userId,member.getOpenid());
                    String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
                            StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
                    if(StringUtils.isNotBlank(users.getImgurl())){
@@ -388,12 +385,13 @@
        ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
        ztContentListRequest.setId(id);
        ZTProductNewsInfoResponse response = zbomZhongTaiService.getProductNewsInfo(ztContentListRequest);
        if(Objects.nonNull(response)){
        if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
            //查询导购信息 è¿›è¡Œä¿¡æ¯ç»‘定与返回
            if(StringUtils.isNotBlank(salesId)){
                Users users = usersMapper.selectById(salesId);
                if(Objects.nonNull(users)){
                    MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
                Member member = memberMapper.selectById(userId);
                if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
                    MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,userId,member.getOpenid());
                    String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
                            StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
                    if(StringUtils.isNotBlank(users.getImgurl())){
@@ -439,12 +437,13 @@
        ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
        ztContentListRequest.setId(id);
        ZTRealcaseInfoResponse response = zbomZhongTaiService.getRealcaseInfo(ztContentListRequest);
        if(Objects.nonNull(response)){
        if(Objects.nonNull(response)&&userType.equals(ZTConstants.CUSTOMER)){
            //查询导购信息 è¿›è¡Œä¿¡æ¯ç»‘定与返回
            if(StringUtils.isNotBlank(salesId)){
                Users users = usersMapper.selectById(salesId);
                if(Objects.nonNull(users)){
                    MemberServiceImpl.saveCustomerUser(customerUserMapper,users,userId);
                Member member = memberMapper.selectById(userId);
                if(Objects.nonNull(users)&&Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
                    MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,userId,member.getOpenid());
                    String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
                            StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
                    if(StringUtils.isNotBlank(users.getImgurl())){
@@ -502,6 +501,23 @@
        zbomZhongTaiService.batchAddLike(ztBatchAddListRequest);
    }



    @Override
    public void customerBinDingUsers(ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest){
        if(Objects.isNull(ztCustomerBindingUsersRequest)
                || StringUtils.isBlank(ztCustomerBindingUsersRequest.getOpenId())
                || StringUtils.isBlank(ztCustomerBindingUsersRequest.getUserId())
                || StringUtils.isBlank(ztCustomerBindingUsersRequest.getSourceCustomerId())
                || StringUtils.isBlank(ztCustomerBindingUsersRequest.getDaoGouAccount())
                || StringUtils.isBlank(ztCustomerBindingUsersRequest.getDaoGouType())
                || StringUtils.isBlank(ztCustomerBindingUsersRequest.getDaoGouUserId())
                || StringUtils.isBlank(ztCustomerBindingUsersRequest.getUserName())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询 ä¸­å°
        ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
                Long.valueOf(ztCustomerBindingUsersRequest.getUserId()),ztCustomerBindingUsersRequest.getUserType());
        ztCustomerBindingUsersRequest.setToken(ztBaseInfoResponse.getToken());
        zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
    }
}

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

@@ -14,6 +14,7 @@
import com.doumee.biz.zbom.model.zhongtai.ZTUserGetTokenRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTUserInfoUpdateRequest;
import com.doumee.biz.zbom.model.zhongtai.response.ZTBaseResponse;
import com.doumee.biz.zbom.model.zhongtai.response.ZTCustomerBindingUsersRequest;
import com.doumee.biz.zbom.model.zhongtai.response.ZTSysuserGetTokenResponse;
import com.doumee.biz.zbom.model.zhongtai.response.ZTUserGetTokenResponse;
import com.doumee.config.Jwt.JwtPayLoad;
@@ -299,14 +300,14 @@
                    member.setToken(ztUserGetTokenResponse.getToken());
                }
                memberMapper.insert(member);
                MemberServiceImpl.saveCustomerUser(customerUserMapper,users,member.getId());
                MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member.getId(),member.getOpenid());
            }else{
                ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
                if(!Objects.isNull(ztUserGetTokenResponse)){
                    member.setToken(ztUserGetTokenResponse.getToken());
                    memberMapper.updateById(member);
                }
                MemberServiceImpl.saveCustomerUser(customerUserMapper,users,member.getId());
                MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member.getId(),member.getOpenid());
                member = this.getMemberInfo(member.getId());
            }
            String token = JwtTokenUtil.generateTokenForZb(member.getId(),ZTConstants.CUSTOMER, JSONObject.toJSON(member).toString(),redisTemplate);
@@ -321,7 +322,7 @@
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"微信登录异常！请联系管理员");
    }

    public static void saveCustomerUser(CustomerUserMapper customerUserMapper,Users users,Long memberId){
    public static void saveCustomerUser(ZbomZhongTaiService zbomZhongTaiService,CustomerUserMapper customerUserMapper,Users users,Long memberId,String openId){
        if(Objects.nonNull(users)&&Objects.nonNull(memberId)) {
            if (customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda()
                    .eq(CustomerUser::getIsdeleted, Constants.ZERO)
@@ -337,7 +338,16 @@
                customerUser.setUsername(users.getIamUsername());
                customerUser.setAddr(users.getShopAddress());
                customerUserMapper.insert(customerUser);
                //TODO ç­‰å¾…调起中台接口
                //等待调起中台接口
                ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest = new ZTCustomerBindingUsersRequest();
                ztCustomerBindingUsersRequest.setOpenId(openId);
                ztCustomerBindingUsersRequest.setSourceCustomerId(memberId.toString());
                ztCustomerBindingUsersRequest.setDaoGouUserId(users.getId().toString());
                ztCustomerBindingUsersRequest.setDaoGouAccount(users.getIamUsername());
                ztCustomerBindingUsersRequest.setDaoGouType(users.getUserTypes());
                ztCustomerBindingUsersRequest.setUserName(users.getIamId());
                ztCustomerBindingUsersRequest.setPlatSource(ZTConstants.PLATFORM_MP_WX);
                zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
            }
        }
    }

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

@@ -399,6 +399,7 @@
                .eq(News::getType,Constants.ZERO)
                .eq(News::getStatus,Constants.ZERO)
                .eq(News::getFileType,Constants.ZERO)
                .apply(" now() >= t.PUBLISH_DATE ")
                .last( "limit 3"  )
                .orderByDesc(News::getCreateDate)
        );

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

@@ -843,13 +843,12 @@
            Shop shop = shopMapper.selectById(users.getDepartmentId());
            if(Objects.nonNull(shop)){
                users.setShopName(shop.getName());
                if(!(StringUtils.isBlank(shop.getProvinceName())||StringUtils.isBlank(shop.getCityName())||StringUtils.isBlank(shop.getAreaName()))){
                    users.setShopCity(shop.getProvinceName()+shop.getCityName()+shop.getAreaName());
                }
                if(StringUtils.isNotBlank(shop.getAddress())){
                    users.setShopAddress(shop.getAddress());
                }else{
                    users.setShopAddress(shop.getProvinceName()+shop.getCityName()+shop.getAreaName()+shop.getTown()+shop.getRegAddr());
                    if(!(StringUtils.isBlank(shop.getProvinceName())||StringUtils.isBlank(shop.getCityName())||StringUtils.isBlank(shop.getAreaName()))){
                        users.setShopAddress(shop.getProvinceName()+shop.getCityName()+shop.getAreaName());
                    }
                }
            }
        }