Skip to content

G
gdtel-gztel-school-center
Commit de6e81d3 by 彭祥礼
Options

新增学生号清单号验证和所有学生清单验证

parent e5f9f155
Showing with 236 additions and 32 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -178,13 +178,13 @@ public class DankuanController { ...@@ -178,13 +178,13 @@ public class DankuanController {
} }
orderView.setCustomerId("xyzxyql"); orderView.setCustomerId("xyzxyql");
orderView.setOrderCustomerType("学生"); orderView.setOrderCustomerType("学生");
Integer insert = orderViewMapper.insert(orderView);
if (webOrderAmount.equals("0")) { if (webOrderAmount.equals("0")) {
ResponseData<OrderView> res = createOrder(orderView, partner, orderSeq); ResponseData<OrderView> res = createOrder(orderView, partner, orderSeq);
if (!res.isSuccess()) { if (!res.isSuccess()) {
return res; return res;
} }
} }
Integer insert = orderViewMapper.insert(orderView);
if (insert == 1) { if (insert == 1) {
orderV.setOrderId(orderView.getOrderId()); orderV.setOrderId(orderView.getOrderId());
orderV.setOrderSeq(orderView.getOrderSeq()); orderV.setOrderSeq(orderView.getOrderSeq());
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
...@@ -175,13 +175,13 @@ public class RongHeController { ...@@ -175,13 +175,13 @@ public class RongHeController {
orderView.setCustomerId("xyzxyql"); // 接入商 orderView.setCustomerId("xyzxyql"); // 接入商
orderView.setOrderCustomerType("学生"); // 用户类别 orderView.setOrderCustomerType("学生"); // 用户类别
Integer insert = orderViewMapper.insert(orderView);
if (webOrderAmount.equals("0")) { if (webOrderAmount.equals("0")) {
ResponseData<OrderView> res = createOrder(productId,orderView, partner, orderSeq); ResponseData<OrderView> res = createOrder(productId,orderView, partner, orderSeq);
if (!res.isSuccess()) { if (!res.isSuccess()) {
return res; return res;
} }
} }
Integer insert = orderViewMapper.insert(orderView);
if (insert == 1) { if (insert == 1) {
Wrapper<OrderView> ovWrapper = new EntityWrapper<>(); Wrapper<OrderView> ovWrapper = new EntityWrapper<>();
ovWrapper.eq(StringUtils.isNotBlank(orderNumber), "orderNumber", orderNumber); ovWrapper.eq(StringUtils.isNotBlank(orderNumber), "orderNumber", orderNumber);
......
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
package com.winsun.controller; package com.winsun.controller;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.Regular;
import com.winsun.bean.XshInventory;
import com.winsun.mapper.RegularMapper;
import com.winsun.mapper.XshInventoryMapper;
import com.winsun.smsUtils.SendSmsAndMail; import com.winsun.smsUtils.SendSmsAndMail;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -24,7 +28,10 @@ import java.util.concurrent.TimeUnit; ...@@ -24,7 +28,10 @@ import java.util.concurrent.TimeUnit;
@RestController @RestController
@RequestMapping("/codesManager") @RequestMapping("/codesManager")
public class codeManagerController { public class codeManagerController {
@Autowired
private RegularMapper regularMapper;
@Autowired
private XshInventoryMapper xshInventoryMapper;
@Autowired @Autowired
@Qualifier("redisStringTemplate") @Qualifier("redisStringTemplate")
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
...@@ -61,4 +68,28 @@ public class codeManagerController { ...@@ -61,4 +68,28 @@ public class codeManagerController {
return ResponseData.error( "验证码错误" ); return ResponseData.error( "验证码错误" );
} }
/**
* @param regularId 正则id
* @return
*/
@RequestMapping(value = "getRegularById", method = RequestMethod.POST)
@ResponseBody
public ResponseData<Object> getRegularById(String regularId) {
Regular regulars = regularMapper.selectById(regularId);
return ResponseData.success(regulars, "查询成功！");
}
//检查学生证号是否在学生清单内
@ResponseBody
@RequestMapping(value="queryStuNo", method = RequestMethod.POST)
public ResponseData<Object> queryStuNo(String stuNumber){
if(StringUtils.isEmpty(stuNumber)){
return ResponseData.error("学生号不能为空");
}
XshInventory xshQd = xshInventoryMapper.selectById(stuNumber);
if(xshQd == null){
return ResponseData.error("学生号不在清单内！");
}
return ResponseData.success();
}
} }
common/src/main/java/com/winsun/bean/Constant.java
...@@ -27,7 +27,7 @@ public class Constant { ...@@ -27,7 +27,7 @@ public class Constant {
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
// public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号 // public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号
// public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key // public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://ismartbak.mini189.cn/api/"; //智能平台提供的正式key public final static String ZHANGSHIURL = "https://ismart.mini189.cn/api/"; //智能平台提供的正式key
public final static String PRODUCTCATEGORY = "单宽带"; //只能平台提供的key public final static String PRODUCTCATEGORY = "单宽带"; //只能平台提供的key
// public final static String TOMCATURL = "http://183.57.78.132:8080"; //Linux外网服务器地址 // public final static String TOMCATURL = "http://183.57.78.132:8080"; //Linux外网服务器地址
// public final static String INTRANETURL = "http://10.3.1.21:8080"; //Linux内网服务器地址 // public final static String INTRANETURL = "http://10.3.1.21:8080"; //Linux内网服务器地址
......
common/src/main/java/com/winsun/bean/Product.java
...@@ -83,7 +83,7 @@ public class Product implements Serializable { ...@@ -83,7 +83,7 @@ public class Product implements Serializable {
private String identifying; private String identifying;
/** /**
* 预留字段2 * 融合资费介绍
*/ */
private String productRf2; private String productRf2;
...@@ -105,6 +105,9 @@ public class Product implements Serializable { ...@@ -105,6 +105,9 @@ public class Product implements Serializable {
* 包年包月情况 * 包年包月情况
*/ */
private String productRate; private String productRate;
/**
* 资费正则Id
*/
private String productIntroductionPic2; private String productIntroductionPic2;
private String productIntroductionPic3; private String productIntroductionPic3;
private String productIntroductionPic4; private String productIntroductionPic4;
......
common/src/main/java/com/winsun/bean/Regular.java
...@@ -18,8 +18,8 @@ public class Regular implements Serializable { ...@@ -18,8 +18,8 @@ public class Regular implements Serializable {
/** /**
* 主键 * 主键
*/ */
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "regular_id", type = IdType.AUTO)
private int id; private int regularId;
/** /**
* *
*/ */
...@@ -38,12 +38,12 @@ public class Regular implements Serializable { ...@@ -38,12 +38,12 @@ public class Regular implements Serializable {
/** /**
* *
*/ */
@TableField(value = "name") @TableField(value = "regular_name")
private String name; private String regularName;
/** /**
* *
*/ */
@TableField(value = "is_Show") @TableField(value = "is_show")
private String isShow; private String isShow;
} }
common/src/main/java/com/winsun/bean/StudentLists.java 0 → 100644
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 java.io.Serializable;
/**
* 所有学生存量表
*/
@Data
@TableName("hhr_check_student_list")
public class StudentLists implements Serializable {
private static final long serialVersionUID = -120275652239590613L;
/**
*
*/
@TableId(value = "id", type = IdType.AUTO)
private int id;
/**
*
*/
private String name;
/**
*
*/
private String phone;
/**
*
*/
@TableField(value = "id_card")
private String idCard;
}
common/src/main/java/com/winsun/bean/XshInventory.java 0 → 100644
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 java.io.Serializable;
/**
* 学生号清单表
*/
@Data
@TableName("hhr_check_xsh")
public class XshInventory implements Serializable {
private static final long serialVersionUID = -8840697484855100734L;
/**
*
*/
@TableId(value = "id", type = IdType.AUTO)
private int id;
/**
*
*/
@TableField(value = "student_num")
private String studentNum;
/**
*
*/
@TableField(value = "school_id")
private String schoolId;
}
common/src/main/java/com/winsun/mapper/StudentListMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.StudentLists;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface StudentListMapper extends BaseMapper<StudentLists> {
}
common/src/main/java/com/winsun/mapper/XshInventoryMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.XshInventory;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
/**
* 学生号清单表
*/
@Mapper
@Component
public interface XshInventoryMapper extends BaseMapper<XshInventory> {
}
old-user/src/main/java/com/winsun/controller/ChooseController.java
...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper; ...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.Order; import com.winsun.bean.Order;
import com.winsun.bean.School; import com.winsun.bean.School;
import com.winsun.bean.StudentLists;
import com.winsun.bean.SysUser; import com.winsun.bean.SysUser;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.utils.MyBatisPlusUpdateUtils; import com.winsun.utils.MyBatisPlusUpdateUtils;
...@@ -16,15 +17,10 @@ import org.apache.commons.lang3.StringUtils; ...@@ -16,15 +17,10 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date; import java.text.SimpleDateFormat;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
/** /**
* 首页同用接口 * 首页同用接口
...@@ -38,7 +34,7 @@ import java.util.Map; ...@@ -38,7 +34,7 @@ import java.util.Map;
public class ChooseController { public class ChooseController {
private static AppMapper appMapper; private static AppMapper appMapper;
private static StudentListMapper stuListMapper;
private static PackageMapper packageMapper; private static PackageMapper packageMapper;
private static SchoolMapper schoolMapper; private static SchoolMapper schoolMapper;
...@@ -53,12 +49,13 @@ public class ChooseController { ...@@ -53,12 +49,13 @@ public class ChooseController {
@Autowired @Autowired
public ChooseController(AppMapper appMapper, PackageMapper packageMapper,SchoolMapper schoolMapper, OrderMapper orderMapper public ChooseController(AppMapper appMapper, PackageMapper packageMapper,SchoolMapper schoolMapper, OrderMapper orderMapper
, SysUserMapper userMapper) { , SysUserMapper userMapper,StudentListMapper stuListMapper) {
ChooseController.appMapper = appMapper; ChooseController.appMapper = appMapper;
ChooseController.packageMapper = packageMapper; ChooseController.packageMapper = packageMapper;
ChooseController.schoolMapper = schoolMapper; ChooseController.schoolMapper = schoolMapper;
ChooseController.orderMapper = orderMapper; ChooseController.orderMapper = orderMapper;
ChooseController.userMapper = userMapper; ChooseController.userMapper = userMapper;
ChooseController.stuListMapper = stuListMapper;
} }
...@@ -152,4 +149,85 @@ public class ChooseController { ...@@ -152,4 +149,85 @@ public class ChooseController {
} }
}); });
} }
//进入三大权益先查一个表 hhr_check_student_list（这个表临时建的）
//若hhr_check_student_list表存在 就查订单表
//订单表若存在直接下一步
//若不存在就插入订单
//若hhr_check_student_list表不存在直接下一步
@RequestMapping(value = "/findStuentByIdCard")
@ResponseBody
public ResponseData<Object> findStuentByIdCard(String idcard, String hhrId) {
Wrapper<StudentLists> stuListWrapper = new EntityWrapper<>();
if(idcard.length()==11){
stuListWrapper.eq("phone",idcard);
}else{
stuListWrapper.eq("id_card",idcard);
}
List<StudentLists> lists = stuListMapper.selectList(stuListWrapper);
log.info("------查询hhr_check_student_list有否能找到数据-----");
//若hhr_check_student_list表存在 就查订单表
if(lists.size()>0){
StudentLists studentList = lists.get(0);
log.info("------查询订单表有否能找到数据-----");
Wrapper<Order> orderWrapper = new EntityWrapper<>();
orderWrapper.eq("user_type",'7');
if(idcard.length()==11){
//user_type=7 and (`contact_number` = ? or `id_card` = ?)
orderWrapper.eq("contact_number",idcard);
}else{
orderWrapper.eq("id_card",idcard);
}
List<Order> orderList = orderMapper.selectList(orderWrapper);
//若订单表不存在就插入订单
if(orderList.size()==0){
log.info("------订单表示查找到数据，插入一条新订单-------");
//插入订单
Order order = new Order();
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
uuid = uuid.substring(1, 12);
order.setId(uuid);
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");//设置日期格式
String orderNumber = "YRYM" + df.format(new Date()) + (int) ((Math.random() * 9 + 1) * 100000);
order.setOrderNumber(orderNumber);
order.setOrderStatus("待处理");
order.setHehuorenId(hhrId);
order.setCustomerName(studentList.getName());
order.setContactNumber(studentList.getPhone());
order.setIdCard(studentList.getIdCard());
order.setKapin("三大权益");
order.setUserType("7");
SysUser sysUser = userMapper.selectById(hhrId);
String schoolId = appMapper.selectSchoolId(hhrId);
School school = schoolMapper.selectById(schoolId);
if(sysUser != null && school != null) {
order.setHehuorenArea(sysUser.getSubstName());
order.setHehuorenName(sysUser.getName());
order.setHehuorenPhone(sysUser.getPhone());
order.setHehuorenSchool( school.getSchoolName());
order.setLzgh(school.getLzgh());
}
List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);
SysUser user = userMapper.selectById(userId1.get(0));
if(user != null) {
order.setSupervisorName(user.getName());
}
order.setCreateTime(new Date());
try {
orderMapper.insert(order);
}catch (Exception e) {
log.error("新用户提交异常:", e);
return ResponseData.error("新用户提交打败");
}
log.info("------order表新插入数据成功！！订单号："+orderNumber);
}else{
log.info("------订单表数据："+orderList.get(0));
}
}
return ResponseData.success();
}
} }
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -86,27 +86,20 @@ public class PackageUpgradeController extends BaseController { ...@@ -86,27 +86,20 @@ public class PackageUpgradeController extends BaseController {
if (selectOrder.contains("@")) { if (selectOrder.contains("@")) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr2", selectOrder); wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr2", selectOrder);
} }
if (selectOrder.length() == 18) {
if (!IDCardUtil.IDCardValidate(selectOrder)) {
return ResponseData.error("您的身份证输入有误，请重新输入！");
}
wrapper.like("social_id", selectOrder.substring(5, 18), SqlLike.LEFT);
}
if (selectOrder.length() == 11) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
}
Wrapper<QueryBys> queryBysWrapper = new EntityWrapper<>(); Wrapper<QueryBys> queryBysWrapper = new EntityWrapper<>();
Map<String, Object> objMap = new HashMap();
if (selectOrder.length() == 18) { if (selectOrder.length() == 18) {
if (!IDCardUtil.IDCardValidate(selectOrder)) { if (!IDCardUtil.IDCardValidate(selectOrder)) {
return ResponseData.error("您的身份证输入有误，请重新输入！"); return ResponseData.error("您的身份证输入有误，请重新输入！");
} }
wrapper.like("social_id", selectOrder.substring(5, 18), SqlLike.LEFT);
queryBysWrapper.eq(StringUtils.isNotBlank(selectOrder), "id_card", selectOrder); queryBysWrapper.eq(StringUtils.isNotBlank(selectOrder), "id_card", selectOrder);
} }
if (selectOrder.length() == 11) { if (selectOrder.length() == 11) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
queryBysWrapper.eq(StringUtils.isNotBlank(selectOrder), "phone", selectOrder); queryBysWrapper.eq(StringUtils.isNotBlank(selectOrder), "phone", selectOrder);
} }
Map<String, Object> objMap = new HashMap();
//查找毕业生清单表 //查找毕业生清单表
List<Map<String, Object>> queryBys = queryBysMapper.selectMaps(queryBysWrapper); List<Map<String, Object>> queryBys = queryBysMapper.selectMaps(queryBysWrapper);
if (queryBys.size() > 0) { if (queryBys.size() > 0) {
...@@ -128,7 +121,8 @@ public class PackageUpgradeController extends BaseController { ...@@ -128,7 +121,8 @@ public class PackageUpgradeController extends BaseController {
objMap.put("data", packageUpgrade); objMap.put("data", packageUpgrade);
}else { }else {
//不是存量 跳转到三大权益 //不是存量 跳转到三大权益
return ResponseData.error("当前查询条件未查出套餐升级数据，如有疑问请联系客服！"); objMap.put("isStock", false);
return ResponseData.success(objMap,"当前查询条件未查出套餐升级数据，如有疑问请联系客服！");
} }
String s = String.valueOf((int) ((Math.random() * 9 + 1) * 100000)); String s = String.valueOf((int) ((Math.random() * 9 + 1) * 100000));
log.info("验证码:" + s); log.info("验证码:" + s);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment