From c72c6591a15800e1e75fdc9c08f4f427ff60ba69 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 10:07:42 +0800
Subject: [PATCH] 代码提交
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 140 ++++++++++++++++
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java | 6
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java | 2
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java | 2
server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java | 118 ++------------
server/service/src/main/java/com/doumee/service/business/impl/GetCrmDataServiceImpl.java | 70 ++++++++
server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java | 1
server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMBaseResponse.java | 1
server/service/src/main/java/com/doumee/service/business/UsersService.java | 5
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 50 +++---
server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java | 24 ++
server/service/src/main/java/com/doumee/service/business/GetCrmDataService.java | 26 +++
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 2
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 26 ++
server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java | 4
15 files changed, 333 insertions(+), 144 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
index 5001973..36bffdc 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
@@ -95,9 +95,9 @@
ZTBaseResponse<ZTUserGetTokenResponse> result = sendHttpRequest(
ZTConstants.IntegerUrl.USER_UPDATE_URL,
ZTConstants.IntegerName.USER_UPDATE_NAME,
- param.getToken(),
- param.getUserType(),
- JSONObject.toJSONString(param ),
+ null,
+ null,
+ JSONObject.toJSONString(param),
new TypeReference<ZTBaseResponse<ZTUserGetTokenResponse>>(){});
// if(result!=null){
// return result.getData();
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMBaseResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMBaseResponse.java
index 5d93183..45787d8 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMBaseResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMBaseResponse.java
@@ -16,6 +16,7 @@
*/
private String msg;
private int total;
+ private Boolean hasMore;
/**
* 鏁版嵁
*/
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
index 8ddcaee..836913f 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
@@ -25,7 +25,7 @@
String JIADE_ID ="zb_deco_jdid";
}
public interface IntegerUrl{
- String USER_UPDATE_URL ="customer/api/sync";
+ String USER_UPDATE_URL ="/customer/api/sync";
String USER_GET_TOKEN_URL ="/customer/api/login";
String USER_LOGOUT_URL ="/customer/api/disable";
String CATALOG_LIST_URL ="/content/api/catalog";
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java b/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
index 5462d9d..e36119d 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
@@ -155,4 +155,8 @@
@TableField(exist = false)
private String openid;
+ @ApiModelProperty(value = "C绔敤鎴蜂富閿�")
+ @TableField(exist = false)
+ private Long memberId;
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/GetCrmDataService.java b/server/service/src/main/java/com/doumee/service/business/GetCrmDataService.java
new file mode 100644
index 0000000..2fb2372
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/GetCrmDataService.java
@@ -0,0 +1,26 @@
+package com.doumee.service.business;
+
+import com.doumee.biz.zbom.model.crm.CrmCustomerListRequest;
+import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse;
+import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse;
+import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
+import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
+import com.doumee.biz.zbom.model.zhongtai.response.*;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛琛屼负鏁版嵁淇℃伅琛⊿ervice瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2024/07/04 14:40
+ */
+public interface GetCrmDataService {
+
+ /**
+ * 鑾峰彇CRM 瀹㈡埛鍒楄〃/娼滃鍒楄〃
+ * @param crmCustomerListRequest
+ * @return
+ */
+ CRMBaseResponse<List<CRMCustomerListResponse>> getCrmCustomerList(CrmCustomerListRequest crmCustomerListRequest);
+
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
index 947d165..224a828 100644
--- a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
+++ b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
@@ -59,7 +59,7 @@
void collectContent(Long userId,String userType,String articleId);
/**
- * 鏀惰棌涓氬姟
+ * 鍠滄涓氬姟
* @param userId
* @param userType
* @param articleId
diff --git a/server/service/src/main/java/com/doumee/service/business/UsersService.java b/server/service/src/main/java/com/doumee/service/business/UsersService.java
index 66228f0..c376519 100644
--- a/server/service/src/main/java/com/doumee/service/business/UsersService.java
+++ b/server/service/src/main/java/com/doumee/service/business/UsersService.java
@@ -109,12 +109,13 @@
String importBatch(MultipartFile file);
- Users usersDetail(Long userId);
+ Users usersDetailByIamId(String iamId);
+
+ Users usersDetailById(Long id);
String getUserCard(Users users);
void editUserInfo(EditUsersRequest editUsersRequest);
-
String getContentShareImg(Users loginUserInfo, ContentShareImgDto param);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
index 3f22e36..0afa131 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
@@ -20,10 +20,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -216,8 +218,26 @@
List<BjParam> bjParamList = bjParamMapper.selectList(new QueryWrapper<BjParam>()
.lambda().eq(BjParam::getIsdeleted,Constants.ZERO));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(bjParamList)){
- List<BjParam> roughList = bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO+"")).collect(Collectors.toList());
- List<BjParam> exquisiteList = bjParamList.stream().filter(i->i.getType().equals(Constants.ONE+"")).collect(Collectors.toList());
+ List<BjParam> roughList = bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO+"")&& StringUtils.isEmpty(i.getParentId())).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(roughList)){
+ for (BjParam bjParam:roughList) {
+ bjParam.setChildren(
+ bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO+"")
+ && Objects.nonNull(i.getParentId())
+ && i.getParentId().equals(bjParam.getId())).collect(Collectors.toList())
+ );
+ }
+ }
+ List<BjParam> exquisiteList = bjParamList.stream().filter(i->i.getType().equals(Constants.ONE+"")&& StringUtils.isEmpty(i.getParentId())).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(exquisiteList)){
+ for (BjParam bjParam:exquisiteList) {
+ bjParam.setChildren(
+ bjParamList.stream().filter(i->i.getType().equals(Constants.ONE+"")
+ && Objects.nonNull(i.getParentId())
+ && i.getParentId().equals(bjParam.getId())).collect(Collectors.toList())
+ );
+ }
+ }
bjParamConfigResponse.setRoughList(roughList);
bjParamConfigResponse.setExquisiteList(exquisiteList);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
index 41dacb0..31792c8 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
@@ -2,21 +2,22 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CustomerLogMapper;
-import com.doumee.dao.business.model.CustomerLog;
-import com.doumee.dao.business.model.IamInterfaceLog;
-import com.doumee.dao.business.model.InterfaceLog;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.CustomerLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 瀹㈡埛鐣欒祫璁板綍淇℃伅琛⊿ervice瀹炵幇
@@ -89,106 +90,21 @@
@Override
public PageData<CustomerLog> findPage(PageWrap<CustomerLog> pageWrap) {
IPage<CustomerLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<CustomerLog> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<CustomerLog> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(CustomerLog::getId, pageWrap.getModel().getId());
+ queryWrapper.selectAll(CustomerLog.class)
+ .leftJoin(Customer.class,Customer::getId,CustomerLog::getCostomerId)
+ .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());
+ queryWrapper.orderByDesc(CustomerLog::getCreateDate);
+ PageData<CustomerLog> pageData = PageData.from(customerLogMapper.selectJoinPage(page,CustomerLog.class, queryWrapper));
+ for (CustomerLog customerLog:pageData.getRecords()) {
+ customerLog.setPhone(
+ customerLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")
+ );
}
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(CustomerLog::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(CustomerLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(CustomerLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(CustomerLog::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(CustomerLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(CustomerLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(CustomerLog::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(CustomerLog::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getOrderDate() != null) {
- queryWrapper.lambda().eq(CustomerLog::getOrderDate, pageWrap.getModel().getOrderDate());
- }
- if (pageWrap.getModel().getPlaDate() != null) {
- queryWrapper.lambda().eq(CustomerLog::getPlaDate, pageWrap.getModel().getPlaDate());
- }
- if (pageWrap.getModel().getDesignType() != null) {
- queryWrapper.lambda().eq(CustomerLog::getDesignType, pageWrap.getModel().getDesignType());
- }
- if (pageWrap.getModel().getHouseStatus() != null) {
- queryWrapper.lambda().eq(CustomerLog::getHouseStatus, pageWrap.getModel().getHouseStatus());
- }
- if (pageWrap.getModel().getDistrict() != null) {
- queryWrapper.lambda().eq(CustomerLog::getDistrict, pageWrap.getModel().getDistrict());
- }
- if (pageWrap.getModel().getArea() != null) {
- queryWrapper.lambda().eq(CustomerLog::getArea, pageWrap.getModel().getArea());
- }
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(CustomerLog::getInfo, pageWrap.getModel().getInfo());
- }
- if (pageWrap.getModel().getCostomerId() != null) {
- queryWrapper.lambda().eq(CustomerLog::getCostomerId, pageWrap.getModel().getCostomerId());
- }
- if (pageWrap.getModel().getHouseType() != null) {
- queryWrapper.lambda().eq(CustomerLog::getHouseType, pageWrap.getModel().getHouseType());
- }
- if (pageWrap.getModel().getSex() != null) {
- queryWrapper.lambda().eq(CustomerLog::getSex, pageWrap.getModel().getSex());
- }
- if (pageWrap.getModel().getAgeInfo() != null) {
- queryWrapper.lambda().eq(CustomerLog::getAgeInfo, pageWrap.getModel().getAgeInfo());
- }
- if (pageWrap.getModel().getStyleInfo() != null) {
- queryWrapper.lambda().eq(CustomerLog::getStyleInfo, pageWrap.getModel().getStyleInfo());
- }
- if (pageWrap.getModel().getProvinceName() != null) {
- queryWrapper.lambda().like(CustomerLog::getProvinceName, pageWrap.getModel().getProvinceName());
- }
- if (pageWrap.getModel().getCityName() != null) {
- queryWrapper.lambda().like(CustomerLog::getCityName, pageWrap.getModel().getCityName());
- }
- if (pageWrap.getModel().getProvicneCode() != null) {
- queryWrapper.lambda().eq(CustomerLog::getProvicneCode, pageWrap.getModel().getProvicneCode());
- }
- if (pageWrap.getModel().getCityCode() != null) {
- queryWrapper.lambda().eq(CustomerLog::getCityCode, pageWrap.getModel().getCityCode());
- }
- if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().like(CustomerLog::getPhone, pageWrap.getModel().getPhone());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(CustomerLog::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getBudget() != null) {
- queryWrapper.lambda().eq(CustomerLog::getBudget, pageWrap.getModel().getBudget());
- }
- if (pageWrap.getModel().getCrmStatus() != null) {
- queryWrapper.lambda().eq(CustomerLog::getCrmStatus, pageWrap.getModel().getCrmStatus());
- }
- if (pageWrap.getModel().getCrmDate() != null) {
- queryWrapper.lambda().ge(CustomerLog::getCrmDate, Utils.Date.getStart(pageWrap.getModel().getCrmDate()));
- queryWrapper.lambda().le(CustomerLog::getCrmDate, Utils.Date.getEnd(pageWrap.getModel().getCrmDate()));
- }
- if (pageWrap.getModel().getCrmInfo() != null) {
- queryWrapper.lambda().eq(CustomerLog::getCrmInfo, pageWrap.getModel().getCrmInfo());
- }
- if (pageWrap.getModel().getQueryStartDate() != null) {
- queryWrapper.lambda().ge(CustomerLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getQueryStartDate()));
- }
- if (pageWrap.getModel().getQueryEndDate() != null) {
- queryWrapper.lambda().le(CustomerLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getQueryEndDate()));
- }
- queryWrapper.lambda().orderByDesc(CustomerLog::getCreateDate);
- return PageData.from(customerLogMapper.selectPage(page, queryWrapper));
+ return pageData;
}
@Override
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
index 1416905..01f0050 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
@@ -245,6 +245,7 @@
customerLog.setIsdeleted(Constants.ZERO);
customerLog.setType(Constants.TWO);
customerLog.setCrmStatus(Constants.ZERO);
+ customerLog.setName(StringUtils.isEmpty(member.getName())?member.getNickname():member.getName());
customerLog.setPhone(customer.getPhone());
customerLog.setBudget(renovationCalculatorDTO.getBudget().multiply(new BigDecimal(10000)).toString());
customerLog.setHouseStatus(renovationCalculatorDTO.getHouseStatus());
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetCrmDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetCrmDataServiceImpl.java
new file mode 100644
index 0000000..7829dcc
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetCrmDataServiceImpl.java
@@ -0,0 +1,70 @@
+package com.doumee.service.business.impl;
+
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.biz.zbom.ZbomCRMService;
+import com.doumee.biz.zbom.ZbomZhongTaiService;
+import com.doumee.biz.zbom.model.crm.CrmCustomerListRequest;
+import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse;
+import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse;
+import com.doumee.biz.zbom.model.zhongtai.*;
+import com.doumee.biz.zbom.model.zhongtai.response.*;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.UsersMapper;
+import com.doumee.dao.web.response.ZTBaseInfoResponse;
+import com.doumee.service.business.GetCrmDataService;
+import com.doumee.service.business.GetZhongTaiDataService;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/7/15 14:12
+ */
+@Service
+public class GetCrmDataServiceImpl implements GetCrmDataService {
+
+ @Autowired
+ private ZbomCRMService zbomCRMService;
+
+ @Autowired
+ private MemberMapper memberMapper;
+
+ @Autowired
+ private UsersMapper usersMapper;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+
+ @Override
+ public CRMBaseResponse<List<CRMCustomerListResponse>> getCrmCustomerList(CrmCustomerListRequest crmCustomerListRequest){
+ if(Objects.isNull(crmCustomerListRequest)
+ || Objects.isNull(crmCustomerListRequest.getPage())
+ || Objects.isNull(crmCustomerListRequest.getPageSize())
+ || StringUtils.isBlank(crmCustomerListRequest.getFlag())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ CRMBaseResponse<List<CRMCustomerListResponse>> crmBaseResponse = zbomCRMService.getCustomerList(crmCustomerListRequest);
+ if(Objects.isNull(crmBaseResponse)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"CRM鎺ュ彛璇锋眰澶辫触!");
+ }
+ return crmBaseResponse;
+ }
+
+
+
+
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 9caf811..deea2cc 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -277,15 +277,15 @@
@Override
public AccountResponse wxLogin(String code){
- try {
+// try {
//鑾峰彇寰俊鏁忔劅鏁版嵁
- WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
- String openId = session.getOpenid();
- if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
- }
+// WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
+// String openId = session.getOpenid();
+// if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
+// }
+ String openId = code;
Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
- String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
if (member == null) {
member = new Member();
member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4));
@@ -294,21 +294,21 @@
member.setOpenid(openId);
member.setType(Constants.ZERO);
member.setAuthStatus(Constants.ZERO);
- // ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
- // if(Objects.isNull(ztUserGetTokenResponse)){
- // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
- // }else{
- // member.setToken(ztUserGetTokenResponse.getToken());
- // }
+ ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
+ if(Objects.isNull(ztUserGetTokenResponse)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
+ }else{
+ member.setToken(ztUserGetTokenResponse.getToken());
+ }
memberMapper.insert(member);
member = this.getMemberInfo(member.getId());
}else{
- // ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
- // if(Objects.isNull(ztUserGetTokenResponse)){
- // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
- // }else{
- // member.setToken(ztUserGetTokenResponse.getToken());
- // }
+ ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
+ if(Objects.isNull(ztUserGetTokenResponse)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
+ }else{
+ member.setToken(ztUserGetTokenResponse.getToken());
+ }
member = this.getMemberInfo(member.getId());
}
//鍒涘缓token
@@ -316,13 +316,13 @@
String token = JwtTokenUtil.generateToken(payLoad);
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
- accountResponse.setSessionKey(session.getSessionKey());
+// accountResponse.setSessionKey(session.getSessionKey());
accountResponse.setMember(member);
return accountResponse;
- } catch (WxErrorException e) {
- e.printStackTrace();
- }
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
+// } catch (WxErrorException e) {
+// e.printStackTrace();
+// }
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
}
@Override
@@ -398,7 +398,7 @@
ztUserInfoUpdateRequest.setPlatform(Constants.PLATFORM);
ztUserInfoUpdateRequest.setPhone(member.getPhone());
ztUserInfoUpdateRequest.setName(member.getNickname());
- ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+// ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index 9ae75bf..2563448 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -738,11 +738,32 @@
}
@Override
- public Users usersDetail(Long userId){
- Users users = usersMapper.selectById(userId);
+ public Users usersDetailByIamId(String iamId){
+ Users users = usersMapper.selectOne(new QueryWrapper<Users>().lambda().eq(Users::getIamId,iamId).last("limit 1"));
if(Objects.isNull(users)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+ if(Constants.equalsInteger(users.getIsdeleted(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢ㄦ埛宸茬鐢�");
+ }
+ getUsersDetail(users);
+ return users;
+ }
+
+ @Override
+ public Users usersDetailById(Long id){
+ Users users = usersMapper.selectById(id);
+ if(Objects.isNull(users)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Constants.equalsInteger(users.getIsdeleted(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢ㄦ埛宸茬鐢�");
+ }
+ getUsersDetail(users);
+ return users;
+ }
+
+ public void getUsersDetail(Users users){
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())){
@@ -769,7 +790,6 @@
}
}
}
- return users;
}
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index dc15110..e8908cb 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -2,6 +2,9 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.zbom.ZbomCRMService;
+import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
+import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
+import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
@@ -31,6 +34,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.InputStream;
+import java.util.List;
/**
* Created by IntelliJ IDEA.
@@ -46,6 +50,8 @@
public class CustomerApi extends ApiController{
+
+
@Autowired
private MemberService memberService;
@@ -56,7 +62,7 @@
private CustomerService customerService;
@Autowired
- private ZbomCRMService zbomCRMService;
+ private GetZhongTaiDataService getZhongTaiDataService;
@Autowired
private ShopService shopService;
@@ -68,6 +74,9 @@
private CustomerUserService customerUserService;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private CustomerLogService customerLogService;
@ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/wxLoginCustomer")
@@ -232,13 +241,13 @@
@LoginRequired
@ApiOperation(value = "瀵艰喘璇︽儏", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/usersDetail")
+ @GetMapping("/usersDetailByIamId")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "Long", name = "userId", value = "瀵艰喘涓婚敭", required = true)
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "iamId", value = "瀵艰喘IAM缂栫爜", required = true)
})
- public ApiResponse<Users> usersDetail (@RequestParam Long userId) {
- return ApiResponse.success(usersService.usersDetail(userId));
+ public ApiResponse<Users> usersDetailByIamId (@RequestParam String iamId) {
+ return ApiResponse.success(usersService.usersDetailByIamId(iamId));
}
@@ -274,7 +283,128 @@
}
}
+ @LoginRequired
+ @ApiOperation(value = "鎴戠殑棰勭害鍒嗛〉鏌ヨ",notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/customerLogPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<PageData<CustomerLog>> customerLogPage(@RequestBody PageWrap<CustomerLog> pageWrap) {
+ pageWrap.getModel().setCostomerId(getMemberId().toString());
+ return ApiResponse.success(customerLogService.findPage(pageWrap));
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鍒嗙被鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getCatalogList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<ZTCatalogInfoResponse>> getCatalogList (@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
+ List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponseList);
+ }
+
+
+
+ @LoginRequired
+ @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getCataLogTagList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<ZTTagInfoResponse>> getCataLogTagList(@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
+ List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZTCatalogInfoResponse")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<ZTCatalogInfoResponse>> getZTCatalogInfoResponse(@RequestBody ZTCatalogListRequest ztCatalogListRequest) {
+ List<ZTCatalogInfoResponse> ztCatalogInfoResponse = getZhongTaiDataService.getZTCatalogInfoResponse(ztCatalogListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponse);
+ }
+
+ @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,Constants.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(),Constants.CUSTOMER,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(getMemberId(),Constants.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(),Constants.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(),Constants.CUSTOMER,id);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
}
diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
index 42bac63..9c8dfa3 100644
--- a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -103,7 +103,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse getUserDetail() {
- usersService.usersDetail(getMemberId());
+ usersService.usersDetailById(getMemberId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
--
Gitblit v1.9.3