提交

jiangping

2024-07-17 9c9f756145fcf2d71d4e0a15817a87192c7fca84

提交

 .idea/libraries/Maven__com_alibaba_fastjson_1_2_70.xml

ÎļþÒÑɾ³ý

 server/admin/admin.iml

@@ -140,7 +140,9 @@
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi:5.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />

 server/pom.xml

@@ -29,7 +29,7 @@
    <java.version>1.8</java.version>
    <swagger.version>2.9.2</swagger.version>
    <swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version>
    <fastjson.version>1.2.70</fastjson.version>
    <fastjson.version>2.0.52</fastjson.version>
    <druid.version>1.2.0</druid.version>
    <mybatis.plus.version>3.5.7</mybatis.plus.version>
    <apache.shiro.version>1.7.0</apache.shiro.version>

 server/service/service.iml

@@ -139,7 +139,9 @@
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi:5.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />

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

@@ -1,6 +1,8 @@
package com.doumee.biz.zbom.model.crm;

import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -10,9 +12,11 @@
import java.util.List;

@Data
@JsonSerialize
@ApiModel("志邦CRM客户留资提交外层参数")
public   class CrmCustomerPostRequest extends CRMBaseRequst implements Serializable {
    @JsonProperty("cus_info")
    @SerializedName("cus_info")
    @JSONField(name = "cus_info")
    private List< CrmCustomerInfoRequest > cusInfo;
}

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

@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai.response;

import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonAlias;
import lombok.Data;

@@ -11,21 +12,21 @@
    /**
     * è®°å½•åˆ—表
     */
    @JsonAlias( {"data","records","userFavoriteList","userBehaviorList","customerFavoritesList"})
    @JSONField(name="records",alternateNames = {"data","records","userFavoriteList","userBehaviorList","customerFavoritesList"})
    private List<T> records;
    /**
     * å½“前页
     */
    @JsonAlias(  {"pageCount","pageNum"})
    @JSONField(name="pageNum",alternateNames =  {"pageCount","pageNum"})
    private String pageNum;
    /**
     * æ¯é¡µæ¡æ•°
     */
    @JsonAlias( {"pageSize",})
    @JSONField(name="pageSize",alternateNames = {"pageSize"})
    private String pageSize;
    /**
     * æ€»æ•°
     */
    @JsonAlias( {"totalCount","total"})
    @JSONField(name="total",alternateNames = {"totalCount","total"})
    private String total;
}

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

@@ -5,6 +5,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CrmInterfaceLogMapper;
import com.doumee.dao.business.model.CrmInterfaceLog;
import com.doumee.dao.business.model.IamInterfaceLog;
import com.doumee.service.business.CrmInterfaceLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -139,13 +140,7 @@
        if (pageWrap.getModel().getObjId() != null) {
            queryWrapper.lambda().eq(CrmInterfaceLog::getObjId, pageWrap.getModel().getObjId());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.lambda().orderByDesc(CrmInterfaceLog::getCreateDate);
        return PageData.from(crmInterfaceLogMapper.selectPage(page, queryWrapper));
    }


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

@@ -210,6 +210,7 @@
                        || response.getData() ==null
                        || response.getData().size() ==0){
                    hasMore = false;
                }else{
                    allList.addAll(response.getData());
                    currentNum += response.getTotal();
                }
@@ -224,6 +225,9 @@
    }

    private void dealSyncDataBiz(Date date,List<CRMDaogouBindListResponse> list) {
        if(list ==null && list.size()==0){
            return;
        }
        List<CustomerUser> addList = new ArrayList<>();
        List<String> phoneList = new ArrayList<>();
        for(CRMDaogouBindListResponse data : list){

 server/web/web.iml

@@ -140,7 +140,9 @@
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi:5.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />

 server/zbomyoujia.iml

@@ -128,7 +128,9 @@
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.52" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi:5.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />