Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffClerkRelationApiService.java

@@ -32,6 +32,8 @@ public interface StaffClerkRelationApiService {
 	
 	void insertOrUpdate(StaffClerkRelationDTO staffClerkRelation);
 
+	
+	void delAndInsert(StaffClerkRelationDTO staffClerkRelation);
 	/**
 	 * 解绑
 	 * @param storeId

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/PayController.java

 package com.gic.haoban.manage.web.controller;
 
-import com.gic.clerk.api.dto.ClerkListDTO;
+import com.gic.clerk.api.dto.*;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.enterprise.api.dto.*;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
@@ -15,6 +15,7 @@ import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.EnterpriseVo;
+import com.gic.haoban.manage.web.vo.StaffClerkInfoVo;
 import com.gic.haoban.manage.web.vo.WxClerkInfoVO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -85,7 +86,20 @@ public class PayController extends WebBaseController {
         }
 
         List<StaffClerkInfoDTO> list = staffClerkRelationApiService.listBindDetailByStaffId(staffDTO.getStaffId());
-        return resultResponse(HaoBanErrCode.ERR_1,list);
+        List<StaffClerkInfoVo> infoVos = EntityUtil.changeEntityListByJSON(StaffClerkInfoVo.class, list);
+        if (CollectionUtils.isNotEmpty(infoVos)) {
+            infoVos.forEach(staffClerkInfoVo -> {
+                com.gic.clerk.api.dto.ClerkDTO clerkDTO = clerkService.getClerkByClerkId(staffClerkInfoVo.getClerkId());
+                StoreDTO store = storeService.getStore(staffClerkInfoVo.getStoreId());
+                if (null != clerkDTO) {
+                    staffClerkInfoVo.setClerkType(clerkDTO.getClerkType());
+                }
+                if (null != store) {
+                    staffClerkInfoVo.setStoreCode(store.getStoreCode());
+                }
+            });
+        }
+        return resultResponse(HaoBanErrCode.ERR_1,infoVos);
     }
 
     /**

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/StaffClerkInfoVo.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class StaffClerkInfoVo implements Serializable{
+	
+	
+	private String staffClerkRelationId;
+
+    private String staffId;
+
+    private String wxEnterpriseId;
+
+    private String wxUserId;
+
+    private String enterpriseId;
+
+    private String enterpriseName;
+
+    private String storeId;
+
+    private String storeName;
+
+    private String storeCode;
+
+    private Integer clerkType;
+
+    private String clerkId;
+
+    private String clerkName;
+
+    private String clerkCode;
+
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String clerkPhoneNumber;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public Integer getClerkType() {
+        return clerkType;
+    }
+
+    public void setClerkType(Integer clerkType) {
+        this.clerkType = clerkType;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    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 getStaffClerkRelationId() {
+        return staffClerkRelationId;
+    }
+
+    public void setStaffClerkRelationId(String staffClerkRelationId) {
+        this.staffClerkRelationId = staffClerkRelationId == null ? null : staffClerkRelationId.trim();
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId == null ? null : staffId.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public String getWxUserId() {
+        return wxUserId;
+    }
+
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId == null ? null : wxUserId.trim();
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId == null ? null : storeId.trim();
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId == null ? null : clerkId.trim();
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode == null ? null : clerkCode.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java

@@ -72,4 +72,6 @@ public interface TabHaobanStaffClerkRelationMapper {
     TabHaobanStaffClerkRelation getOneBindStoreId(@Param("staffId")String staffId, @Param("storeId")String storeId);
 
 	TabHaobanStaffClerkRelation getByClerkId(@Param("clerkId")String clerkId);
+	
+	int delByPrimaryKey(@Param("staffClerkRelationId")String staffClerkRelationId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -207,8 +207,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 				staffClerkRelation.setWxEnterpriseId(tab.getWxEnterpriseId());
 				staffClerkRelation.setWxUserId(obj.getWxUserId());
 				staffClerkRelation.setStaffId(obj.getStaffId());
-				staffClerkRelationApiService.insertOrUpdate(staffClerkRelation);
-			}
+				staffClerkRelationApiService.delAndInsert(staffClerkRelation);			}
 			if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 				 insertBatchLog( batchId,AuditRsultType.success.getCode(), tab);
 			}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -518,7 +518,6 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
 
     @Override
-    @Deprecated
     public void dealQywxDepartment(String taskId, String wxEnterpriseId) {
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
         SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal());

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java

@@ -202,4 +202,13 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 		StaffClerkRelationDTO dto = EntityUtil.changeEntity(StaffClerkRelationDTO.class, tab);
 		return dto;
 	}
+	@Override
+	public void delAndInsert(StaffClerkRelationDTO staffClerkRelation) {
+		if(StringUtils.isEmpty(staffClerkRelation.getStaffClerkRelationId())){
+			 staffClerkRelatinService.insert(staffClerkRelation);
+		}else{
+			tabHaobanStaffClerkRelationMapper.delByPrimaryKey(staffClerkRelation.getStaffClerkRelationId());
+			 staffClerkRelatinService.insert(staffClerkRelation);
+		}		
+	}
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java

@@ -163,6 +163,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		return map;
 	}
 	//导购绑定，，审核记录，，消息发送
+	@Override
 	public void sendClerkBind(String clerkId,String clerkCode,int auditStatus,String auditReason){
         //TODO huang 发送申请人，我的记录页
 		ClerkDTO clerk = clerkService.getclerkById(clerkId);
@@ -181,6 +182,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	
 	
 	//导购新增，，审核记录，，消息发送
+	@Override
 	public void sendClerkAdd (String enterpriseId,String clerkCode,int auditStatus,String auditReason){
         //TODO huang 发送店长，门店关联记录列表
 		ClerkDTO clerk =  clerkService.getClerkByClerkCode(enterpriseId, clerkCode);

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -310,4 +310,14 @@
     where clerk_id = #{clerkId,jdbcType=VARCHAR}
     and status_flag=1
   </select>
+  
+   <update id="delByPrimaryKey" >
+    update tab_haoban_staff_clerk_relation
+    set
+    status_flag = 0,
+    update_time = now()
+    where staff_clerk_relation_id = #{staffClerkRelationId,jdbcType=VARCHAR}
+    	  and status_flag =1
+  </update>
+  
 </mapper>
\ No newline at end of file

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

@@ -231,7 +231,7 @@ public class AuditController extends WebBaseController{
 						staffClerkRelation.setWxEnterpriseId(wxEnterpriseId);
 						staffClerkRelation.setWxUserId(wxUserId);
 						staffClerkRelation.setStaffId(auditStaffId);
-						staffClerkRelationApiService.insertOrUpdate(staffClerkRelation);
+						staffClerkRelationApiService.delAndInsert(staffClerkRelation);
 						audit.setAuditStatus(1);
 						//发送消息
 						staffDepartmentRelatedApiService.sendClerkBind(clerkId, clerkCode, auditStatus, auditReason);