Skip to content

H
haoban-manage3.0
Commit 7a34c2e2 by huangZW
Options

111

parent d5722b87
Showing with 6 additions and 6 deletions
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
...@@ -302,7 +302,7 @@ public class StoreController extends WebBaseController{ ...@@ -302,7 +302,7 @@ public class StoreController extends WebBaseController{
//获取门店详情 //获取门店详情
@RequestMapping("/store-detail") @RequestMapping("/store-detail")
public HaobanResponse storeDetail(String storeId,String staffDepartmentRelatedId) { public HaobanResponse storeDetail(String storeId,String wxEnterpriseId,String staffId) {
if(StringUtils.isAnyBlank(storeId)){ if(StringUtils.isAnyBlank(storeId)){
return resultResponse(HaoBanErrCode.ERR_2); return resultResponse(HaoBanErrCode.ERR_2);
} }
...@@ -323,18 +323,18 @@ public class StoreController extends WebBaseController{ ...@@ -323,18 +323,18 @@ public class StoreController extends WebBaseController{
} }
vo.setAreaId(store.getAreaId()); vo.setAreaId(store.getAreaId());
vo.setStoreAddress(store.getFullArea()+" "+store.getStoreAddress()); vo.setStoreAddress(store.getFullArea()+" "+store.getStoreAddress());
StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentRelatedId); // StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentRelatedId);
vo.setClerkCode(staffDepartmentRelatedDTO.getClerkCode()); // vo.setClerkCode(staffDepartmentRelatedDTO.getClerkCode());
vo.setBindFlag(StringUtils.isEmpty(staffDepartmentRelatedDTO.getClerkCode())?0:1); // vo.setBindFlag(StringUtils.isEmpty(staffDepartmentRelatedDTO.getClerkCode())?0:1);
vo.setAuditDetail(list); vo.setAuditDetail(list);
AuditSettingDTO auditSettingDTO = auditSettingApiService.findSettingByWxEnterpriseId(staffDepartmentRelatedDTO.getWxEnterpriseId()); AuditSettingDTO auditSettingDTO = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
vo.setAuditFlag(auditSettingDTO == null?0:auditSettingDTO.getAuditFlag()); vo.setAuditFlag(auditSettingDTO == null?0:auditSettingDTO.getAuditFlag());
if(vo.getStoreArea() == null||vo.getStoreArea()==-1 ){ if(vo.getStoreArea() == null||vo.getStoreArea()==-1 ){
vo.setStoreArea(-1d); vo.setStoreArea(-1d);
} }
ClerkMainStoreRelatedDTO mainStore = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(staffDepartmentRelatedDTO.getWxEnterpriseId(),staffDepartmentRelatedDTO.getStaffId()); ClerkMainStoreRelatedDTO mainStore = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId,staffId);
if(mainStore != null && mainStore.getStoreId().equals(storeId)){ if(mainStore != null && mainStore.getStoreId().equals(storeId)){
vo.setMainStoreFlag(1); vo.setMainStoreFlag(1);
}else{ }else{
......
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