Merge remote-tracking branch 'origin/developer' into developer

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

@@ -40,4 +40,6 @@ public interface AuditApiService {
 	List<BatchAuditLogDTO> listBatchLog(String batchId);
 	
 	AuditDTO findByBindRelatedIdAndAuditType(String relatedId,int auditType);
+	
+	boolean judgeHavePhoneNumberOrCode(String enterpriseId,String clerkCode,String phoneNumber);
 }

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

@@ -35,4 +35,5 @@ public interface TabHaobanAuditMapper {
 
 	TabHaobanAudit findByBindRelatedIdAndAuditType(@Param("relatedId")String relatedId,@Param("auditType")int auditType);
 
+	List<TabHaobanAudit> judgeHavePhoneNumberOrCode(@Param("enterpriseId")String enterpriseId,@Param("clerkCode")String clerkCode, @Param("phoneNumber")String phoneNumber);
 }
\ No newline at end of file

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

@@ -489,5 +489,15 @@ public class AuditApiServiceImpl implements AuditApiService{
 		TabHaobanAudit tab = auditMapper.findByBindRelatedIdAndAuditType(relatedId, auditType);
 		return EntityUtil.changeEntityByJSON(AuditDTO.class, tab);
 	}
+	@Override
+	public boolean judgeHavePhoneNumberOrCode(String enterpriseId,
+			String clerkCode, String phoneNumber) {
+		List<TabHaobanAudit>  list = auditMapper.judgeHavePhoneNumberOrCode(enterpriseId,clerkCode,phoneNumber);
+		if(CollectionUtil.isEmpty(list)){
+			return false;
+		}else{
+			return true;
+		}
+	}
 	
 }

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

@@ -415,5 +415,17 @@
 			and audit_type = #{auditType}
 			and audit_status = 0
 	</select>
+	
+		<select id="judgeHavePhoneNumberOrCode" resultMap="BaseResultMap"  >
+	    select 
+	    <include refid="Base_Column_List" />
+	    from tab_haoban_audit
+	    where 1=1
+			and status_flag = 1
+			and audit_type = 3
+			and audit_status = 0
+			and enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
+			and (related_Id = #{clerkCode} or old_value like concat ('%',#{phoneNumber},'%'))
+	</select>
   
 </mapper>
\ No newline at end of file

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

@@ -172,7 +172,15 @@ public class ClerkController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1,resultList);
 		
 	}
-	
+	//获取后台认证配置
+	@RequestMapping("/get-audit-setting")
+	public HaobanResponse getAuditSetting(String wxEnterpriseId) {
+		if(StringUtils.isAnyBlank(wxEnterpriseId)){
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+		AuditSettingDTO auditSetting = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
+		return resultResponse(HaoBanErrCode.ERR_1,auditSetting);
+	}
 	
 	//新增店员
 	@HttpLimit
@@ -202,6 +210,12 @@ public class ClerkController extends WebBaseController{
 		if (store == null) {
 			return resultResponse(HaoBanErrCode.ERR_10009);
 		}
+		String enterpriseId = store.getEnterpriseId();
+		boolean b = auditApiService.judgeHavePhoneNumberOrCode(enterpriseId, clerkCode, phoneNumber);
+		if(b){
+			//待审核中存在code或该手机号
+			return resultResponse(HaoBanErrCode.ERR_10021);
+		}
 		ClerkDTO clerk = clerkService.getClerkByCodeNoDel(store.getEnterpriseId(), clerkCode);
 		logger.info("【新增店员】clerk={}",JSON.toJSONString(clerk));
 		if(clerk != null){

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

@@ -211,6 +211,8 @@ public enum HaoBanErrCode {
     
     ERR_10020(10020,"该用户已在该门店绑定过code"),
 
+    ERR_10021(10021,"待审核中存在code或该手机号"),
+
     ERR_999(999, "操作失败"),
     ERR_DEFINE(-888, "自定义错误"),