Merge branch 'developer' of

http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

Conflicts:
	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditApiService.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java
	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

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

@@ -15,7 +15,7 @@ public interface AuditApiService {
 	
 	Page<AuditDTO> page(Integer auditType, String search,String wxEnterpriseId,String enterpriseId,Integer auditStatus,Integer auditFlag,BasePageInfo pageInfo);
 	
-	String audit(String batchId,String auditId,String aduitStaffId,String aduitName);
+	String audit(String batchId,String auditId,String aduitName,String optStaffId);
 	
 	void refuse(String auditId,String auditReason,String aduitStaffId,String aduitName);
 	

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

@@ -157,7 +157,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 	}
 	@Transactional
 	@Override
-	public String audit(String batchId,String auditId,String auditStaffId,String auditName) {
+	public String audit(String batchId,String auditId,String auditName,String optStaffId) {
 		TabHaobanAudit tab = auditMapper.selectByPrimaryKey(auditId);
 		if(tab==null){
 			return "审核项目不存在";
@@ -166,7 +166,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 		tab.setAuditId(auditId);
 		tab.setUpdateTime(new Date());
 		tab.setAuditName(auditName);
-		tab.setAuditStaffId(auditStaffId);
+		tab.setAuditStaffId(optStaffId);
 		if(auditType == AuditType.STORE_CHANGE.getCode()){
 			//门店信息变更
 			String storeId = tab.getCommitStoreId();
@@ -223,7 +223,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 				staffClerkRelation.setWxEnterpriseId(tab.getWxEnterpriseId());
 				staffClerkRelation.setWxUserId(obj.getWxUserId());
 				staffClerkRelation.setStaffId(obj.getStaffId());
-				staffClerkRelationApiService.delAndInsert(staffClerkRelation,tab.getCommitStaffId(), ChannelCodeEnum.AUDIT_BIND.getCode());
+				staffClerkRelationApiService.delAndInsert(staffClerkRelation,optStaffId, ChannelCodeEnum.AUDIT_BIND.getCode());
 			}
 			if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 				 insertBatchLog( batchId,AuditRsultType.success.getCode(), tab);
@@ -263,7 +263,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 			//解绑日志
 			StaffClerkRelationDTO relationDTO = staffClerkRelationApiService.getByClerkId(obj.getClerkId());
 			if (null != relationDTO) {
-				staffClerkRelationApiService.pushToBindLog(relationDTO.getStaffId(),tab.getCommitStaffId(),BindTypeEnum.UNBIND.getVal(),ChannelCodeEnum.SELF_UNBIND.getCode(),relationDTO.getStaffClerkRelationId());
+				staffClerkRelationApiService.pushToBindLog(relationDTO.getStaffId(),optStaffId,BindTypeEnum.UNBIND.getVal(),ChannelCodeEnum.SELF_UNBIND.getCode(),relationDTO.getStaffClerkRelationId());
 			}
 			staffClerkRelationApiService.delByClerkId(obj.getClerkId());
 			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 1, "");

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

@@ -303,8 +303,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		
 		String uuid = "";
 		if(exsitDTO == null){
-			dto.setSelfExternalUserid(externalUserId);
-			dto.setExternalUserid(selfExternalUserId);
+			dto.setSelfExternalUserid(selfExternalUserId);
+			dto.setExternalUserid(externalUserId);
 			dto.setUnionid(unionId);
 			uuid = memberUnionRelatedService.addMemberUnionidRelated(dto);
 		}else{
@@ -327,7 +327,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				log.info("【新增外部联系人】主门店为空");
 				return "";
 			}
-			tab =  getExternalClerkRelatedSelf(pojo, wxEnterpriseId, staffId, uuid, userId, selfExternalUserId,r.getStoreId());
+			tab =  getExternalClerkRelatedSelf(pojo, wxEnterpriseId, staffId, uuid, userId, null,r.getStoreId());
 		}else{
 			tab = getExternalClerkRelated(pojo, wxEnterpriseId, staffId, uuid, userId, externalUserId);
 		}
@@ -358,6 +358,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			related.setUnionid(unionId);
 			related.setWxEnterpriseId(wxEnterpriseId);
 			related.setWxUserId(userId);
+			related.setExternalUserId(externalUserid);
 			//externalClerkRelatedService.insert(related);
 			return related;
 		}else{

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

@@ -342,7 +342,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 					}
 				}
 
-				ClerkDTO clerkDTO = clerkService.getClerkByClerkId(staffClerkBindLogDetailDTO.getClerkId());
+				ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(staffClerkBindLogDetailDTO.getClerkId());
 				if (null != clerkDTO) {
 					staffClerkBindLogDetailDTO.setClerkName(clerkDTO.getClerkName());
 					staffClerkBindLogDetailDTO.setClerkPhoneNumber(clerkDTO.getPhoneNumber());

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

@@ -19,7 +19,6 @@ import com.gic.haoban.manage.web.anno.HttpLimit;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.vo.BatchApproveVO;
 import com.gic.haoban.manage.web.vo.LoginVO;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -172,7 +171,8 @@ public class AuditController extends WebBaseController{
 		int failCount = 0;
 		String batchId = UuidUtil.randomUUID();
 		for(String auditId : s){
-			String result = auditApiService.audit(batchId,auditId,staffId,staffName);
+			String result = auditApiService.audit(batchId,auditId,staffName,staffId);
+//			String result = auditApiService.audit(batchId,auditId,auditName,loginStaffDTO.getStaffId());
 			if(StringUtils.isEmpty(result)){
 				successCount = successCount+1;
 			}else{
@@ -196,7 +196,7 @@ public class AuditController extends WebBaseController{
 		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String staffId = login.getStaffDTO().getStaffId();
 		String staffName = login.getStaffDTO().getStaffName();
-		auditApiService.refuse(auditId, auditReason,staffId,staffName);
+		auditApiService.refuse(auditId, auditReason,staffName,staffId);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 	//审核同意
@@ -204,13 +204,16 @@ public class AuditController extends WebBaseController{
 	@RequestMapping("audit")
 	public HaobanResponse audit(String auditId,String auditName ) {
 		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		StaffDTO loginStaffDTO = login.getStaffDTO();
+		if (null == login) {
+			return resultResponse(HaoBanErrCode.ERR_4);
+		}
 		String staffId = login.getStaffDTO().getStaffId();
 		String staffName = login.getStaffDTO().getStaffName();
-
 		if(StringUtils.isAnyBlank(auditId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		String result = auditApiService.audit("",auditId,staffId,staffName);
+		String result = auditApiService.audit("",auditId,staffName,staffId);
 		if(StringUtils.isEmpty(result)){
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}else{

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

@@ -436,7 +436,7 @@ public class ClerkController extends WebBaseController{
 			} catch (Exception e) {
 				logger.info(e.getMessage(),e);
 			}
-			memberUnionidRelatedApiService.freshWxFrend(wxEnterpriseId, staff.getWxUserId(),storeId);
+//			memberUnionidRelatedApiService.freshWxFrend(wxEnterpriseId, staff.getWxUserId(),storeId);
 			
 		}else{
 			return resultResponse(HaoBanErrCode.ERR_10011);