Merge remote-tracking branch 'origin/feature/获取用户敏感信息' into developer

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

@@ -200,6 +200,14 @@ public interface StaffApiService {
      */
     int updateQrCodeByStaffId(String staffId, String qrCode);
 
+    /**
+     * 通过userID更新员工二维码
+     * @param userId
+     * @param qrCode
+     * @return
+     */
+    int updateQrCodeByUserId(String userId, String qrCode);
+
 
     /**
      * 获取职员id二维码

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

@@ -85,6 +85,14 @@ public interface StaffMapper {
     int updateQrCodeByStaffId(@Param("staffId") String staffId, @Param("qrCode") String qrCode);
 
     /**
+     * 通过userID更新员工二维码
+     * @param userId
+     * @param qrCode
+     * @return
+     */
+    int updateQrCodeByUserId(@Param("userId") String userId, @Param("qrCode") String qrCode);
+
+    /**
      * 选择电话号码和企业标识
      */
     TabHaobanStaff selectByPhoneNumberAndEnterpriseId(@Param("phoneNumber") String phoneNumber,

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

@@ -755,6 +755,11 @@ public class StaffApiServiceImpl implements StaffApiService {
     }
 
     @Override
+    public int updateQrCodeByUserId(String userId, String qrCode) {
+        return staffMapper.updateQrCodeByUserId(userId,qrCode);
+    }
+
+    @Override
     public StaffQrCodeDTO getQrCodeByClerkId(String clerkId) {
         StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
         if (staffClerkRelationDTO == null) {

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

@@ -453,6 +453,13 @@
         where staff_id = #{staffId}
     </update>
 
+    <update id="updateQrCodeByUserId" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaff">
+        update tab_haoban_staff
+        set qr_code     = #{qrCode},
+            update_time = now()
+        where wx_user_id = #{userId} or wx_open_user_id = #{userId}
+    </update>
+
     <select id="selectByPhoneNumberAndEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
         <include refid="Base_Column_List"/>

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

@@ -1821,7 +1821,7 @@ public class WxStaffController extends WebBaseController {
         //更新staff的qr_code
         if(null!=result){
             logger.info("成员的user_id:{},qr_code：{}", result.getUserid(),result.getQr_code());
-            staffApiService.updateQrCodeByStaffId(result.getUserid(), result.getQr_code());
+            staffApiService.updateQrCodeByUserId(result.getUserid(), result.getQr_code());
         }
         return resultResponse(HaoBanErrCode.ERR_1);
     }