Skip to content

H
haoban-manage3.0
Commit d8f2ecf9 by fudahua
Options

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

parents 33eae66f 3940d49a
Showing with 10 additions and 13 deletions
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
...@@ -124,20 +124,14 @@ public class ClerkController extends WebBaseController{ ...@@ -124,20 +124,14 @@ public class ClerkController extends WebBaseController{
List<StaffDTO> resultList = new ArrayList<>(); List<StaffDTO> resultList = new ArrayList<>();
for(StaffClerkRelationDTO staffClerkRelationDTO : list){ for(StaffClerkRelationDTO staffClerkRelationDTO : list){
StaffDTO dto = map.get(staffClerkRelationDTO.getStaffId()); StaffDTO dto = map.get(staffClerkRelationDTO.getStaffId());
ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
if(size < 20){ if(clerk != null){
ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode()); long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
if(clerk != null){ logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},count={}",staffClerkRelationDTO.getEnterpriseId(),clerk.getClerkId(),storeId,memberCount);
long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId); dto.setMemberCount(memberCount);
logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},count={}",staffClerkRelationDTO.getEnterpriseId(),clerk.getClerkId(),storeId,memberCount); dto.setClerkId(clerk.getClerkId());
dto.setMemberCount(memberCount); resultList.add(dto);
}else{
dto.setMemberCount(0);
}
}else{
dto.setMemberCount(0);
} }
resultList.add(dto);
} }
return resultResponse(HaoBanErrCode.ERR_1,resultlist); return resultResponse(HaoBanErrCode.ERR_1,resultlist);
...@@ -258,6 +252,9 @@ public class ClerkController extends WebBaseController{ ...@@ -258,6 +252,9 @@ public class ClerkController extends WebBaseController{
@HttpLimit @HttpLimit
@RequestMapping("/staff-del") @RequestMapping("/staff-del")
public HaobanResponse staffDel(String wxEnterpriseId,String storeId,Integer version,String clerkIds,String staffId) { 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); AuditSettingDTO dto = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
if(dto.getClerkChangeFlag() == 1){ if(dto.getClerkChangeFlag() == 1){
//需要审核 //需要审核
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment