Skip to content

H
haoban-manage3.0
Commit 3e68b3dc by qwmqiuwenmin
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !79
parents 8067d24f d033df63
Showing with 455 additions and 59 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/EnterpriseDetailDTO.java
......@@ -21,6 +21,7 @@ public class EnterpriseDetailDTO implements Serializable{
private String staffId;
private String staffName;
private Date createTime;
private String brandName;
public String getWxEnterpriseRelatedId() {
return wxEnterpriseRelatedId;
}
......@@ -81,6 +82,12 @@ public class EnterpriseDetailDTO implements Serializable{
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getBrandName() {
return brandName;
}
public void setBrandName(String brandName) {
this.brandName = brandName;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AppPageType.java
......@@ -29,7 +29,11 @@ public enum AppPageType {
//门店关联记录
STORE_RELATED_RECORD(12, "store_relate_store_record_list"),
//edaixi订单详情
EDAIXI_DETAIL(13, "hbapp_eWashing_order_preview");
EDAIXI_DETAIL(13, "hbapp_eWashing_order_preview"),
//人脸到店
FACE_ARRIVAL(14, "hbapp_customer_bind_faceId"),
//完善标签
PERFECT_TAG(15, "hbapp_customer_edit_tag");
AppPageType(int type, String desc){
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MessageApiService.java
......@@ -24,4 +24,24 @@ public interface MessageApiService {
* @param param
*/
void dealWxMessage(String param);
/**
* 发送消费消息
* @param clerkId
* @param memberId
* @param memberName
* @param arrivalTime
* @param storeId
* @return
*/
Boolean sendFaceMessage(String clerkId,String memberId, String memberName, String arrivalTime,String storeId);
/**
* 发送完善标签信息
* @param clerkId
* @param clerkId
* @param memberName
* @param customerTime
* @param orderId
* @param storeId
*/
Boolean sendPerfectRemarkMessage(String clerkId, String memberId,String memberName, String customerTime, String orderId,String storeId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java
......@@ -234,16 +234,16 @@ public class AuditApiServiceImpl implements AuditApiService{
//门店导购新增
String oldValue = tab.getOldValue();
AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class);
boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(tab.getCommitStoreId(), obj.getClerkCode(), obj.getSex(), obj.getClerkName(), obj.getPhoneNumber(), obj.getNationCode(), null);
if(!flag){
String flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAddNew(tab.getCommitStoreId(), obj.getClerkCode(), obj.getSex(), obj.getClerkName(), obj.getPhoneNumber(), obj.getNationCode(), null);
if(!"1".equals(flag)){
//失败
tab.setAuditStatus(5);
tab.setAuditReason("gic新增导购失败");
tab.setAuditReason(flag);
auditMapper.updateByPrimaryKeySelective(tab);
if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
insertBatchLog( batchId,AuditRsultType.fail.getCode(), tab);
}
return "gic新增导购失败";
return flag;
}else{
//成功
if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
......@@ -334,6 +334,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
if(member != null){
exsitDTO.setMemberId(member.getMemberId());
}
exsitDTO.setMemberUnionidRelatedId(dto.getMemberUnionidRelatedId());
exsitDTO.setExternalUserId(externalUserId);
exsitDTO.setUnionid(unionId);
exsitDTO.setStoreId(storeId);
......@@ -526,6 +527,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
//更新对外联系人id
exsitDTO.setSelfExternalUserid(selfExternalUserId);
memberUnionRelatedService.update(exsitDTO);
uuid = exsitDTO.getMemberUnionidRelatedId();
//return "";
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java
package com.gic.haoban.manage.service.service.out.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GICMQClientUtil;
import com.gic.commons.util.GlobalInfo;
......@@ -14,26 +15,38 @@ import com.gic.haoban.manage.api.dto.DepartmentDTO;
import com.gic.haoban.manage.api.dto.GicClerkDTO;
import com.gic.haoban.manage.api.dto.GicMessageDTO;
import com.gic.haoban.manage.api.dto.QywxCallBackDTO;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
import com.gic.haoban.manage.api.dto.WxApplicationDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.enums.AppPageType;
import com.gic.haoban.manage.api.enums.GicDataType;
import com.gic.haoban.manage.api.enums.GicEditType;
import com.gic.haoban.manage.api.enums.WxEditType;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.MessageApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
import com.gic.haoban.manage.service.config.Config;
import com.gic.haoban.manage.service.entity.*;
import com.gic.haoban.manage.service.service.*;
import com.gic.mq.sdk.GicMQClient;
import com.gic.thirdparty.api.dto.PicUploadResDTO;
import com.gic.thirdparty.api.service.QQCloudPicService;
import com.gic.wechat.api.dto.qywx.ItemDTO;
import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
......@@ -81,6 +94,18 @@ public class MessageApiServiceImpl implements MessageApiService {
@Autowired
private StoreService storeService;
@Autowired
private StaffClerkRelationApiService staffClerkRelationApiService;
@Autowired
private QywxSuiteApiService qywxSuiteApiService;
@Autowired
private WxEnterpriseService wxEnterpriseService;
@Autowired
private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
@Override
public void gicMessageReceive(GicMessageDTO gicMessageDTO) {
......@@ -492,8 +517,62 @@ public class MessageApiServiceImpl implements MessageApiService {
//DepartmentDTO departmentDTO = this.departmentService.getRootByEnterpriseId(wxEnterpriseId);
return null;
}
@Override
public Boolean sendFaceMessage(String clerkId,String memberId,String memberName,String arrivalTime,String storeId) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("memberId", memberId);
jsonObject.put("storeId", storeId);
String data = jsonObject.toJSONString();
String pageUrl = staffDepartmentRelatedApiService.getPageUrl(AppPageType.FACE_ARRIVAL.getCode(), data);
StaffClerkRelationDTO relation = staffClerkRelationApiService.getByClerkId(clerkId);
if(relation == null){
log.info("clerkId未绑定:clerkId={}",clerkId);
return false;
}
WxEnterpriseDTO wxEnterprise = wxEnterpriseService.selectById(relation.getWxEnterpriseId());
if(wxEnterprise == null){
log.info("企业为空");
return false;
}
if(relation != null){
String userId = relation.getWxUserId();
QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
Map<String,String> map = new HashMap<>();
map.put("事件", "人脸匹配");
map.put("会员", memberName);
map.put("到店时间", arrivalTime);
List<ItemDTO> items = getItemsList(map);
ArrayList<String> list = new ArrayList<>();
list.add(userId);
messageDTO.setAppid(config.getAppid());
messageDTO.setUserIds(list);
messageDTO.setPage(pageUrl);
messageDTO.setTitle("我的顾客通知");
messageDTO.setItems(items);
public static void main(String[] args){
boolean b = qywxSuiteApiService.sendMessage(wxEnterprise.getCorpid(),config.getWxSuiteid(), messageDTO);
return b;
}
return false;
}
private List<ItemDTO> getItemsList(Map<String, String> map) {
List<ItemDTO> items = new ArrayList();
Iterator<String> it = map.keySet().iterator();
while (it.hasNext()) {
String key = it.next();
String value = map.get(key);
ItemDTO dto = new ItemDTO();
dto.setKey(key);
dto.setValue(value);
items.add(dto);
}
return items;
}
public static void main(String[] args){
String parentChain = "1_";
String[] arr = parentChain.split("_");
int len = arr.length;
......@@ -503,4 +582,46 @@ public class MessageApiServiceImpl implements MessageApiService {
System.out.println(i);
}
}
@Override
public Boolean sendPerfectRemarkMessage(String clerkId,String memberId, String memberName, String customerTime, String orderId,String storeId) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("memberId", memberId);
jsonObject.put("storeId", storeId);
jsonObject.put("currentTab", 1);
String data = jsonObject.toJSONString();
String pageUrl = staffDepartmentRelatedApiService.getPageUrl(AppPageType.PERFECT_TAG.getCode(), data);
StaffClerkRelationDTO relation = staffClerkRelationApiService.getByClerkId(clerkId);
if(relation == null){
log.info("clerkId未绑定:clerkId={}",clerkId);
return false;
}
WxEnterpriseDTO wxEnterprise = wxEnterpriseService.selectById(relation.getWxEnterpriseId());
if(wxEnterprise == null){
log.info("企业为空");
return false;
}
if(relation != null){
String userId = relation.getWxUserId();
QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
Map<String,String> map = new HashMap<>();
map.put("事件", "会员完善标签");
map.put("会员", memberName);
map.put("消费订单", orderId);
map.put("消费时间", customerTime);
List<ItemDTO> items = getItemsList(map);
ArrayList<String> list = new ArrayList<>();
list.add(userId);
messageDTO.setAppid(config.getAppid());
messageDTO.setUserIds(list);
messageDTO.setPage(pageUrl);
messageDTO.setTitle("我的顾客通知");
messageDTO.setItems(items);
boolean b = qywxSuiteApiService.sendMessage(wxEnterprise.getCorpid(),config.getWxSuiteid(), messageDTO);
return b;
}
return false;
}
}
haoban-manage3-service/src/test/java/ServiceTest.java
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.JSONResponse;
import com.gic.commons.util.GICMQClientUtil;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
......@@ -7,6 +8,7 @@ import com.gic.haoban.manage.api.service.TestApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.service.service.MemberUnionRelatedService;
import com.gic.haoban.manage.service.util.EmojiFilterUtil;
import com.gic.mq.sdk.GicMQClient;
import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.dto.qywx.DepartmentDTO;
import com.gic.wechat.api.dto.qywx.QywxImageExternalMessageDTO;
......@@ -70,7 +72,13 @@ public class ServiceTest {
public void test() {
List<String> staffIds = new ArrayList<>();
staffIds.add("0006ae5de6484cf9b55072d2d967c481");
memberUnionRelatedService.cleanStaffRelated("ca66a01b79474c40b3e7c7f93daf1a3b", staffIds);
GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
try {
clientInstance.sendMessage("haoban3OrderBackForFaceMq","11111");
} catch (Exception e) {
e.printStackTrace();
}
// memberUnionRelatedService.cleanStaffRelated("ca66a01b79474c40b3e7c7f93daf1a3b", staffIds);
// int i=2000;
// while (i-->0) {
// departmentApiService.listAllDepartment(i+"");
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java
......@@ -27,6 +27,7 @@ import com.gic.haoban.manage.web.anno.IgnoreLogin;
import com.gic.haoban.manage.web.auth.AuthRequestUtil;
import com.gic.haoban.manage.web.config.Config;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.vo.EnterpriseSearchVO;
import com.gic.haoban.manage.web.vo.LoginVO;
import com.gic.haoban.manage.web.vo.SecretSettingVO;
import com.gic.haoban.manage.web.vo.StoreVo;
......@@ -85,6 +86,7 @@ public class WxEnterpriseController extends WebBaseController{
if(enterpriseDTO!=null){
dto.setEnterpriseName(enterpriseDTO.getEnterpriseName());
dto.setEnterpriseLogo(enterpriseDTO.getQcloudImageUrl());
dto.setBrandName(enterpriseDTO.getBrandName());
}
}
}
......@@ -139,7 +141,15 @@ public class WxEnterpriseController extends WebBaseController{
return resultResponse(HaoBanErrCode.ERR_1);
}
EnterpriseAndUserDTO dto = enterpriseService.getEnterpriseAndUserByName(enterpriseName);
return resultResponse(HaoBanErrCode.ERR_1,dto);
EnterpriseSearchVO vo = EntityUtil.changeEntityByJSON(EnterpriseSearchVO.class, dto);
if(vo != null){
String enterpriseId = vo.getEnterpriseId();
EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(enterpriseId);
if(enterprise != null){
vo.setBrandName(enterprise.getBrandName());
}
}
return resultResponse(HaoBanErrCode.ERR_1,vo);
}
//微信企业绑定接口
......@@ -453,7 +463,7 @@ public class WxEnterpriseController extends WebBaseController{
listRet.forEach(secretSettingVO -> {
if ((!StringUtils.isEmpty(secretSettingVO.getEnterpriseId()))&&(!secretSettingVO.getEnterpriseId().equals("-1"))) {
EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(secretSettingVO.getEnterpriseId());
secretSettingVO.setEnterpriseName(enterpriseDTO.getEnterpriseName());
secretSettingVO.setEnterpriseName(enterpriseDTO.getBrandName());
}
});
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/EnterpriseSearchVO.java 0 → 100644
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
public class EnterpriseSearchVO implements Serializable{
private String enterpriseId;
private String enterpriseName;
private String clerkId;
private String clerkCode;
private String clerkName;
private String phoneNumber;
private String nationCode;
private String brandName;
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getPhoneNumber() {
return phoneNumber;
}
public void setPhoneNumber(String phoneNumber) {
this.phoneNumber = phoneNumber;
}
public String getNationCode() {
return nationCode;
}
public void setNationCode(String nationCode) {
this.nationCode = nationCode;
}
public String getBrandName() {
return brandName;
}
public void setBrandName(String brandName) {
this.brandName = brandName;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
package com.gic.haoban.manage.web.controller;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import com.gic.haoban.manage.api.enums.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gic.clerk.api.dto.ClerkDTO;
import com.gic.clerk.api.dto.ClerkListDTO;
......@@ -33,43 +15,26 @@ import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.app.customer.service.api.service.DistributeApiService;
import com.gic.haoban.base.api.common.ShowFrontMessageException;
import com.gic.haoban.common.utils.GooglePhoneNumberUtil;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
import com.gic.haoban.manage.api.dto.AuditDTO;
import com.gic.haoban.manage.api.dto.AuditSettingDTO;
import com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO;
import com.gic.haoban.manage.api.dto.DepartmentDTO;
import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.service.AuditApiService;
import com.gic.haoban.manage.api.service.AuditSettingApiService;
import com.gic.haoban.manage.api.service.BindApiService;
import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.enums.*;
import com.gic.haoban.manage.api.service.*;
import com.gic.haoban.manage.web.anno.HttpLimit;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.interceptor.WebInterceptor;
import com.gic.haoban.manage.web.utils.RouterConstant;
import com.gic.haoban.manage.web.vo.BindClerkVO;
import com.gic.haoban.manage.web.vo.ClerkStoreVO;
import com.gic.haoban.manage.web.vo.ClerkVo;
import com.gic.haoban.manage.web.vo.StaffStoreVO;
import com.gic.haoban.manage.web.vo.StoreClerkVO;
import com.gic.haoban.manage.web.vo.*;
import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
import java.util.stream.Collectors;
@RestController
public class ClerkController extends WebBaseController{
......@@ -793,4 +758,69 @@ public class ClerkController extends WebBaseController{
return resultResponse(HaoBanErrCode.ERR_1);
}
/**
* 导购详情
* @param clerkId
* @param wxEnterpriseId
* @return
*/
@RequestMapping("/clerk-detail")
public HaobanResponse clerkDetail(String clerkId,String wxEnterpriseId) {
// StaffClerkRelationDTO staffRelation = staffClerkRelationApiService.getByClerkId(clerkId);
// if(staffRelation == null){
// return resultResponse(HaoBanErrCode.ERR_10006);
// }
if (StringUtils.isBlank(clerkId)) {
return resultResponse(HaoBanErrCode.ERR_5);
}
ClerkDTO clerk = clerkService.getClerkByClerkId(clerkId);
if(clerk == null){
return resultResponse(HaoBanErrCode.ERR_10006);
}
return resultResponse(HaoBanErrCode.ERR_1,EntityUtil.changeEntityByJSON(ClerkDetailVo.class,clerk));
}
/**
* 更新导购
* @param clerkId
* @param fieldType
* @return
*/
@RequestMapping("/save-clerk")
public HaobanResponse clerkSave(String clerkId,String fieldValue,Integer fieldType) {
// StaffClerkRelationDTO staffRelation = staffClerkRelationApiService.getByClerkId(clerkId);
// if(staffRelation == null){
// return resultResponse(HaoBanErrCode.ERR_10006);
// }
if (StringUtils.isBlank(clerkId)||StringUtils.isBlank(fieldValue)|| null == fieldType) {
return resultResponse(HaoBanErrCode.ERR_5);
}
ClerkDTO clerk = clerkService.getClerkByClerkId(clerkId);
if(clerk == null){
return resultResponse(HaoBanErrCode.ERR_10006);
}
if (fieldType==0) {
clerk.setClerkName(fieldValue);
}else if (fieldType == 1) {
clerk.setClerkGender(fieldValue);
}else if (fieldType == 2) {
String[] split = fieldValue.split("-");
if (split.length==2) {
clerk.setPhoneNumber(split[1]);
clerk.setNationcode(split[0]);
}else{
logger.info("手机号不争取：{}",fieldValue);
return resultResponse(HaoBanErrCode.ERR_5);
}
}else if (fieldType == 3) {
clerk.setHeadImgUrl(fieldValue);
}
clerkService.updateClerk(clerk);
return resultResponse(HaoBanErrCode.ERR_1);
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/InfoController.java
......@@ -198,7 +198,7 @@ public class InfoController extends WebBaseController{
}
MemberLoginQo user = new MemberLoginQo();
if (StringUtils.isBlank(qo.getUserId())) {
logger.info("corpId============>{},secretVal===============>{},code=================》{}",enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), qo.getCode());
String userDTOJson = qywxUserApiService.getUserByCode(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), qo.getCode());
logger.info("会员微信登录信息=============>{}", userDTOJson);
user = JSON.parseObject(userDTOJson, MemberLoginQo.class);
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
......@@ -128,6 +128,7 @@ public class StoreController extends WebBaseController{
vo.setStoreImg(store.getStoreImage());
vo.setStoreName(store.getStoreName());
vo.setWxEnterpriseId(wxEnterpriseId);
vo.setClerkName(clerk.getClerkName());
vo.setBindFlag(1);
list.add(vo);
}
......@@ -242,6 +243,9 @@ public class StoreController extends WebBaseController{
return resultResponse(HaoBanErrCode.ERR_2);
}
StoreDTO store = storeService.getStore(storeId);
if(store == null){
return resultResponse(HaoBanErrCode.ERR_111146);
}
String enterpriseId = store.getEnterpriseId();
String date = DateUtil.format(new Date(), "yyyy-MM-dd");
if("0".equals(clerkType)){
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
......@@ -179,6 +179,7 @@ public enum HaoBanErrCode {
ERR_111144(111144,"该企业或品牌已关联"),
ERR_111145(111145, "已经解绑过了"),
ERR_111146(111146, "门店不存在"),
// 企业设置
ERR_200001(200001, "员工不存在"),
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/ClerkDetailVo.java 0 → 100644
package com.gic.haoban.manage.web.vo;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
/**
* Created 2020/8/14.
*
* @author hua
*/
public class ClerkDetailVo implements Serializable {
private String clerkId;
private String clerkName;
private String clerkCode;
private String storeId;
private String clerkGender;
private String phoneNumber;
private String enterpriseId;
private String headImgUrl;
private String nationcode;
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getClerkGender() {
return clerkGender;
}
public void setClerkGender(String clerkGender) {
this.clerkGender = clerkGender;
}
public String getPhoneNumber() {
return phoneNumber;
}
public void setPhoneNumber(String phoneNumber) {
this.phoneNumber = phoneNumber;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getHeadImgUrl() {
return headImgUrl;
}
public void setHeadImgUrl(String headImgUrl) {
this.headImgUrl = headImgUrl;
}
public String getNationcode() {
if (StringUtils.isBlank(nationcode)) {
return nationcode;
}
String regex="\\+";
return nationcode.replaceAll(regex, "");
}
public void setNationcode(String nationcode) {
this.nationcode = nationcode;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StaffStoreVO.java
......@@ -22,6 +22,15 @@ public class StaffStoreVO implements Serializable {
private Integer mainStoreFlag;
private String phoneNumber;
private int bindFlag;
private String clerkName;
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public int getBindFlag() {
return bindFlag;
......
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