导购

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

@@ -2,7 +2,6 @@ package com.gic.haoban.manage.service.dao.mapper;
 
 
 import com.gic.haoban.manage.service.entity.TabHaobanOperationSetting;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -33,14 +32,6 @@ public interface TabHaobanOperationSettingMapper {
     int update(TabHaobanOperationSetting setting);
 
     /**
-     * 通过主键删除数据
-     *
-     * @param settingId 主键
-     * @return 影响行数
-     */
-    int deleteById(String settingId);
-
-    /**
      * 通过ID查询单条数据
      *
      * @param settingId 主键
@@ -56,22 +47,4 @@ public interface TabHaobanOperationSettingMapper {
      */
     List<TabHaobanOperationSetting> queryAll(TabHaobanOperationSetting setting);
 
-    /**
-     * 分页总数
-     *
-     * @return 对象列表
-     */
-    int queryCountByPage();
-
-
-    /**
-     * 分页列表
-     *
-     * @param offset 查询起始位置
-     * @param limit  查询条数
-     * @return 对象列表
-     */
-    List<TabHaobanOperationSetting> queryListByPage(@Param("offset") int offset, @Param("limit") int limit);
-
-
 }

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

@@ -91,11 +91,6 @@
         where setting_id = #{settingId}
     </update>
 
-    <!--通过主键删除-->
-    <delete id="deleteById">
-        delete from tab_haoban_operation_setting where setting_id = #{settingId}
-    </delete>
-
     <!--查询单个-->
     <select id="queryById" resultMap="TabHaobanOperationSettingMap">
         select
@@ -134,17 +129,4 @@
         </where>
     </select>
 
-    <select id="queryCountByPage" resultType="int">
-        select
-        count(*)
-        from tab_haoban_operation_setting
-    </select>
-
-    <select id="queryListByPage" resultMap="TabHaobanOperationSettingMap">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_operation_setting
-        limit #{offset}, #{limit}
-    </select>
-
 </mapper>

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

 package com.gic.haoban.manage.web.controller;
 
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -19,28 +30,14 @@ import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.enums.AuditType;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
-import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
-import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.AuditVO;
 import com.gic.haoban.manage.web.vo.StaffClerkBindLogDetailVO;
 import com.gic.redis.data.util.RedisUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 
 @RestController

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

@@ -109,7 +109,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         String userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(), code);
        // {"errcode":0,"corpid":"wweac4ef962720aa12","session_key":"oNKOu4tDcnTWdj4wOg75YQ==","errmsg":"ok",
        //     "open_userid":"wo59NLDQAAxeJ-Nr7_vwkZVc7QOG73PQ","userid":"xugaohua","deviceid":"0BB1D1FA-C5A2-4BDD-80A2-33B6BB230F8A"}
-        logger.info("userDTOJson=============>{}", userDTOJson);
+        logger.info("好办登录={}", userDTOJson);
         UserDTO user = JSON.parseObject(userDTOJson, UserDTO.class);
         if (user == null) {
             return resultResponse(HaoBanErrCode.ERR_6);
@@ -120,16 +120,13 @@ public class WxEnterpriseInfoController extends WebBaseController {
         StaffDTO loginStaff = null;
         if (enterprise != null) {
             loginStaff = staffApiService.getByUserIdAndReflushWhenNoPhone(userId, enterprise.getWxEnterpriseId());
-        }
-        //手机号不存在
             if (loginStaff == null) {
-            if (enterprise != null) {
                 staffApiService.wxGetAdd(userId, enterprise.getWxEnterpriseId());
                 loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId, enterprise.getWxEnterpriseId());
             }
         }
-
         if (loginStaff == null) {
+            logger.info("游客用户");
             WellDoneLoginInfoVO wellDoneLoginInfoVo = new WellDoneLoginInfoVO();
             wellDoneLoginInfoVo.setWxOpenUseId(userId);
             StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByUserId(userId);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/OperationSettingVO.java

@@ -69,11 +69,11 @@ public class OperationSettingVO implements Serializable {
     }
 
     public Integer getClerkPhoneFlag() {
-        return clerkPhoneFlag;
+        return 1;
     }
 
     public void setClerkPhoneFlag(Integer clerkPhoneFlag) {
-        this.clerkPhoneFlag = clerkPhoneFlag;
+        this.clerkPhoneFlag = 1;
     }
 
     public Integer getStoreEditFlag() {