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

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

@@ -280,6 +280,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId());
 		if(tab == null){
 			logger.info("店长未绑定clerkId={}",gicClerk.getClerkId());
+			return ;
 		}
 		String pageUrl = this.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
 		this.sendAuditMessage(tab.getStaffId(), messageTitle, messageContent, pageUrl,auditStatus,"");
@@ -300,6 +301,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId());
 		if(tab == null){
 			logger.info("店长未绑定clerkId={}",gicClerk.getClerkId());
+			return ;
 		}
 		String pageUrl = this.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
 		this.sendAuditMessage(tab.getStaffId(), messageTitle, messageContent, pageUrl,auditStatus,"");

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

@@ -124,20 +124,14 @@ public class ClerkController extends WebBaseController{
 		List<StaffDTO> resultList = new ArrayList<>();
 		for(StaffClerkRelationDTO staffClerkRelationDTO : list){
 			StaffDTO dto = map.get(staffClerkRelationDTO.getStaffId());
-			
-			if(size < 20){
-				ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
-				if(clerk != null){
-					long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
-					logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},count={}",staffClerkRelationDTO.getEnterpriseId(),clerk.getClerkId(),storeId,memberCount);
-					dto.setMemberCount(memberCount);
-				}else{
-					dto.setMemberCount(0);
-				}
-			}else{
-				dto.setMemberCount(0);
+			ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
+			if(clerk != null){
+				long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
+				logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},count={}",staffClerkRelationDTO.getEnterpriseId(),clerk.getClerkId(),storeId,memberCount);
+				dto.setMemberCount(memberCount);
+				dto.setClerkId(clerk.getClerkId());
+				resultList.add(dto);
 			}
-			resultList.add(dto);
 		}
 		return resultResponse(HaoBanErrCode.ERR_1,resultlist);
 		
@@ -239,6 +233,9 @@ public class ClerkController extends WebBaseController{
 			json.put("headPic", staff.getHeadImg());
 			json.put("sex", sex);
 			json.put("postion", postion);
+			json.put("phoneNumber", phoneNumber);
+			json.put("nationcode", nationcode);
+
 			audit.setOldValue(json.toJSONString());
 			audit.setCommitTime(new Date());
 			audit.setAuditType(3);
@@ -258,6 +255,9 @@ public class ClerkController extends WebBaseController{
 	@HttpLimit
 	@RequestMapping("/staff-del")
 	public HaobanResponse staffDel(String wxEnterpriseId,String storeId,Integer version,String clerkIds,String staffId) {
+		if(StringUtils.isAnyBlank(clerkIds)) {
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
 		AuditSettingDTO dto = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
 		if(dto.getClerkChangeFlag() == 1){
 			//需要审核

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

@@ -206,7 +206,7 @@ public class InfoController extends WebBaseController{
                     VO.setWxEnterpriseId(dto.getWxEnterpriseId());
                     VO.setEnterpriseId(store.getEnterpriseId());
                     VO.setStoreImg(store.getImageUrl());//先置空
-
+                    VO.setBindFlag(1);
                     VO.setClerkCode(clerkDTO.getClerkCode());
                     VO.setClerkType(clerkDTO.getClerkType());
                     VO.setStaffId(staffDTO.getStaffId());

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

@@ -90,7 +90,7 @@ public class StoreController extends WebBaseController{
 	//门店列表
 	@RequestMapping("/store-list")
 	public HaobanResponse storeList(String staffId,String wxEnterpriseId,String version) {
-		if("1".equals(version)){
+		if(true){
 			if(StringUtils.isAnyBlank(staffId,wxEnterpriseId)){
 				return resultResponse(HaoBanErrCode.ERR_2);
 			}
@@ -125,6 +125,7 @@ public class StoreController extends WebBaseController{
 					vo.setStoreImg(store.getStoreImage());
 					vo.setStoreName(store.getStoreName());
 					vo.setWxEnterpriseId(wxEnterpriseId);
+					vo.setBindFlag(1);
 					list.add(vo);
 				}
 			}

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

@@ -21,6 +21,15 @@ public class StaffStoreVO implements Serializable {
     private int clerkType;
     private Integer mainStoreFlag;
     private String phoneNumber;
+	private int bindFlag;
+
+	public int getBindFlag() {
+		return bindFlag;
+	}
+
+	public void setBindFlag(int bindFlag) {
+		this.bindFlag = bindFlag;
+	}
 
 	public String getPhoneNumber() {
 		return phoneNumber;

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

@@ -19,6 +19,15 @@ public class StoreMemberVO implements Serializable {
     private String clerkId;
     private String storeImg;
     private int clerkType;
+	private int bindFlag;
+
+	public int getBindFlag() {
+		return bindFlag;
+	}
+
+	public void setBindFlag(int bindFlag) {
+		this.bindFlag = bindFlag;
+	}
 
 	public String getStoreId() {
 		return storeId;