'1'

twzd-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -1,14 +1,13 @@
 package com.miaxis.test;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.miaxis.TwzdApplication;
-import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.utils.StringUtils;
 import com.miaxis.feign.service.IWxSendService;
 import com.miaxis.question.mapper.QuestionInfoMapper;
 import com.miaxis.question.vo.QuestionInfoExcelTypeVo;
 import com.miaxis.question.vo.QuestionInfoExcelVo;
+import com.miaxis.school.mapper.SchoolInfoMapper;
 import com.miaxis.user.service.IUserInfoService;
+import com.miaxis.wx.dto.QueryParams;
 import com.miaxis.wx.service.IWxForeverCodeService;
 import com.miaxis.wx.service.impl.WxGzhServiceImpl;
 import org.apache.poi.hssf.usermodel.*;
@@ -50,6 +49,9 @@ public class NormalTest {
     @Resource
     IUserInfoService userInfoService;
 
+    @Resource
+    SchoolInfoMapper schoolInfoMapper;
+
 
     @Value("${app.appid}")
     private String appid;
@@ -58,15 +60,16 @@ public class NormalTest {
     private String secret;
     @Test
     public void getGzhToken() {
-        //查询该用户的销售类型
-        String fromUserName ="ovKTX50v7OAEPI_ERofpUvrNQCJU";
-        UserInfo userInfo = userInfoService.getOne(new QueryWrapper<UserInfo>().eq("openid", fromUserName));
-        //查询该用户的上级
-        UserInfo upUserInfo = userInfoService.getUpUserInfo(fromUserName);
-        //当用户销售类型为 普通用户(含驾校分成) 并且他的父级不是代理商(含驾校分成)时，则需要填写驾校信息，且未填写驾校信息时
-        if (userInfo.getSaleType() ==1 && upUserInfo.getSaleType()!=3 && StringUtils.isEmpty(userInfo.getSchoolName()) ){
-            System.out.println("进来了");
+        QueryParams queryParams = new QueryParams();
+        queryParams.setChoseColumName("city_name");
+        List<String> cities = schoolInfoMapper.queryNames(queryParams);
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("请选择驾校所在城市:").append("\n\n");
+        for (String city: cities){
+            buffer.append("<a href=\"weixin://bizmsgmenu?msgmenuid=1&msgmenucontent="+city+"\">"+city+"</a>").append("\n");
+           // return MessageUtil.initText(fromUserName, toUserName, buffer.toString());
         }
+        System.out.println(buffer);
     }
 
 

twzd-service/src/main/java/com/miaxis/school/mapper/SchoolInfoMapper.java

@@ -2,7 +2,7 @@ package com.miaxis.school.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.school.domain.SchoolInfo;
-import com.miaxis.wx.service.impl.WxGzhServiceImpl;
+import com.miaxis.wx.dto.QueryParams;
 
 import java.util.List;
 
@@ -21,5 +21,5 @@ public interface SchoolInfoMapper extends BaseMapper<SchoolInfo> {
      */
     public List<SchoolInfo> selectSchoolInfoList(SchoolInfo schoolInfo);
 
-    List<String> queryNames(WxGzhServiceImpl.QueryParams queryParams);
+    List<String> queryNames(QueryParams queryParams);
 }

twzd-service/src/main/java/com/miaxis/wx/dto/QueryParams.java

@@ -0,0 +1,12 @@
+package com.miaxis.wx.dto;
+
+import lombok.Data;
+
+@Data
+public class QueryParams {
+    String choseColumName;
+    String conditionColumName1;
+    String value1;
+    String conditionColumName2;
+    String value2;
+}

twzd-service/src/main/java/com/miaxis/wx/service/impl/WxGzhServiceImpl.java

@@ -12,12 +12,12 @@ import com.miaxis.school.mapper.SchoolInfoMapper;
 import com.miaxis.system.service.ISysUserService;
 import com.miaxis.user.service.IUserInfoService;
 import com.miaxis.wx.domain.WxForeverCode;
+import com.miaxis.wx.dto.QueryParams;
 import com.miaxis.wx.mapper.WxMenuMapper;
 import com.miaxis.wx.service.IWxForeverCodeService;
 import com.miaxis.wx.service.IWxGzhService;
 import com.miaxis.wx.service.IWxMessageEvenService;
 import com.qcloud.cos.COSClient;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
@@ -166,13 +166,14 @@ public class WxGzhServiceImpl implements IWxGzhService {
                     //存在Ticket为扫码关注
                     if (org.apache.commons.lang3.StringUtils.isNotEmpty(jsonObjectData.getStr("Ticket"))){
                         log.info("3.1.2..");
+                        //根据Ticket  绑定信息到上级用户
+                        String subscribeEvent = wxMessageEvenService.scanSubscribeEvent(fromUserName, jsonObjectData.getStr("EventKey"),this.getGzhToken(),userInfo.getNickName());
                         //根据父级销售类型更新当前用户类型
-                        UserInfo parentUserInfo = userService.getStudentByOpenId(fromUserName);
+                        String parentOpenid = jsonObjectData.getStr("EventKey").substring(8);
+                        UserInfo parentUserInfo = userService.getStudentByOpenId(parentOpenid);
                         if (parentUserInfo != null && (parentUserInfo.getSaleType() ==1 || parentUserInfo.getSaleType() ==3 )){
                             userInfo.setSaleType(1);
                         }
-                        //根据Ticket  绑定信息到上级用户
-                        String subscribeEvent = wxMessageEvenService.scanSubscribeEvent(fromUserName, jsonObjectData.getStr("EventKey"),this.getGzhToken(),userInfo.getNickName());
                         result =  MessageUtil.initText(fromUserName,toUserName,subscribeEvent);
 
                     }else {
@@ -328,14 +329,6 @@ public class WxGzhServiceImpl implements IWxGzhService {
     }
 
 
-    @Data
-    public class QueryParams {
-        String choseColumName;
-        String conditionColumName1;
-        String value1;
-        String conditionColumName2;
-        String value2;
-    }
 
 
 }