测试

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/ChannelCodeEnum.java

@@ -40,4 +40,14 @@ public enum ChannelCodeEnum {
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getNameByCode(int code) {
+        ChannelCodeEnum[] values = ChannelCodeEnum.values();
+        for (ChannelCodeEnum channelCodeEnum : values) {
+            if (channelCodeEnum.getCode() == code) {
+                return channelCodeEnum.getName();
+            }
+        }
+        return null;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

 package com.gic.haoban.manage.web.controller;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
-import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
-
-import com.gic.redis.data.util.RedisUtil;
-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 com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -26,10 +13,11 @@ import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
 import com.gic.haoban.manage.api.dto.AuditDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkBindLogDetailDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
-import com.gic.haoban.manage.api.enums.AuditRsultType;
 import com.gic.haoban.manage.api.enums.AuditType;
+import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
@@ -37,12 +25,24 @@ import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.web.anno.HttpLimit;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.AuditVO;
+import com.gic.haoban.manage.web.vo.StaffClerkBindLogDetailVO;
+import com.gic.redis.data.util.RedisUtil;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
 
 
 @RestController
-public class AuditController extends WebBaseController{
+public class AuditController extends WebBaseController {
 
-	private static Logger logger= LoggerFactory.getLogger(AuditController.class);
+    private static Logger logger = LoggerFactory.getLogger(AuditController.class);
 
     @Autowired
     private AuditApiService auditApiService;
@@ -60,16 +60,18 @@ public class AuditController extends WebBaseController{
     private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
     @Autowired
     private ClerkService clerkService;
+    @Autowired
+    private ChannelCodeEnum channelCodeEnum;
 
 
     //关联记录列表
     @RequestMapping("clerk-apply-list")
-	public HaobanResponse staffStoreList(String staffId,Integer auditType,Integer auditStatus,String wxEnterpriseId,BasePageInfo pageInfo){
-		if(StringUtils.isAnyBlank(staffId,wxEnterpriseId)){
+    public HaobanResponse staffStoreList(String staffId, Integer auditType, Integer auditStatus, String wxEnterpriseId, BasePageInfo pageInfo) {
+        if (StringUtils.isAnyBlank(staffId, wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
 
-		Page<AuditDTO> page = auditApiService.listByStaffId(staffId,auditType,auditStatus,pageInfo);
+        Page<AuditDTO> page = auditApiService.listByStaffId(staffId, auditType, auditStatus, pageInfo);
         List<AuditDTO> list = page.getResult();
         List<AuditVO> voList = new ArrayList<AuditVO>();
         for (AuditDTO auditDTO : list) {
@@ -80,12 +82,12 @@ public class AuditController extends WebBaseController{
             JSONObject json = JSON.parseObject(oldValue);
             clerkCode = json.getString("clerkCode");
             staffName = json.getString("staffName");
-			if(auditDTO.getAuditType() == 3){
-				vo.setCommitReason("添加导购账号：("+clerkCode+")");
-			}else if(auditDTO.getAuditType() == 4){
-				vo.setCommitReason("删除导购账号：("+clerkCode+")");
-			}else{
-				vo.setCommitReason("绑定申请{"+staffName+"}绑定登录导购code "+clerkCode);
+            if (auditDTO.getAuditType() == 3) {
+                vo.setCommitReason("添加导购账号：(" + clerkCode + ")");
+            } else if (auditDTO.getAuditType() == 4) {
+                vo.setCommitReason("删除导购账号：(" + clerkCode + ")");
+            } else {
+                vo.setCommitReason("绑定申请{" + staffName + "}绑定登录导购code " + clerkCode);
             }
             voList.add(vo);
         }
@@ -96,17 +98,39 @@ public class AuditController extends WebBaseController{
         pageVO.setTotalCount(page.getTotalCount());
         pageVO.setTotalPage(page.getTotalPage());
         PageResult2 pageResult2 = PageUtil.getPageInfo(pageVO);
-		return resultResponse(HaoBanErrCode.ERR_1,pageResult2);
+        return resultResponse(HaoBanErrCode.ERR_1, pageResult2);
 
     }
+
+    //解绑记录列表
+    @RequestMapping("clerk-unbind-list")
+    public HaobanResponse staffUnbindList(String wxEnterpriseId, String search, String enterpriseId, @RequestParam(defaultValue = "1") Integer optType, BasePageInfo qo) {
+        Page<StaffClerkBindLogDetailDTO> page = staffClerkRelationApiService.pageStaffClerkBindLog(wxEnterpriseId, search, enterpriseId, optType, qo);
+        List<StaffClerkBindLogDetailDTO> list = page.getResult();
+        List<StaffClerkBindLogDetailVO> voList = new ArrayList<StaffClerkBindLogDetailVO>();
+        for (StaffClerkBindLogDetailDTO staffClerkBindLogDetailDTO : list) {
+            StaffClerkBindLogDetailVO vo = EntityUtil.changeEntityByJSON(StaffClerkBindLogDetailVO.class, staffClerkBindLogDetailDTO);
+            vo.setUnbindReason(channelCodeEnum.getNameByCode(vo.getChannelCode()));
+            voList.add(vo);
+        }
+        Page<StaffClerkBindLogDetailVO> pageVO = new Page<>();
+        pageVO.setCurrentPage(page.getCurrentPage());
+        pageVO.setPageSize(page.getPageSize());
+        pageVO.setResult(voList);
+        pageVO.setTotalCount(page.getTotalCount());
+        pageVO.setTotalPage(page.getTotalPage());
+        PageResult2 pageResult2 = PageUtil.getPageInfo(pageVO);
+        return resultResponse(HaoBanErrCode.ERR_1, pageResult2);
+    }
+
     //门店记录列表
     @RequestMapping("store-apply-list")
-	public HaobanResponse storeApplyList(String storeId,String wxEnterpriseId,BasePageInfo pageInfo,Integer auditType,Integer auditStatus){
-		if(StringUtils.isAnyBlank(storeId,wxEnterpriseId)){
+    public HaobanResponse storeApplyList(String storeId, String wxEnterpriseId, BasePageInfo pageInfo, Integer auditType, Integer auditStatus) {
+        if (StringUtils.isAnyBlank(storeId, wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
 
-		Page<AuditDTO> page = auditApiService.pageStoreListByParams(storeId,pageInfo,auditType,auditStatus);
+        Page<AuditDTO> page = auditApiService.pageStoreListByParams(storeId, pageInfo, auditType, auditStatus);
         List<AuditDTO> list = page.getResult();
         List<AuditVO> voList = new ArrayList<AuditVO>();
         for (AuditDTO auditDTO : list) {
@@ -117,23 +141,23 @@ public class AuditController extends WebBaseController{
             JSONObject json = JSON.parseObject(oldValue);
             clerkCode = json.getString("clerkCode");
             staffName = json.getString("staffName");
-			String headPic = json.get("headPic")== null ? "": json.get("headPic").toString();
+            String headPic = json.get("headPic") == null ? "" : json.get("headPic").toString();
 
-			if(auditDTO.getAuditType() == 3){
-				vo.setCommitReason("添加导购账号：("+clerkCode+")");
-			}else if(auditDTO.getAuditType() == 4){
-				vo.setCommitReason("删除导购账号：("+clerkCode+")");
-			}else if(auditDTO.getAuditType() == 5){
-				vo.setCommitReason("解除绑定：("+clerkCode+")");
-			}else{
-				vo.setCommitReason("绑定申请{"+staffName+"}绑定登录导购code "+clerkCode);
+            if (auditDTO.getAuditType() == 3) {
+                vo.setCommitReason("添加导购账号：(" + clerkCode + ")");
+            } else if (auditDTO.getAuditType() == 4) {
+                vo.setCommitReason("删除导购账号：(" + clerkCode + ")");
+            } else if (auditDTO.getAuditType() == 5) {
+                vo.setCommitReason("解除绑定：(" + clerkCode + ")");
+            } else {
+                vo.setCommitReason("绑定申请{" + staffName + "}绑定登录导购code " + clerkCode);
             }
             vo.setCommitName(auditDTO.getCommitStaffName());
             vo.setFailReason(auditDTO.getAuditReason());
             vo.setStaffName(auditDTO.getCommitName());
             vo.setClerkName(auditDTO.getCommitName());
             vo.setHeadPic(headPic);
-			if(auditDTO.getAuditType() != 0){
+            if (auditDTO.getAuditType() != 0) {
                 vo.setUpdateTime(auditDTO.getUpdateTime());
             }
             voList.add(vo);
@@ -145,13 +169,14 @@ public class AuditController extends WebBaseController{
         pageVO.setTotalCount(page.getTotalCount());
         pageVO.setTotalPage(page.getTotalPage());
         PageResult2 pageResult2 = PageUtil.getPageInfo(pageVO);
-		return resultResponse(HaoBanErrCode.ERR_1,pageResult2);
+        return resultResponse(HaoBanErrCode.ERR_1, pageResult2);
 
     }
+
     //查单个
     @RequestMapping("get-store-record")
-	public HaobanResponse getStoreRecord(String auditId){
-		if(auditId == null){
+    public HaobanResponse getStoreRecord(String auditId) {
+        if (auditId == null) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         AuditDTO auditDTO = auditApiService.findById(auditId);
@@ -162,35 +187,36 @@ public class AuditController extends WebBaseController{
         JSONObject json = JSON.parseObject(oldValue);
         clerkCode = json.getString("clerkCode");
         staffName = json.getString("staffName");
-		String headPic = json.get("headPic")== null ? "": json.get("headPic").toString();
-		if(auditDTO.getAuditType() == 3){
-			vo.setCommitReason("添加导购账号：("+clerkCode+")");
-		}else if(auditDTO.getAuditType() == 4){
-			vo.setCommitReason("删除导购账号：("+clerkCode+")");
-		}else if(auditDTO.getAuditType() == 5){
-			vo.setCommitReason("解除绑定：("+clerkCode+")");
-		}else{
-			vo.setCommitReason("绑定申请{"+staffName+"}绑定登录导购code "+clerkCode);
+        String headPic = json.get("headPic") == null ? "" : json.get("headPic").toString();
+        if (auditDTO.getAuditType() == 3) {
+            vo.setCommitReason("添加导购账号：(" + clerkCode + ")");
+        } else if (auditDTO.getAuditType() == 4) {
+            vo.setCommitReason("删除导购账号：(" + clerkCode + ")");
+        } else if (auditDTO.getAuditType() == 5) {
+            vo.setCommitReason("解除绑定：(" + clerkCode + ")");
+        } else {
+            vo.setCommitReason("绑定申请{" + staffName + "}绑定登录导购code " + clerkCode);
         }
         vo.setHeadPic(headPic);
         vo.setCommitName(auditDTO.getCommitStaffName());
         vo.setFailReason(auditDTO.getAuditReason());
         vo.setStaffName(auditDTO.getCommitName());
         vo.setClerkName(auditDTO.getCommitName());
-		if(auditDTO.getAuditType() != 0){
+        if (auditDTO.getAuditType() != 0) {
             vo.setUpdateTime(auditDTO.getUpdateTime());
         }
-		return resultResponse(HaoBanErrCode.ERR_1,vo);
+        return resultResponse(HaoBanErrCode.ERR_1, vo);
     }
+
     //审核，1同意，2拒绝，3取消审核
     @HttpLimit
     @RequestMapping("clerk-audit")
-	public HaobanResponse clerkAudit(String auditId,String auditReason,Integer auditStatus,String wxEnterpriseId,String staffId){
-		if(StringUtils.isAnyBlank(auditId,wxEnterpriseId)){
+    public HaobanResponse clerkAudit(String auditId, String auditReason, Integer auditStatus, String wxEnterpriseId, String staffId) {
+        if (StringUtils.isAnyBlank(auditId, wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
 
-		if(auditStatus == null){
+        if (auditStatus == null) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         String key = "audit-" + auditId;
@@ -202,39 +228,39 @@ public class AuditController extends WebBaseController{
             return resultResponse(HaoBanErrCode.ERR_10017);
         }
         StaffDTO staff = staffApiService.selectById(staffId);
-		if(staff != null){
+        if (staff != null) {
             audit.setAuditName(staff.getStaffName());
         }
 
         String oldValue = audit.getOldValue();
         JSONObject json = JSON.parseObject(oldValue);
-		String clerkCode = json.get("clerkCode")==null?"":json.get("clerkCode").toString();
+        String clerkCode = json.get("clerkCode") == null ? "" : json.get("clerkCode").toString();
         String enterpriseId = audit.getEnterpriseId();
-		String clerkId = json.getString("clerkId")==null?"":json.get("clerkId").toString();
-		String clerkName = json.get("clerkName")==null?"":json.get("clerkName").toString();
-		String wxUserId = json.getString("wxUserId")==null?"":json.get("wxUserId").toString();
-		Integer sex  = json.getInteger("sex")==null?0:json.getInteger("sex");
-		String phoneNumber = json.getString("phoneNumber")==null?"":json.get("phoneNumber").toString();
-		String nationCode = json.getString("nationCode")==null?"":json.get("nationCode").toString();
-		String auditStaffId = json.getString("staffId")==null?"":json.get("staffId").toString();
+        String clerkId = json.getString("clerkId") == null ? "" : json.get("clerkId").toString();
+        String clerkName = json.get("clerkName") == null ? "" : json.get("clerkName").toString();
+        String wxUserId = json.getString("wxUserId") == null ? "" : json.get("wxUserId").toString();
+        Integer sex = json.getInteger("sex") == null ? 0 : json.getInteger("sex");
+        String phoneNumber = json.getString("phoneNumber") == null ? "" : json.get("phoneNumber").toString();
+        String nationCode = json.getString("nationCode") == null ? "" : json.get("nationCode").toString();
+        String auditStaffId = json.getString("staffId") == null ? "" : json.get("staffId").toString();
 
         String storeId = audit.getCommitStoreId();
-		if(auditStatus == 1){
+        if (auditStatus == 1) {
             //审核同意
-			if(audit.getAuditType() == AuditType.CLERK_BIND.getCode()){
+            if (audit.getAuditType() == AuditType.CLERK_BIND.getCode()) {
                 //导购绑定
-				StaffClerkRelationDTO staffClerkRelation  = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode,enterpriseId);
+                StaffClerkRelationDTO staffClerkRelation = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode, enterpriseId);
                 StaffClerkRelationDTO have = staffClerkRelationApiService.getOneByStoreIdAndStaffId(storeId, auditStaffId);
-				if(have !=null){
+                if (have != null) {
                     audit.setAuditStatus(5);
                     audit.setAuditReason("该成员在该门店下已经绑定过一个导购了");
-				}else{
+                } else {
                     ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
-					if(clerkDTO == null){
+                    if (clerkDTO == null) {
                         audit.setAuditStatus(5);
                         audit.setAuditReason("gic已删除该导购");
-					}else{
-						if(staffClerkRelation == null){
+                    } else {
+                        if (staffClerkRelation == null) {
                             staffClerkRelation = new StaffClerkRelationDTO();
                         }
                         staffClerkRelation.setEnterpriseId(enterpriseId);
@@ -244,44 +270,44 @@ public class AuditController extends WebBaseController{
                         staffClerkRelation.setWxEnterpriseId(wxEnterpriseId);
                         staffClerkRelation.setWxUserId(wxUserId);
                         staffClerkRelation.setStaffId(auditStaffId);
-						staffClerkRelationApiService.delAndInsert(staffClerkRelation,staffId, ChannelCodeEnum.AUDIT_BIND.getCode());
+                        staffClerkRelationApiService.delAndInsert(staffClerkRelation, staffId, ChannelCodeEnum.AUDIT_BIND.getCode());
                         audit.setAuditStatus(1);
                         //发送消息
-						staffDepartmentRelatedApiService.sendClerkBind(auditStaffId, clerkCode,storeId, auditStatus, auditReason);
+                        staffDepartmentRelatedApiService.sendClerkBind(auditStaffId, clerkCode, storeId, auditStatus, auditReason);
                     }
                 }
             }
-			if(audit.getAuditType() == AuditType.CLERK_ADD.getCode()){
+            if (audit.getAuditType() == AuditType.CLERK_ADD.getCode()) {
                 //导购新增
                 boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, clerkName, phoneNumber, nationCode, null);
-				if(!flag){
+                if (!flag) {
                     return resultResponse(HaoBanErrCode.ERR_10010);
                 }
                 audit.setAuditStatus(1);
 //				ClerkDTO clerkDTO = clerkService.getClerkByClerkCode(enterpriseId, clerkCode);
 
-				staffDepartmentRelatedApiService.sendClerkAdd(clerkName, clerkCode, storeId,auditStatus, auditReason);
+                staffDepartmentRelatedApiService.sendClerkAdd(clerkName, clerkCode, storeId, auditStatus, auditReason);
             }
-			if(audit.getAuditType() == AuditType.CLERK_DEL.getCode()){
+            if (audit.getAuditType() == AuditType.CLERK_DEL.getCode()) {
                 //导购删除
                 syncHaobanToGicServiceApi.delGicClerk(clerkId);
                 audit.setAuditStatus(1);
-				staffDepartmentRelatedApiService.sendClerkDel(clerkName, clerkCode,storeId, auditStatus, auditReason);
+                staffDepartmentRelatedApiService.sendClerkDel(clerkName, clerkCode, storeId, auditStatus, auditReason);
             }
-		}else if(auditStatus == 2){
+        } else if (auditStatus == 2) {
             //审核拒绝
             audit.setAuditReason(auditReason);
             audit.setAuditStatus(2);
             //发送消息
-			if(audit.getAuditType() == AuditType.CLERK_BIND.getCode()){
+            if (audit.getAuditType() == AuditType.CLERK_BIND.getCode()) {
                 staffDepartmentRelatedApiService.sendStaffBind(auditStaffId, clerkCode, storeId, auditStatus, auditReason);
-			}else if (audit.getAuditType() == AuditType.CLERK_ADD.getCode()){
-				staffDepartmentRelatedApiService.sendClerkAdd(clerkName, clerkCode, storeId,auditStatus, auditReason);
-			}else if (audit.getAuditType() == AuditType.CLERK_DEL.getCode()){
-				staffDepartmentRelatedApiService.sendClerkDel(clerkName, clerkCode,storeId, auditStatus, auditReason);
+            } else if (audit.getAuditType() == AuditType.CLERK_ADD.getCode()) {
+                staffDepartmentRelatedApiService.sendClerkAdd(clerkName, clerkCode, storeId, auditStatus, auditReason);
+            } else if (audit.getAuditType() == AuditType.CLERK_DEL.getCode()) {
+                staffDepartmentRelatedApiService.sendClerkDel(clerkName, clerkCode, storeId, auditStatus, auditReason);
             }
 
-		}else if(auditStatus == 3){
+        } else if (auditStatus == 3) {
             //取消审核
             audit.setAuditStatus(3);
         }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StaffClerkBindLogDetailVO.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class StaffClerkBindLogDetailVO implements Serializable{
+
+    private Integer logId;
+
+    private String staffId;
+
+    private String staffName;
+
+    private String optStaffId;
+
+    private String optStaffName;
+
+    private String clerkId;
+
+    private String clerkName;
+
+    private String clerkPhoneNumber;
+
+    private String wxEnterpriseId;
+
+    private Integer channelCode;
+
+    private String unbindReason;
+
+    private Date updateTime;
+
+    private Date createTime;
+
+
+    public Integer getLogId() { return logId; }
+
+    public void setLogId(Integer logId) { this.logId = logId; }
+
+    public String getStaffId() { return staffId; }
+
+    public void setStaffId(String staffId) { this.staffId = staffId; }
+
+    public String getStaffName() { return staffName; }
+
+    public void setStaffName(String staffName) { this.staffName = staffName; }
+
+    public String getOptStaffId() { return optStaffId; }
+
+    public void setOpStaffId(String opStaffId) { this.optStaffId = opStaffId; }
+
+    public String getOptStaffName() { return optStaffName; }
+
+    public void setOptStaffName(String opStaffName) { this.optStaffName = opStaffName; }
+
+    public void setOptStaffId(String optStaffId) { this.optStaffId = optStaffId; }
+
+    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 getClerkPhoneNumber() { return clerkPhoneNumber; }
+
+    public void setClerkPhoneNumber(String clerkPhoneNumber) { this.clerkPhoneNumber = clerkPhoneNumber; }
+
+    public String getWxEnterpriseId() { return wxEnterpriseId; }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) { this.wxEnterpriseId = wxEnterpriseId; }
+
+    public Integer getChannelCode() { return channelCode; }
+
+    public void setChannelCode(Integer channelCode) { this.channelCode = channelCode; }
+
+    public String getUnbindReason() { return unbindReason; }
+
+    public void setUnbindReason(String unbindReason) { this.unbindReason = unbindReason; }
+
+    public Date getUpdateTime() { return updateTime; }
+
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+
+    public Date getCreateTime() { return createTime; }
+
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+}