Commit 20a191b2 by 徐高华

會員查詢

parent b56dfe29
......@@ -206,6 +206,11 @@
<artifactId>gic-search-engine-api</artifactId>
<version>${gic-search-engine-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-marketing-api</artifactId>
<version>${gic-marketing-api}</version>
</dependency>
</dependencies>
<build>
......
......@@ -5,6 +5,7 @@ import java.util.Date;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
......@@ -15,6 +16,7 @@ import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.manage.web.vo.MemberChatVO;
import com.gic.marketing.api.service.MemberTagMarketingApiService;
import com.gic.member.api.dto.MemberDTO;
import com.gic.member.api.service.MemberService;
import com.gic.search.engine.api.dto.ESResponseQueryCount;
......@@ -32,6 +34,8 @@ public class MemberController {
private StoreService storeService;
@Autowired
private ESDataDynamicOperationApiService esApiService;
@Autowired
private MemberTagMarketingApiService memberTagMarketingApiService;
@RequestMapping("member-info")
public RestResponse<Object> memberInfo(String memberId) {
......@@ -50,12 +54,19 @@ public class MemberController {
*/
@RequestMapping("member-count")
@ResponseBody
public RestResponse<Object> getMemberCount(String searchParams) {
public RestResponse<Object> getMemberCount(String searchParams, @RequestParam(defaultValue = "0") int memberType) {
if (StringUtils.isBlank(searchParams)) {
return RestResponse.successResult(0);
}
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
String enterpriseId = loginUser.getEnterpriseId();
String clerkId = loginUser.getClerkId();
int count = 0;
try {
// 会员分组
if (memberType == 1) {
searchParams = memberTagMarketingApiService.getMemberTagJson(enterpriseId, searchParams, clerkId);
}
JSONObject searchJson = new JSONObject();
if (!StringUtils.isBlank(searchParams)) {
searchJson = JSON.parseObject(searchParams);
......
......@@ -22,6 +22,15 @@ public class HmLinkChatVO implements Serializable {
private Long chatHmId;
/**会员类型(0:会员筛选,1:会员分组)*/
private Integer memberType;
private String esId ;
public String getEsId() {
return esId;
}
public void setEsId(String esId) {
this.esId = esId;
}
public void setLinkChatId(Long linkChatId) {
this.linkChatId = linkChatId;
......
......@@ -130,5 +130,6 @@
<dubbo:reference interface="com.gic.haoban.manage.api.service.out.SecretSettingApiService" id="secretSettingApiService"/>
<dubbo:reference interface="com.gic.member.api.service.MemberService" id="memberService"/>
<dubbo:reference interface="com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService" id="esApiService"/>
<dubbo:reference interface="com.gic.marketing.api.service.MemberTagMarketingApiService" id="memberTagMarketingApiService"/>
</beans>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment