Merge remote-tracking branch 'origin/l' into l

src/main/java/com/cjy/back/sysUser/dao/SysUserMapper.java

@@ -36,7 +36,7 @@ public interface SysUserMapper {
     List<Map<String,Object>> queryUserListByPage(@Param("page") PageParameter page, @Param("map") HashMap<String, Object> selMap);
 
     /**
-    * 
+    *
     * @Description:  根据用户id查询用户的一些信息
     * @param userid 用户id
     * @return 用户对象
@@ -46,7 +46,7 @@ public interface SysUserMapper {
     Map<String,Object> findById(Integer userid);
 
     /**
-    * 
+    *
     * @Description:  根据用户名查询该用户名是否已存在
     * @param logname 用户名
     * @return
@@ -56,7 +56,7 @@ public interface SysUserMapper {
     int findUserByLogName(@Param("logname")String logname,@Param("userkey")String userkey,@Param("type")String type);
 
     /**
-    * 
+    *
     * @Description:  新增用户
     * @param sysUser 用户实体
     * @return
@@ -68,7 +68,7 @@ public interface SysUserMapper {
     int updateUserGoogleCode(@Param("code") String code,@Param("userid") Integer userid);
 
     /**
-    * 
+    *
     * @Description:  修改用户信息
     * @param sysUser 用户实体对象
     * @return
@@ -78,7 +78,7 @@ public interface SysUserMapper {
     int updateUser(SysUser sysUser);
 
     /**
-    * 
+    *
     * @Description:  根据用户id查询用户
     * @param userid 用户id
     * @return 用户对象
@@ -86,12 +86,12 @@ public interface SysUserMapper {
     * @date 2019/8/23
     */
     SysUser selectUserById(Integer userid);
-    
+
     /**
-    * 
+    *
     * @Description:  根据用户id删除用户信息
     * @param userid 用户id
-    * @return 
+    * @return
     * @author hpr
     * @date 2019/8/23
     */
@@ -123,8 +123,10 @@ public interface SysUserMapper {
      * @param userkey
      * @return
      */
-    SysUser selectUserByWxUnionid(@Param("unionid") String unionid,@Param("userkey") String userkey);
+    SysUser selectUserByWxOpenid(@Param("openid") String openid,@Param("userkey") String userkey);
+
 
+    Map<String,String> selectUserByOpenid(@Param("openid") String openid,@Param("userkey") String userkey);
     /**
      * 保存用户信息
      * @param user
@@ -149,6 +151,7 @@ public interface SysUserMapper {
      */
     int updateWxUxer(@Param("map") HashMap<String, Object> user);
 
+    int updateWxUxerByOpenid(@Param("map") HashMap<String, Object> user);
     /**
      * 根据userkey查询管理员地域
      * @param userkey

src/main/java/com/cjy/back/sysUser/dao/SysUserMapper.xml

@@ -42,18 +42,18 @@
 
     <!--查找用户名是否存在-->
     <select id="findUserByLogName" parameterType="string" resultType="java.lang.Integer">
-    
-        SELECT count(1) FROM sys_user WHERE logname = #{logname} 
-        
+
+        SELECT count(1) FROM sys_user WHERE logname = #{logname}
+
         <!-- <if test="type!='' and type!=null and type == 'ADMIN'">
         	AND usertype = 'LEVEL'
         </if>
-        
+
         <if test="type == ''">
         	AND userkey = #{userkey}
         </if> -->
-    
-        
+
+
     </select>
 
     <!--新增用户-->
@@ -99,8 +99,12 @@
     </select>
 
 
-    <select id="selectUserByWxUnionid" parameterType="string" resultType="com.cjy.back.sysUser.entity.SysUser">
-        SELECT * FROM sys_user WHERE wx_unionid = #{unionid} AND userkey = #{userkey}
+    <select id="selectUserByWxOpenid" parameterType="string" resultType="com.cjy.back.sysUser.entity.SysUser">
+        SELECT * FROM sys_user WHERE wx_openid = #{openid} AND userkey = #{userkey}
+    </select>
+
+    <select id="selectUserByOpenid" resultType="map">
+        SELECT wx_nickname as wxNickname,wx_headimgurl as wxHeadimgurl FROM sys_user WHERE wx_openid = #{openid} AND userkey = #{userkey}
     </select>
 
     <insert id="saveWxUser" parameterType="map" keyProperty="userid" useGeneratedKeys="true">
@@ -125,7 +129,9 @@
     <update id="updateWxUxer" parameterType="map">
         UPDATE  sys_user set wx_nickname = #{map.nickname},wx_headimgurl = #{map.headimgurl} WHERE wx_unionid = #{map.unionid} AND userkey = #{map.userkey}
     </update>
-
+    <update id="updateWxUxerByOpenid" parameterType="map">
+        UPDATE  sys_user set wx_nickname = #{map.nickname},wx_headimgurl = #{map.headimgurl} WHERE wx_openid = #{map.openid} AND userkey = #{map.userkey}
+    </update>
     <update id="updateLogstate">
         UPDATE  sys_user set logstate = 0 WHERE logname = #{logname}
     </update>
@@ -153,4 +159,4 @@
     <delete id="deleteUserApp">
         DELETE FROM sys_user WHERE wx_unionid = #{userid} AND userkey = #{userkey}
     </delete>
-</mapper>
+</mapper>

src/main/java/com/cjy/back/sysUser/service/SysUserService.java

@@ -138,6 +138,8 @@ public interface SysUserService {
      */
     ServerResponse saveUserInfo(HttpServletRequest request);
 
+    ServerResponse getUserByOpenId(HttpServletRequest request);
+
     /**
      * 修改密码
      * @param request

src/main/java/com/cjy/back/sysUser/service/SysUserServiceImpl.java

@@ -796,11 +796,11 @@ public class SysUserServiceImpl implements SysUserService {
             return ServerResponse.createByRequestMessage("信息错误");
         }
         HashMap<String,Object> user = JSONObject.parseObject(data, HashMap.class);
-        String unionid = String.valueOf(user.get("unionid"));
-        if(StringUtils.isEmpty(unionid)){
+        String openid = String.valueOf(user.get("openid"));
+        if(StringUtils.isEmpty(openid)){
             return ServerResponse.createByRequestMessage("请重新授权");
         }
-        SysUser sysUser = sysUserMapper.selectUserByWxUnionid(unionid,userkey);
+        SysUser sysUser = sysUserMapper.selectUserByWxOpenid(openid,userkey);
         user.put("userkey",userkey);
         if(sysUser == null){
             //user.put("privilege",user.get("privilege").toString());
@@ -809,25 +809,40 @@ public class SysUserServiceImpl implements SysUserService {
             user.put("usertype","USER");
             user.put("updatetime",System.currentTimeMillis());
             sysUserMapper.saveWxUser(user);
-            sysUser = sysUserMapper.selectUserByWxUnionid(unionid,userkey);
-            //生成个人二维码
-            String fileName = sysUser.getUserid() + ".png";
-            HashMap<String, Object> codeMsg = new HashMap<>();
-            codeMsg.put("userid",sysUser.getUserid());
-            CommonUtil.createCode(fileName,codeMsg);
+//            sysUser = sysUserMapper.selectUserByWxUnionid(unionid,userkey);
+//            //生成个人二维码
+//            String fileName = sysUser.getUserid() + ".png";
+//            HashMap<String, Object> codeMsg = new HashMap<>();
+//            codeMsg.put("userid",sysUser.getUserid());
+//            CommonUtil.createCode(fileName,codeMsg);
         }else{
-            sysUserMapper.updateWxUxer(user);
-            if(!new File(InitParam.codeUrl_filepath + "/" + sysUser.getUserid() + ".png").exists()){
-                //生成个人二维码
-                String fileName = sysUser.getUserid() + ".png";
-                HashMap<String, Object> codeMsg = new HashMap<>();
-                codeMsg.put("userid",sysUser.getUserid());
-                CommonUtil.createCode(fileName,codeMsg);
-            }
+            sysUserMapper.updateWxUxerByOpenid(user);
+//            if(!new File(InitParam.codeUrl_filepath + "/" + sysUser.getUserid() + ".png").exists()){
+//                //生成个人二维码
+//                String fileName = sysUser.getUserid() + ".png";
+//                HashMap<String, Object> codeMsg = new HashMap<>();
+//                codeMsg.put("userid",sysUser.getUserid());
+//                CommonUtil.createCode(fileName,codeMsg);
+//            }
+        }
+        return ServerResponse.createBySuccess("执行成功");
+    }
+
+    @Override
+    public ServerResponse getUserByOpenId(HttpServletRequest request) {
+        String userkey = request.getParameter("userkey");
+        if(StringUtils.isEmpty(userkey)){
+            return ServerResponse.createByRequestMessage("userkey不允许为空");
         }
-        return ServerResponse.createBySuccess("执行成功",sysUser.getUserid());
+        String openid = request.getParameter("openid");
+        if(StringUtils.isEmpty(openid)){
+            return ServerResponse.createByRequestMessage("请重新授权");
+        }
+        Map<String,String> map = sysUserMapper.selectUserByOpenid(openid,userkey);
+        return ServerResponse.createBySuccess("执行成功",map);
     }
 
+
     @Override
     public ServerResponse updateUserPwd(HttpServletRequest request) {
         try {

src/main/java/com/cjy/mobile/controller/WxUserController.java

@@ -102,6 +102,19 @@ public class WxUserController {
         return userService.saveUserInfo(request);
     }
 
+    /**
+     * 功能描述:根据openid和userkey获取用户信息
+     * @param:
+     * @return:
+     * @auther: zc
+     * @date: 2023/8/22 16:44
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getUserByOpenId")
+    public ServerResponse getUserByOpenId(HttpServletRequest request) {
+        return userService.getUserByOpenId(request);
+    }
+
     /**
      * app管理员登陆
      * @return

src/main/java/com/cjy/mobile/controller/YbsjLoginLogInfoController.java

@@ -45,10 +45,10 @@ public class YbsjLoginLogInfoController {
 	public ServerResponse insertLoginLog(HttpServletRequest request) {
 		System.out.println("--------------------------------");
 		String model = request.getParameter("model");//手机型号
-		String unionid = request.getParameter("unionid");//登录者主键id
+		String openid = request.getParameter("openid");//登录者主键id
 		String userkey = request.getParameter("userkey");//登录者主键id
 		String platform = request.getParameter("platform");//登录者主键id
-		SysUser sysUser = sysUserMapper.selectUserByWxUnionid(unionid, userkey);
+		SysUser sysUser = sysUserMapper.selectUserByWxOpenid(openid, userkey);
 		if(sysUser == null){
 			return ServerResponse.createByErrorMessage("保存异常");
 		}
@@ -88,6 +88,6 @@ public class YbsjLoginLogInfoController {
         userLogInfoMapper.insertRecord(logInfo);
         return ServerResponse.createBySuccessMessage("保存日志成功");
     }
-	
+
 
 }

src/main/webapp/html/back/scenicBasic/scenicBasicInfoAdd.html

@@ -64,12 +64,11 @@
 					   lay-skin="switch" lay-filter="switchTest" lay-text="YES|NO"
 					   value="NO">
 			</div>
-
-			<label class="layui-form-label"> 预约阈值</label>
+			<!--<label class="layui-form-label"> 预约阈值</label>
 			<div class="layui-input-inline">
 				<input type="text" name="threshold" id="threshold"
 					   placeholder="预约阈值" class="layui-input">
-			</div>
+			</div>-->
 		</div>
 
 		<div class="layui-form-item">

src/main/webapp/html/back/scenicBasic/scenicBasicInfoAdd.js

@@ -59,7 +59,7 @@ $(function() {
 					$("#remark").val(json.remark);
 					$("#videopath").val(json.soundpath);
 					$("#soundpath").val(json.videopath);
-                    $("#threshold").val(json.threshold);
+                    // $("#threshold").val(json.threshold);
                     $("#isSubscribe").val(json.isSubscribe);
                     console.log(json.isSubscribe);
                     if (json.isSubscribe == "YES"){

src/main/webapp/html/back/scenicBasic/scenicBasicInfoList.html

@@ -52,10 +52,10 @@
 <script type="text/html" id="barDemo">
 		<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>修改</a>
 		<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-		<a class="layui-btn layui-btn-xs" lay-event="xiangq" id="upda"><i class="layui-icon layui-icon-form"></i>绑定</a>
+		<!--<a class="layui-btn layui-btn-xs" lay-event="xiangq" id="upda"><i class="layui-icon layui-icon-form"></i>绑定</a>
 		<a class="layui-btn layui-btn-xs" lay-event="scenicTicket"><i class="layui-icon layui-icon-set-fill"></i>门票</a>
 		<a class="layui-btn layui-btn-xs" lay-event="bindUser"><i class="layui-icon layui-icon-set-fill"></i>检票员</a>
-		<a class="layui-btn layui-btn-xs" lay-event="appointLook"><i class="layui-icon layui-icon-set-fill"></i>预约</a>
+		<a class="layui-btn layui-btn-xs" lay-event="appointLook"><i class="layui-icon layui-icon-set-fill"></i>预约</a>-->
 </script>
 <script>
 	var tablehight = tableHight();