增加广中医相关页面,并限制转发出去连接要跳到首页访问

apply-net/src/main/java/com/winsun/controller/DankuanController.java

@@ -13,7 +13,6 @@ import com.winsun.utils.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.config.RequestConfig;

apply-net/src/main/java/com/winsun/controller/YxtCardController.java

@@ -82,7 +82,7 @@ public class YxtCardController extends BaseController {
         String requestURL = request.getContextPath();
         log.info(requestURL);
         String redirect_uri="http://167460x6b0.51mypc.cn/ciop/forgerpw/callBackLogin";
-        String redirect_uri2 = "http://192.168.1.165:3000/#/yxt/pay?userId=6399";
+        String redirect_uri2 = "http://167460x6b0.51mypc.cn/dist/#/yxt/pay?userId=6399";
         String url = "https://open.weixin.qq.com/connect/oauth2/authorize?";
         url += "appid=" + WxConfig.APPID;
         url += "&redirect_uri=" + URLEncoder.encode(redirect_uri2, "UTF-8");//此处和微信回调用的域名相同

common/src/main/java/com/winsun/bean/School.java

 package com.winsun.bean;
 
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
 import lombok.Data;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
 
 /**
- * 学校信息
+ * < >
+ * @Author  pxl
+ * @Date 2020-05-27 
  */
+
 @Data
-@TableName("hhr_school")
+@TableName ("hhr_school")
 public class School implements Serializable {
 
-    private static final long serialVersionUID = 6881513580528426846L;
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private int id;
+	private static final long serialVersionUID =  6941854875917339515L;
 
+   	@TableId(value = "id" ,type = IdType.AUTO)
+	private Integer id;
 
 	/**
-     *县分
+	 * 县分
 	 */
-    @TableField("sub_name")
+   	@TableField("sub_name" )
 	private String subName;
 
 	/**
 	 * 学校
 	 */
-    @TableField("school_name")
+   	@TableField("school_name" )
 	private String schoolName;
 
 	/**
 	 * 是否禁用（0禁用；1使用）
 	 */
-    private int status;
+   	@TableField("status" )
+	private Integer status;
 
 	/**
 	 * 二维码扫码后默认办理套餐
 	 */
-    @TableField(value = "defaultPackage")
-    private int defaultPackage;
+   	@TableField("defaultPackage" )
+	private Integer defaultPackage;
 
 	/**
 	 * 学校对应客服的二维码地址
 	 */
+   	@TableField("service_qrcode" )
 	private String serviceQrcode;
 
 	/**
 	 * 揽装工号
 	 */
+   	@TableField("lzgh" )
 	private String lzgh;
 
 	/**
 	 * 网点id
 	 */
+   	@TableField("net_id" )
 	private String netId;
 
 	/**
 	 * 宽带速率
 	 */
+   	@TableField("kdsl" )
 	private String kdsl;
 
 	/**
 	 * 1包月2包年3包月包年
 	 */
+   	@TableField("fee_type" )
 	private String feeType;
 
 	/**
 	 * 生成二维码的url
 	 */
+   	@TableField("url" )
 	private String url;
 
 	/**
 	 * 是否新装融合(0:否 1:是)
 	 */
-    private int netType;
+   	@TableField("net_type" )
+	private Integer netType;
 
 	/**
 	 * 是否收到电信卡，0：否，1:是
 	 */
-    private int isRecv;
+   	@TableField("is_recv" )
+	private Integer isRecv;
 
 	/**
 	 * 是否显示0息购机0：否，1:是
 	 */
-    private int netPhone;
+   	@TableField("net_phone" )
+	private Integer netPhone;
 
 	/**
 	 * 单宽id
 	 */
+   	@TableField("bandproduct_id" )
 	private String bandproductId;
 
 	/**
 	 * 显示宽带
 	 */
+   	@TableField("is_showband" )
 	private String isShowband;
 
 	/**
 	 * 是否显示融合
 	 */
+   	@TableField("is_showrh" )
 	private String isShowrh;
+
+	/**
+	 * 是否显示毕业生融合办理
+	 */
+   	@TableField("bysrh" )
+	private String bysrh;
+
 	/**
 	 * 网点编码
 	 */
+   	@TableField("network_code" )
 	private String networkCode;
+
 	/**
 	 * 网点名称
 	 */
+   	@TableField("network_name" )
 	private String networkName;
+
 }

new-user/src/main/java/com/winsun/controller/StartSelectController.java

@@ -22,7 +22,8 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -54,21 +55,27 @@ public class StartSelectController {
     @Autowired
     private OrderMapper orderMapper;
     @Autowired
+    private AppMapper appMapper;
+    @Autowired
     private OrderHistoryMapper historyMapper;
     @Autowired
     private UniversityInfoMapper universityInfoMapper;
+    @Autowired
+    @Qualifier("redisStringTemplate")
+    private RedisTemplate redisTemplate;
 
-    @RequestMapping("/findStartData")
-    public ResponseData<Map<String, Object>> findStartData(@RequestParam("id") String id){
-        if (StringUtils.isEmpty(id)){
-            return ResponseData.error("请输入合伙人id");
-        }
-        List<Map<String, Object>> mapList = schoolMapper.getuserToSchool(id);
-        if (CollectionUtils.isEmpty(mapList)){
-            return ResponseData.error("没有查询相关的合伙人id的信息");
+    /**
+     * 查询学校信息
+     */
+    @RequestMapping(value = "findStartData", method = RequestMethod.POST)
+    public ResponseData<School> selectSchoolInfo(@RequestParam("id") String id) {
+
+        UserSchool userSchool = userSchoolMapper.selectById(id);
+        if(userSchool != null){
+            School school = schoolMapper.selectById(userSchool.getSchoolId());
+            return ResponseData.success(school);
         }
-        Map<String, Object> map = mapList.get(0);
-        return ResponseData.success(map);
+        return ResponseData.error("没有查询相关的合伙人id的信息！！！");
     }
 
     /**