zhs 3 年之前
父節點
當前提交
23263c03ca

+ 39 - 0
src/main/java/com/supplier/controller/WXLoginController.java

@@ -3,8 +3,10 @@ package com.supplier.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.supplier.jwt.JWTUtil;
+import com.supplier.model.Supplier;
 import com.supplier.model.User;
 import com.supplier.service.PersonalServce;
+import com.supplier.util.ParsingToken;
 import com.supplier.vx.WxLogin;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
@@ -100,6 +102,43 @@ public class WXLoginController {
         return map;
     }
 
+    /**
+     * 供应商绑定微信
+     * @param code  参数
+     * @param request 参数
+     * @return 返回结果
+     */
+    @RequestMapping("/notify/codeSupplier")
+    @ResponseBody
+    public Map<String, Object> codeSupplier(String code, HttpServletRequest request) {
+        //获取回调地址中的code
+        Map<String, Object> map = new HashMap<>();
+        try{
+            Map<String, Object> wxMap = wxLogin(code); //微信回调数据
+            //调用成功
+            if(wxMap.get("msg") == "200"){
+                JSONObject jsonObject1 = (JSONObject) wxMap.get("data");
+                //获取token
+                Map<String, Object> userMap = ParsingToken.tokenParsing(request);
+                Supplier supplier = new Supplier()
+                        .setWxid(jsonObject1.getString("unionid"))
+                        .setWxtoken((String) wxMap.get("accesstoken"))
+                        .setWxRefreshToken((String) wxMap.get("refreshtoken"))
+                        .setWxOpenid((String) wxMap.get("openId"))
+                        .setCode((String) userMap.get("code"));
+                personalServce.updatePhone(supplier);//给指定供应商添加微信标识
+                map.put("msg", "200");
+            } else { //失败
+                return wxMap;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "微信登录异常");
+        }
+        return map;
+    }
+
     /**
      * 用户编号
      * @param id

+ 16 - 0
src/main/java/com/supplier/model/Supplier.java

@@ -83,4 +83,20 @@ public class Supplier implements Serializable {
      * 余额
      */
     private int balanceOf;
+    /**
+     * 微信刷新token
+     */
+    private String wxRefreshToken;
+    /**
+     * 微信openid
+     */
+    private String wxOpenid;
+    /**
+     * 微信id
+     */
+    private String wxid;
+    /**
+     * 微信token
+     */
+    private String wxtoken;
 }

+ 14 - 2
src/main/resources/config/mapping/PersonalMapper.xml

@@ -12,10 +12,22 @@
         <set>
             <trim suffixOverrides=",">
                 <if test="phone != null and phone != ''">
-                    phone = #{phone}
+                    phone = #{phone},
                 </if>
                 <if test="name != null and name != ''">
-                    name = #{name}
+                    name = #{name},
+                </if>
+                <if test="wxOpenid != null and wxOpenid != ''">
+                    wx_openid = #{wxOpenid},
+                </if>
+                <if test="wxRefreshToken != null and wxRefreshToken != ''">
+                    wx_refresh_token = #{wxRefreshToken},
+                </if>
+                <if test="wxid != null and wxid != ''">
+                    wxid = #{wxid},
+                </if>
+                <if test="wxtoken != null and wxtoken != ''">
+                    wxtoken = #{wxtoken},
                 </if>
             </trim>
         </set>

+ 4 - 4
src/main/resources/static/js/indexHome/function.js

@@ -6,7 +6,7 @@ function clickItem(obj){
         });
         $(obj).find("a cite img").attr("src",  "/images/indeHome/" + $(obj).attr("title") + "_click.png");
         //个人信息特殊处理
-        if($(obj).find("a cite").text() == "个人信息"){
+        if($(obj).find("a cite").text() == "账户信息"){
             $(".layui-nav-child dd").removeClass("layui-this");
             iframeClick(obj);
         }else if($(obj).find("a cite").text() == "路线发布"){//路线发布特殊处理
@@ -29,7 +29,7 @@ function iframeClick(obj){
     var flag = false;
     $.each($(".select_button"), (index, item) => {
         if(index > 0){
-            if($(item).find("span").html().indexOf(thisClickName) != -1){
+            if($(item).find("span").html().indexOf(thisClickName) != -1) {
                 flag = true;
                 return false;
             }
@@ -45,8 +45,8 @@ function iframeClick(obj){
                 "                </div>");
             $("iframe").attr("src", "/page/demandForSingleIndex?idVal=" + idVal);
         }
-        if(thisClickName == "个人信息"){
-            $(".center_top").append("<div onClick='switchMenu(this)' name='个人信息' src='/page/personalIndex' class=\"select_button check_div\">\n" +
+        if(thisClickName == "账户信息"){
+            $(".center_top").append("<div onClick='switchMenu(this)' name='账户信息' src='/page/personalIndex' class=\"select_button check_div\">\n" +
                 "                    <span>"+ thisClickName +"</span>\n" +
                 "                    <div class=\"close_button\" onclick='removeThis(this)'><i class=\"layui-icon layui-icon-close\"></i></div>\n" +
                 "                </div>");

+ 17 - 7
src/main/resources/templates/indexHome.html

@@ -94,24 +94,34 @@
                                 </dd>
                             </dl>
                         </li>
-                        <li class="layui-nav-item" name="订购权限" title="img5" onclick="clickItem(this)">
+                        <li class="layui-nav-item" name="变更申请" title="img1" onclick="clickItem(this)">
                             <a lay-id="#" lay-url="#">
-                                <i class="ri-shield-keyhole-line"></i>&emsp;<cite><img src="/images/indeHome/img5.png"/>订购权限</cite>
+                                <i class="ri-shield-keyhole-line"></i>&emsp;<cite><img src="/images/indeHome/img1.png"/>变更申请</cite>
                             </a>
                             <dl class="layui-nav-child">
                                 <dd>
-
+                                    <a lay-id="honePageIndex" lay-url="honePageIndex" idVal="1" onClick="iframeClick(this)">
+                                        <cite>日期变更</cite>
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a lay-id="HotDestination" lay-url="HotDestination" idVal="0" onClick="iframeClick(this)">
+                                        <cite>取消订单</cite>
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a lay-id="HotDestination" lay-url="HotDestination" idVal="5" onClick="iframeClick(this)">
+                                        <cite>路线变更</cite>
+                                    </a>
                                 </dd>
                             </dl>
                         </li>
-                        <li class="layui-nav-item" name="账户详情" title="img6" onclick="clickItem(this)">
+                        <li class="layui-nav-item" name="账户信息" title="img6" onclick="clickItem(this)">
                             <a lay-id="#" lay-url="#">
-                                <i class="ri-shield-keyhole-line"></i>&emsp;<cite><img src="/images/indeHome/img6.png"/>个人信息</cite>
+                                <i class="ri-shield-keyhole-line"></i>&emsp;<cite><img src="/images/indeHome/img6.png"/>账户信息</cite>
                             </a>
                             <dl class="layui-nav-child">
-                                <dd>
 
-                                </dd>
                             </dl>
                         </li>
                     </ul>