商户默认值

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/EnterpriseDetailDTO.java

@@ -30,6 +30,15 @@ public class EnterpriseDetailDTO implements Serializable{
 	private Integer memberOpenCardFlag;
 	// 是否有权限访问 1是0否
 	private int aclFlag = 1  ;
+	private int defaultFlag ;
+
+    public int getDefaultFlag() {
+        return defaultFlag;
+    }
+
+    public void setDefaultFlag(int defaultFlag) {
+        this.defaultFlag = defaultFlag;
+    }
 
     public int getAclFlag() {
         return aclFlag;

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java

@@ -97,8 +97,17 @@ public class StaffDTO implements Serializable {
 	private String wxOpenId;
 	private String qrCode;
 	private String clerkName;
+	private String defaultGicEid ;
 
-	public String getClerkId() {
+	public String getDefaultGicEid() {
+        return defaultGicEid;
+    }
+
+    public void setDefaultGicEid(String defaultGicEid) {
+        this.defaultGicEid = defaultGicEid;
+    }
+
+    public String getClerkId() {
 		return clerkId;
 	}
 

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

@@ -268,5 +268,7 @@ public interface StaffApiService {
      * @date 2022-05-09 16:34:56
      */
     List<String> getHaoBanStoreRolesByStoreWidgetId(String storeWidgetId,String enterpriseId);
+    
+    public void updateDefaultGicEid(String staffid , String gicEnterpriseId) ;
 
 }

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

@@ -87,7 +87,7 @@ public interface WxEnterpriseRelatedApiService {
 	 */
 	public List<WxEnterpriseDTO> listWxEnterpriseByEid(String enterpriseId);
 	
-	public List<WxEnterpriseDTO> listWxEnterpriseByEid(String enterpriseId , String clerkPhoneNumber);
+	public List<WxEnterpriseDTO> listWxEnterpriseByEid(String enterpriseId , String clerkPhoneNumber );
 
 	/**
 	 * 根据商户id 获取所有被绑定分组

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

@@ -143,4 +143,6 @@ public interface StaffMapper {
     void delOtherStaffByWxUserId(@Param("wxUserId") String wxUserId,
                                  @Param("staffId") String staffId,
                                  @Param("wxEnterpriseId") String wxEnterpriseId);
+    
+    void updateDefaultGicEid(@Param("staffId") String staffId, @Param("gicEid") String gicEid) ;
 }
\ No newline at end of file

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

@@ -47,6 +47,15 @@ public class TabHaobanStaff implements Serializable {
 
     private String wxOpenId;
     private String qrCode;
+    private String defaultGicEid ;
+    
+    public String getDefaultGicEid() {
+        return defaultGicEid;
+    }
+
+    public void setDefaultGicEid(String defaultGicEid) {
+        this.defaultGicEid = defaultGicEid;
+    }
 
     public String getStaffId() {
         return staffId;

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

@@ -116,4 +116,6 @@ public interface StaffService {
      * @param wxEnterpriseId wx企业标识
      */
     void delOtherStaffByWxUserId(String wxUserId, String staffId, String wxEnterpriseId);
+    
+    public void updateDefaultGicEid(String staffid , String gicEnterpriseId) ;
 }

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

@@ -161,4 +161,9 @@ public class StaffServiceImpl implements StaffService {
         mapper.delOtherStaffByWxUserId(wxUserId, staffId, wxEnterpriseId);
     }
 
+    @Override
+    public void updateDefaultGicEid(String staffid , String gicEnterpriseId) {
+        this.mapper.updateDefaultGicEid(staffid, gicEnterpriseId);
+    }
+    
 }

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

@@ -1366,4 +1366,8 @@ public class StaffApiServiceImpl implements StaffApiService {
         logger.info("门店筛选器查询结果:{}", JSON.toJSONString(storeIdList));
         return storeIdList;
     }
+    
+    public void updateDefaultGicEid(String staffid , String gicEnterpriseId) {
+        this.staffService.updateDefaultGicEid(staffid, gicEnterpriseId);
+    }
 }

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

@@ -504,14 +504,18 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
             return  list ;
         }
         List<WxEnterpriseDTO>  dtoList  =  this.listWxEnterpriseByEid(enterpriseId) ;
-        logger.info("用户管辖微信企业phone={},hbEnt={},dtoList={}",clerkPhoneNumber,clerk.getHbEnt(),JSON.toJSONString(dtoList));
+        logger.info("用户管辖微信企业phone={},hbEnt={},dtoList={},super={}",clerkPhoneNumber,clerk.getHbEnt(),JSON.toJSONString(dtoList),clerk.getSuperAdmin());
         if(CollectionUtils.isEmpty(dtoList)) {
             return list ;
         }
-        for(WxEnterpriseDTO item : dtoList) {
-            if(clerk.getHbEnt().contains(item.getWxEnterpriseId())) {
-                list.add(item) ;
+        if(null == clerk.getSuperAdmin() || 0 == clerk.getSuperAdmin()) {
+            for(WxEnterpriseDTO item : dtoList) {
+                if(clerk.getHbEnt().contains(item.getWxEnterpriseId())) {
+                    list.add(item) ;
+                }
             }
+        }else {
+            return dtoList ;
         }
         return list;
     }

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -23,13 +23,15 @@
         <result column="wx_open_user_id" property="wxOpenUseId" jdbcType="VARCHAR"/>
         <result column="wx_open_id" property="wxOpenId" jdbcType="VARCHAR"/>
         <result column="qr_code" property="qrCode" jdbcType="VARCHAR"/>
+        <result column="default_gic_eid" property="defaultGicEid"/>
+        
     </resultMap>
 
     <sql id="Base_Column_List">
         staff_id
         , wx_user_id, phone_number, staff_name, nation_code, nick_name, sex, postion,
     active_flag, extend_postion, status_flag, create_time, update_time,wx_enterprise_id,head_img,
-    sort,sync_postion_flag,super_manager_flag,wx_open_user_id,wx_open_id,qr_code
+    sort,sync_postion_flag,super_manager_flag,wx_open_user_id,wx_open_id,qr_code , defaultGicEid
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
@@ -489,4 +491,8 @@
           and status_flag = 1
           and staff_id != #{staffId}
     </update>
+    
+    <update id="updateDefaultGicEid">
+    	update tab_haoban_staff set default_gic_eid = #{gicEid} where staff_id != #{staffId}
+    </update>
 </mapper>
\ No newline at end of file

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

@@ -75,12 +75,17 @@ public class StaffController extends WebBaseController {
     private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
 
     @Autowired
-    private EnterpriseService enterpriseService;
-
-    @Autowired
     private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
 
-
+    
+    @RequestMapping("set-default-gicenterprise")
+    public HaobanResponse updateDefaultGicEid(String enterpriseId) {
+        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
+        String staffId = login.getStaffId() ;
+        this.staffApiService.updateDefaultGicEid(staffId, enterpriseId);
+        return this.success(null) ;
+    }
+    
     @RequestMapping("staff-add")
     public HaobanResponse staffAdd(StaffDTO staffDTO, String departmentIds) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
@@ -540,7 +545,6 @@ public class StaffController extends WebBaseController {
                 staffDTO.setClerkName(clerkName.toString());
             }
         }
-
     }
 
 }

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

@@ -135,6 +135,14 @@ public class WxEnterpriseController extends WebBaseController {
         String wxEnterpriseId = login.getWxEnterpriseId();
         String phoneNumber = login.getPhoneNumber() ;
         List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId,phoneNumber);
+        String staffId = login.getStaffId() ;
+        StaffDTO dto =  this.staffApiService.selectById(staffId) ;
+        String eid = dto.getDefaultGicEid() ;
+        for(EnterpriseDetailDTO item : list) {
+            if(eid.equals(item.getEnterpriseId())) {
+                item.setDefaultFlag(1);
+            }
+        }
         return resultResponse(HaoBanErrCode.ERR_1, list);
     }