diff --git a/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java b/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java index 81e516f..2eb5fe6 100644 --- a/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java +++ b/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java @@ -55,6 +55,22 @@ public class CustomerViewController extends BaseController { } } + /** + * 客户概览main + * @return 客户概览VO + */ + @ResponseBody + @RequestMapping(value = "/all/count", method = RequestMethod.GET) + public Map getAllCount(){ + try{ + CustomerViewVO result = customerViewService.getAllCount(); + return data(result); + }catch (Exception e){ + log.error("查询客户数据概览出错", e); + return fail(); + } + } + /** * 找到所有推广为0店铺 * @param userId 用户id diff --git a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java index de55c57..a59665a 100644 --- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java +++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java @@ -7,6 +7,7 @@ import com.kiisoo.ic.customer.entity.*; import com.kiisoo.ic.customer.mapper.OpCustomerDOMapper; import com.kiisoo.ic.customer.mapper.OpVipDOMapper; import com.kiisoo.ic.domain.service.PrivilageDomainService; +import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; import com.kiisoo.ic.generalize.entity.PoiCustomerContactDataStat; import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; import com.kiisoo.ic.generalize.mapper.PoiCustomerContactDataStatMapper; @@ -55,6 +56,11 @@ public class CustomerViewService { */ @Autowired private PrivilageDomainService privilageDomainService; + /** + * 用户权限mapper + */ + @Autowired + private PrivilageCpUserDOMapper privilageCpUserDOMapper; /** * 店铺mapper @@ -492,4 +498,12 @@ public class CustomerViewService { } + public CustomerViewVO getAllCount() { + Long all = privilageCpUserDOMapper.selectAllCount(); + Long dis = privilageCpUserDOMapper.selectDistinctAllCount(); + CustomerViewVO result = new CustomerViewVO(); + result.setAllCustomer(all); + result.setAllValidCustomer(dis); + return result; + } } diff --git a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java index b3b93a2..8b8c4f1 100644 --- a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java +++ b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java @@ -2,8 +2,14 @@ package com.kiisoo.ic.employee.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @Repository public interface PrivilageCpUserDOMapper extends BaseMapper { + int insertCpUserCustomerRelation(@Param("customerUserId")String custeromUserId,@Param("cpUserId")String cpUserId,@Param("cpId")Long cpId); + + Long selectAllCount(); + + Long selectDistinctAllCount(); } diff --git a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java index d22adde..cb8630a 100644 --- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java +++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java @@ -1,6 +1,10 @@ package com.kiisoo.ic.employee.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.kiisoo.ic.common.utils.MD5FileUtil; +import com.kiisoo.ic.common.utils.httpClientUtil.HttpClientUtil; +import com.kiisoo.ic.common.utils.httpClientUtil.HttpResult; import com.kiisoo.ic.customer.CustomerService; import com.kiisoo.ic.customer.entity.OpSellerCustomerRelation; import com.kiisoo.ic.customer.mapper.OpSellerCustomerRelationDOMapper; @@ -527,7 +531,9 @@ public class EmployeeService { wxDataDTO.setUserId(externalContact.getExternalUserId()); wxDataDTO.setUnionId(externalContact.getUnionId()); turnBackDTO.setWxData(wxDataDTO); - +// HttpResult httpResult = HttpClientUtil.httpPost("http://127.0.0.1:8080/kiisoo-ic/api/ics/customer", JSONObject.toJSONString(turnBackDTO)); +// String message = httpResult.getMessage(); +// message customerService.turnBack(turnBackDTO); } } diff --git a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml new file mode 100644 index 0000000..2ecc02e --- /dev/null +++ b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml @@ -0,0 +1,16 @@ + + + + + insert into op_cp_user_customer_relation (customer_user_id,cp_user_id,cp_id)values (#{customerUserId},#{cpUserId},#{cpId}) + + + + + + +