Merge branch 'feature/01-10' into developer

# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

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

@@ -58,6 +58,7 @@ public interface StaffApiService {
 
 	List<String> listUnBindClerk(String storeId);
 
+	@Deprecated
 	void cleanGicClerk(String clerkCode, String departmentId);
 
 	String insertUserLoginLog(UserLoginLogDTO userLoginLogDTO);
@@ -189,4 +190,16 @@ public interface StaffApiService {
 	 */
 	StaffQrCodeDTO getQrCodeByClerkId(String clerkId);
 
+
+
+	/**
+	 * 根据微信用户id查询员工
+	 *
+	 * @param wxEnterpriseId wx企业标识
+	 * @param wxUserId       wx用户id
+	 * @return {@link StaffDTO }
+	 * @author mozhu
+	 * @date 2022-01-13 14:41:53
+	 */
+	StaffDTO getStaffByWxUserId(String wxEnterpriseId,String wxUserId);
 }

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

@@ -123,4 +123,16 @@ public interface StaffMapper {
 	 */
 	TabHaobanStaff selectByPhoneNumberAndEnterpriseId(@Param("phoneNumber") String phoneNumber,
 													  @Param("wxEnterpriseId") String wxEnterpriseId);
+
+	/**
+	 * 根据微信用户id查询员工
+	 *
+	 * @param wxEnterpriseId wx企业标识
+	 * @param wxUserId       wx用户id
+	 * @return {@link TabHaobanStaff }
+	 * @author mozhu
+	 * @date 2022-01-13 14:41:40
+	 */
+	TabHaobanStaff getStaffByWxUserId(@Param("wxEnterpriseId") String wxEnterpriseId,
+									  @Param("wxUserId") String wxUserId);
 }
\ No newline at end of file

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

@@ -543,6 +543,7 @@ public class StaffApiServiceImpl implements StaffApiService {
     @Deprecated
     public void wxGetAddOld(String userId, String wxEnterpriseId) {
         //获取微信用户信息
+
         TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId);
         if (staff == null) {
             WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
@@ -697,11 +698,11 @@ public class StaffApiServiceImpl implements StaffApiService {
                 } else {
                     tab.setActiveFlag(0);
                 }
+                String staffId = staffService.add(tab);
             }
         } else {
             WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
             if (enterpriseDTO != null) {
-                //UserDTO user = qywxUserApiService.getSelfWorkWxUser(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), userId);
                 logger.info("【修改用户】user={}", JSON.toJSONString(user));
                 Integer[] departmentId = user.getDepartment();
                 String departmentIds = "";
@@ -784,14 +785,12 @@ public class StaffApiServiceImpl implements StaffApiService {
         }
     }
 
-    @Deprecated
     private void wxStaffEdit(StaffDTO staffDTO, String departmentIds) {
         staffDTO.setWeixinPush(true);
         staffEditDeal(staffDTO, departmentIds, false);
     }
 
 
-    @Deprecated
     private void updateGicClerk(TabHaobanStaff oldStaff, StaffDTO staffDTO, String departmentId, TabHaobanStaffDepartmentRelated related) {
         logger.info("【员工修改】oldName={},name={},oldPhoneNumber={},phoneNumber={}", oldStaff.getStaffName(), staffDTO.getStaffName(), oldStaff.getPhoneNumber(), staffDTO.getPhoneNumber());
         String staffName = staffDTO.getStaffName();
@@ -898,6 +897,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 
     @Override
     public int countByDepartmentId(String departmentId) {
+
         return staffDepartmentRelatedService.countByDepartmentId(departmentId);
     }
 
@@ -911,13 +911,14 @@ public class StaffApiServiceImpl implements StaffApiService {
     public void addGicClerk(GicClerkDTO clerkDTO) {
         logger.info("同步gic店员：{}", JSONObject.toJSONString(clerkDTO));
         addClerkByGic(clerkDTO);
+
     }
 
 
     @Override
     public void syncGicClerk(String fieldListString) {
         List<SyncJsonColumnDTO> fieldList = JSONArray.parseArray(fieldListString, SyncJsonColumnDTO.class);
-        if (fieldList.isEmpty() || true) {
+        if (true) {
             return;
         }
     }
@@ -937,6 +938,7 @@ public class StaffApiServiceImpl implements StaffApiService {
             status = 1;
         }
         String postion = clerkDTO.getPostionName();
+        String enterpriseId = clerkDTO.getEnterpriseId();
 
         if (StringUtils.isBlank(gicStoreId)) {
             logger.info("【店员同步】gicStoreId为空");
@@ -949,6 +951,7 @@ public class StaffApiServiceImpl implements StaffApiService {
         }
         String departmentId = department.getDepartmentId();
         String wxEnterpriseId = department.getWxEnterpriseId();
+//	    StaffDTO staff = this.selectByNationcodeAndPhoneNumber(wxEnterpriseId, nationcode, phoneNumber);
         StaffDTO staff = geCcheckAndInitUser(wxEnterpriseId, nationcode, phoneNumber);
         if (staff == null) {
             if (status != 1) {
@@ -1000,6 +1003,8 @@ public class StaffApiServiceImpl implements StaffApiService {
             } else {
                 staff.setHeadImg(headPic);
                 staff.setSex(sex);
+                //staff.setPostion(postion);
+//	    		staff.setStaffName(staffName);
                 if (staff.getActiveFlag() != null && staff.getActiveFlag() != 1) {
                     staff.setStaffName(staffName);
                 }
@@ -1216,6 +1221,8 @@ public class StaffApiServiceImpl implements StaffApiService {
             } else {
                 staff.setHeadImg(clerkDTO.getHeadImgUrl());
                 staff.setSex(clerkDTO.getClerkGender());
+                //staff.setPostion(postion);
+//	    		staff.setStaffName(staffName);
                 if (staff.getActiveFlag() != null && staff.getActiveFlag() != 1) {
                     staff.setStaffName(clerkDTO.getClerkName());
                 }
@@ -1366,17 +1373,11 @@ public class StaffApiServiceImpl implements StaffApiService {
         }
         Map<String, StaffClerkRelationDTO> clerkIdMap = staffRelationList.stream().filter(s -> s.getClerkId() != null).collect(Collectors.toMap(StaffClerkRelationDTO::getClerkId, s -> s));
         Set<String> keySet = clerkIdMap.keySet();
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(staffRelationList.get(0).getWxEnterpriseId());
-        String corpid = wxEnterpriseDTO.getCorpid();
         for (String clerkId : clerkList) {
             if (keySet.contains(clerkId)) {
-                if (corpid.length() > 20) {
-                    userIdList.add(clerkIdMap.get(clerkId).getWxOpenUserId());
-                } else {
                 userIdList.add(clerkIdMap.get(clerkId).getWxUserId());
             }
         }
-        }
         return userIdList;
     }
 
@@ -1523,4 +1524,10 @@ public class StaffApiServiceImpl implements StaffApiService {
         return staffQrCodeDTO;
     }
 
+    @Override
+    public StaffDTO getStaffByWxUserId(String wxEnterpriseId, String wxUserId) {
+        TabHaobanStaff tabHaobanStaff = staffMapper.getStaffByWxUserId(wxEnterpriseId, wxUserId);
+        return EntityUtil.changeEntityNew(StaffDTO.class,tabHaobanStaff);
+    }
+
 }

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

@@ -459,4 +459,13 @@
         and status_flag = 1 limit 1
     </select>
 
+    <select id="getStaffByWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_staff
+        and wx_enterprise_id = #{wxEnterpriseId}
+        and wx_user_id = #{wxUserId}
+        and status_flag = 1 limit 1
+    </select>
+
 </mapper>
\ No newline at end of file