Merge branch 'master' into developer

# Conflicts:
#	haoban-manage3-service/src/main/resources/mapper/WxEnterpriseRelatedMapper.xml
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

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

@@ -9,16 +9,12 @@ public interface WxEnterpriseRelatedMapper {
 
     int deleteByPrimaryKey(String wxEnterpriseRelatedId);
 
-    int insert(TabHaobanWxEnterpriseRelated record);
-
     int insertSelective(TabHaobanWxEnterpriseRelated record);
 
     TabHaobanWxEnterpriseRelated selectByPrimaryKey(String wxEnterpriseRelatedId);
 
     int updateByPrimaryKeySelective(TabHaobanWxEnterpriseRelated record);
 
-    int updateByPrimaryKey(TabHaobanWxEnterpriseRelated record);
-    
     List<TabHaobanWxEnterpriseRelated> listByWxenterpriseId(String wxEnterpriseId);
     
     List<TabHaobanWxEnterpriseRelated> listByWxenterpriseIdList(@Param("wxEnterpriseIdList") List<String> wxEnterpriseIdList);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxEnterpriseRelated.java

@@ -9,6 +9,8 @@ public class TabHaobanWxEnterpriseRelated implements Serializable {
     private String wxEnterpriseId;
 
     private String enterpriseId;
+    
+    private String enterpriseName;
 
     private String version;
 
@@ -135,6 +137,12 @@ public class TabHaobanWxEnterpriseRelated implements Serializable {
 	public void setStaffName(String staffName) {
 		this.staffName = staffName;
 	}
-    
-    
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
 }
\ No newline at end of file

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

@@ -57,6 +57,8 @@ public class StoreController extends WebBaseController {
     @Autowired
     private StaffClerkRelationApiService staffClerkRelationApiService;
     @Autowired
+    private EnterpriseService enterpriseService;
+    @Autowired
     private StaffApiService staffApiService;
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService;
@@ -94,13 +96,12 @@ public class StoreController extends WebBaseController {
         String storeId = mainDTO == null ? "" : mainDTO.getStoreId();
 
         for (StaffClerkRelationDTO staffClerkRelationDTO : bindRelationList) {
-            String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
-            boolean enterpriseOver = wxEnterpriseApiService.enterpriseIsOver(enterpriseId);
+            boolean enterpriseOver = isEnterpriseOver(staffClerkRelationDTO.getStoreId());
             if (enterpriseOver) {
-                logger.info("该企业过期了：{},{},{}", staffId, enterpriseId, staffClerkRelationDTO.getStoreId());
+                logger.info("该企业过期了：{},{},{}", staffId, staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getStoreId());
                 continue;
             }
-            ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, staffClerkRelationDTO.getClerkCode());
+            ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
             if (clerk == null) {
                 continue;
             }
@@ -116,12 +117,17 @@ public class StoreController extends WebBaseController {
             if (wxEnterpriseDTO == null) {
                 continue;
             }
+            String enterpriseId = clerk.getEnterpriseId();
+            EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(enterpriseId);
+            if (enterpriseDTO == null) {
+                continue;
+            }
             //主门店标志
             int mainStoreFlag = 0;
             if (storeId.equals(store.getStoreId())) {
                 mainStoreFlag = 1;
             }
-            EnterpriseDetailDTO enterpriseDetailDTO = enterpriseTypeMap.get(clerk.getEnterpriseId());
+            EnterpriseDetailDTO enterpriseDetailDTO = enterpriseTypeMap.get(enterpriseId);
             staffDepartmentRelatedApiService.listByStaffId(staffId);
             StaffStoreVO vo = new StaffStoreVO();
             vo.setClerkCode(clerk.getClerkCode());
@@ -129,7 +135,7 @@ public class StoreController extends WebBaseController {
             vo.setMemberOpenCardFlag(enterpriseDetailDTO != null ? enterpriseDetailDTO.getMemberOpenCardFlag() : null);
             vo.setClerkId(clerk.getClerkId());
             vo.setClerkType(clerk.getClerkType());
-            vo.setEnterpriseId(clerk.getEnterpriseId());
+            vo.setEnterpriseId(enterpriseId);
             vo.setMainStoreFlag(mainStoreFlag);
             vo.setPhoneNumber(clerk.getPhoneNumber());
             vo.setStaffId(staffId);
@@ -140,7 +146,7 @@ public class StoreController extends WebBaseController {
             vo.setClerkName(clerk.getClerkName());
             vo.setHeadImg(staffDTO.getHeadImg());
             vo.setBindFlag(1);
-            vo.setEnterpriseName(enterpriseDetailDTO != null ? enterpriseDetailDTO.getEnterpriseName() : null);
+            vo.setEnterpriseName(enterpriseDTO.getEnterpriseName());
             vo.setCorpName(wxEnterpriseDTO.getCorpName());
             list.add(vo);
         }
@@ -198,7 +204,6 @@ public class StoreController extends WebBaseController {
                     cityList.add(cityMap.get(key));
                 }
                 return resultResponse(HaoBanErrCode.ERR_1, cityList);
-            // 区
             case 3:
                 Map<String, CountyDTO> tabCountyMap = GlobalDictMap.countyMap;
                 Map<String, CountyDTO> countyMap = new HashMap<String, CountyDTO>();
@@ -212,9 +217,9 @@ public class StoreController extends WebBaseController {
                     countyList.add(countyMap.get(key));
                 }
                 return resultResponse(HaoBanErrCode.ERR_1, countyList);
-            default:
-                return resultResponse(HaoBanErrCode.ERR_8);
         }
+
+        return resultResponse(HaoBanErrCode.ERR_8);
     }
 
     //修改门店数据
@@ -323,4 +328,26 @@ public class StoreController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1, vo);
     }
 
+    //获取门店详情
+    public boolean isEnterpriseOver(String storeId) {
+        StoreDTO store = storeService.getStore(storeId);
+        if (store == null) {
+            return true;
+        }
+        EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(store.getEnterpriseId());
+        if (enterprise == null || enterprise.getStatus() != 1) {
+            return true;
+        }
+        if (enterprise.getExpireTime() == null) {
+            if (enterprise.getEnabledState() == null) {
+                return false;
+            } else {
+                return enterprise.getEnabledState() != 1;
+            }
+        } else {
+            return enterprise.getExpireTime().getTime() <= System.currentTimeMillis() || enterprise.getEnabledState() != 1;
+        }
+    }
+
+
 }