fix

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkRelationDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class StaffClerkRelationDTO implements Serializable{
+	
+	
+	private String staffClerkRelationId;
+
+    private String staffId;
+
+    private String wxEnterpriseId;
+
+    private String wxUserId;
+
+    private String enterpriseId;
+
+    private String storeId;
+
+    private String clerkId;
+
+    private String clerkCode;
+
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    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-api/src/main/java/com/gic/haoban/manage/api/service/AuditApiService.java

@@ -25,4 +25,6 @@ public interface AuditApiService {
 	List<AuditDTO> listByStoreId(String storeId);
 
 	AuditDTO findByStoreIdAndChangeField(String storeId,String changeField);
+
+	void insert(AuditDTO audit);
 }

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

+package com.gic.haoban.manage.api.service;
+
+import java.util.List;
+import java.util.Set;
+
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+
+public interface StaffClerkRelationApiService {
+
+	List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList);
+
+}

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

 package com.gic.haoban.manage.service.dao.mapper;
 
+import java.util.List;
+import java.util.Set;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 
 public interface TabHaobanStaffClerkRelationMapper {
@@ -14,4 +19,6 @@ public interface TabHaobanStaffClerkRelationMapper {
     int updateByPrimaryKeySelective(TabHaobanStaffClerkRelation record);
 
     int updateByPrimaryKey(TabHaobanStaffClerkRelation record);
+
+	List<TabHaobanStaffClerkRelation> listBindCode(@Param("enterpriseId")String enterpriseId, @Param("clerkCodeList")Set<String> clerkCodeList);
 }
\ No newline at end of file

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

+package com.gic.haoban.manage.service.service;
+
+import java.util.List;
+import java.util.Set;
+
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+
+public interface StaffClerkRelationService {
+
+	List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList);
+
+}

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

+package com.gic.haoban.manage.service.service.impl;
+
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
+import com.gic.haoban.manage.service.service.StaffClerkRelationService;
+
+@Service
+public class StaffClerkRelationServiceImpl implements StaffClerkRelationService {
+
+	@Autowired
+	private TabHaobanStaffClerkRelationMapper mapper;
+	@Override
+	public List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList) {
+		return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.listBindCode(enterpriseId,clerkCodeList));
+	}
+
+}

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

@@ -22,6 +22,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.StringUtil;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.dto.StoreDetailDTO;
 import com.gic.enterprise.api.dto.StorePhotoDTO;
@@ -325,4 +326,11 @@ public class AuditApiServiceImpl implements AuditApiService{
 		boolean b = qywxSuiteApiService.sendMessage(corpId, config.getWxSuiteid(), messageDTO);
 
 	}
+	@Override
+	public void insert(AuditDTO audit) {
+		audit.setAuditId(com.gic.haoban.common.utils.StringUtil.randomUUID());
+		audit.setCreateTime(new Date());
+		audit.setUpdateTime(new Date());
+		auditMapper.insertSelective(EntityUtil.changeEntityByJSON(TabHaobanAudit.class, audit));
+	}
 }

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

+package com.gic.haoban.manage.service.service.out.impl;
+
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
+import com.gic.haoban.manage.service.service.StaffClerkRelationService;
+
+@Service
+public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiService {
+
+	@Autowired
+	private StaffClerkRelationService staffClerkRelatinService;
+	@Override
+	public List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList) {
+		return staffClerkRelatinService.listBindCode(enterpriseId,clerkCodeList);
+	}
+
+}

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -43,6 +43,7 @@
          <dubbo:service interface="com.gic.haoban.manage.api.service.MaidianDictApiService" ref="maidianDictApiServiceImpl" timeout="10000"/>
          <dubbo:service interface="com.gic.haoban.manage.api.service.MaterialApiService" ref="materialApiServiceImpl" timeout="10000"/>
 
+		 <dubbo:service interface="com.gic.haoban.manage.api.service.StaffClerkRelationApiService" ref="staffClerkRelationApiServiceImpl" timeout="10000"/>	
     <dubbo:service interface="com.gic.haoban.manage.api.service.DealSyncOperationApiService"
                    ref="dealSyncOperationApiServiceImpl" timeout="10000"/>
 

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

@@ -161,4 +161,15 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where staff_clerk_relation_id = #{staffClerkRelationId,jdbcType=VARCHAR}
   </update>
+  <select id="listBindCode" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_clerk_relation
+    where enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
+    and status_flag = 1
+    and clerk_code in 
+    <foreach collection="clerkCodeList" item="id" index="index" open="(" close=")" separator=",">
+      #{id,jdbcType=VARCHAR}
+    </foreach>
+  </select>
 </mapper>
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -199,6 +199,8 @@ public enum HaoBanErrCode {
     ERR_10014(10014,"请输入手机号"),
     
     ERR_10015(10015,"素材不存在"),
+    
+    ERR_10016(10016,"导购不存在"),
 
 
     ERR_999(999, "操作失败"),

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+public class BindClerkVO implements Serializable{
+	
+	private String clerkId;
+	
+	private Integer clerkType;
+	
+	private String clerkName;
+	
+	private String staffId;
+	
+	private String clerkCode;
+
+	public String getClerkId() {
+		return clerkId;
+	}
+
+	public void setClerkId(String clerkId) {
+		this.clerkId = clerkId;
+	}
+
+	public Integer getClerkType() {
+		return clerkType;
+	}
+
+	public void setClerkType(Integer clerkType) {
+		this.clerkType = clerkType;
+	}
+
+	public String getClerkName() {
+		return clerkName;
+	}
+
+	public void setClerkName(String clerkName) {
+		this.clerkName = clerkName;
+	}
+
+	public String getStaffId() {
+		return staffId;
+	}
+
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+
+	public String getClerkCode() {
+		return clerkCode;
+	}
+
+	public void setClerkCode(String clerkCode) {
+		this.clerkCode = clerkCode;
+	}
+	
+	
+	
+
+}

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -57,5 +57,7 @@
 	
 	<dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseService" id="enterpriseService"/>
 	
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffClerkRelationApiService" id="staffClerkRelationApiService"/>
+	
 
 </beans>