Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

liukangdong

2024-09-29 b2d360d9113b6955287108ca9e90d76a1f3c1419

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

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

@@ -75,6 +75,15 @@
        entity.setAreaname(customerLog.getAreaName());
        entity.setAreacode(customerLog.getAreaCode());
        entity.setOpenid(customerLog.getOpenid());
        entity.setUserData(new ArrayList<>());
        if(StringUtils.isNotBlank(customerLog.getUsernames())){
            String[] names = customerLog.getUsernames().split(",");
            for(String str:names){
                CrmCustomerUsernameRequest usernameRequest = new CrmCustomerUsernameRequest();
                usernameRequest.setUserName(str);
                entity.getUserData().add(usernameRequest);//导购登陆账号集合
            }
        }
//        æäº¤ç±»åž‹ 0-测试装修风格；1-0元定制；2装修计算器
        if(Constants.equalsInteger(customerLog.getType(),Constants.ONE)){
            entity.setSource(CRMConstants.CRM_SOURCE.SOURCE_MP01);

 server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerInfoRequest.java

@@ -5,6 +5,7 @@
import lombok.Data;

import java.io.Serializable;
import java.util.List;

@Data
@ApiModel("志邦CRM客户留资提交参数")
@@ -39,4 +40,6 @@
    private String openid;
    @ApiModelProperty(value = "终端信息")
    private String terminal;
    @ApiModelProperty(value = "导购信息列表")
    private List<CrmCustomerUsernameRequest> userData;
}

 server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerUsernameRequest.java

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.List;

@Data
@ApiModel("导购登录账号提交参数")
public   class CrmCustomerUsernameRequest extends CRMBaseRequst implements Serializable {

    @ApiModelProperty(value = "导购登录账号")
    private String userName;

}

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

@@ -13,6 +13,7 @@
import org.apache.xpath.operations.Bool;

import java.util.Date;
import java.util.List;

/**
 * å®¢æˆ·ç•™èµ„记录信息表
@@ -140,6 +141,9 @@
    @ApiModelProperty(value = "crm提交备注")
    @ExcelColumn(name="crm提交备注")
    private String crmInfo;
    @ApiModelProperty(value = "导购登录名集合，英文逗号隔开")
    @ExcelColumn(name="导购登录名集合，英文逗号隔开")
    private String usernames;

    @ApiModelProperty(value = "区域")
    @ExcelColumn(name="区域")
@@ -169,4 +173,5 @@
    @TableField(exist = false)
    private Integer isHiddenPhone;


}

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

@@ -44,5 +44,7 @@

    @ApiModelProperty(value = "区域编码")
    private String areaCode;
    @ApiModelProperty(value = "导购登录名")
    private String username;

}

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

@@ -9,10 +9,9 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CustomerLogMapper;
import com.doumee.dao.business.CustomerMapper;
import com.doumee.dao.business.CustomerUserMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.Customer;
import com.doumee.dao.business.model.CustomerLog;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.FreeCustomizationDTO;
import com.doumee.dao.web.reqeust.RenovationCalculatorDTO;
import com.doumee.dao.web.reqeust.TestTrimStyleDTO;
@@ -22,6 +21,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.CustomerUserService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.checkerframework.checker.units.qual.A;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +48,8 @@

    @Autowired
    private CustomerLogMapper customerLogMapper;
    @Autowired
    private CustomerUserMapper customerUserMapper;

    @Autowired
    private MemberMapper memberMapper;
@@ -288,7 +291,6 @@
        customer.setOpenid(member.getOpenid());
        customer.setMemberId(member.getId());
        customer.setName(freeCustomizationDTO.getName());

        customer.setProName(freeCustomizationDTO.getProvinceName());
        customer.setCityName(freeCustomizationDTO.getCityName());
        customer.setAreaName(freeCustomizationDTO.getAreaName());
@@ -314,6 +316,29 @@
        customerLog.setAreaCode(freeCustomizationDTO.getAreaCode());
        customerLog.setName(freeCustomizationDTO.getName());
        customerLog.setPhone(freeCustomizationDTO.getPhone());
        customerLog.setUsernames(freeCustomizationDTO.getUsername());
        if(org.apache.commons.lang3.StringUtils.isBlank(freeCustomizationDTO.getUsername())){
            //如果导购信息为空，查询该客户已绑定的导购信息，传递给CRM使用
            List<CustomerUser> userList = customerUserMapper.selectJoinList(CustomerUser.class,
                    new MPJLambdaWrapper<CustomerUser>()
                    .selectAs(Users::getIamUsername,CustomerUser::getUsername)
                    .leftJoin(Users.class, Users::getId,CustomerUser::getUserId)
                    .eq(CustomerUser::getIsdeleted,Constants.ZERO)
                    .eq(CustomerUser::getCustomerPhone,customerLog.getPhone())
                    .groupBy(Users::getIamUsername));
            if(userList!=null && userList.size()>0){
                String names = "";
                for(CustomerUser cu : userList){
                    if(!names.equals("")){
                        names += ",";
                    }
                    names += cu.getUsername();
                }
                if(!names.equals("")){
                   customerLog.setUsernames(names);
                }
            }
        }
        customerLogMapper.insert(customerLog);
        customerLog.setOpenid(member.getOpenid());
        return  customerLog;

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

@@ -1,21 +1,13 @@
package com.doumee.api.web;

import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.config.annotation.UserLoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.dao.web.response.ZSZXCatalogResponse;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.UsersService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * Created by IntelliJ IDEA.