Commit 9d0a4c07 by 黄森林

app开发

parent c3c5636f
...@@ -184,6 +184,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -184,6 +184,7 @@ public class PackageUpgradeController extends BaseController {
, @RequestParam(value = "userSchool", required = false) String userSchool) { , @RequestParam(value = "userSchool", required = false) String userSchool) {
Wrapper<Order> wrapper = new EntityWrapper(); Wrapper<Order> wrapper = new EntityWrapper();
wrapper.eq("hehuoren_id",partner);
wrapper.eq("business_number",businessNumber); wrapper.eq("business_number",businessNumber);
wrapper.eq("user_type",UserType.OLDCUSTOMER.getId()); wrapper.eq("user_type",UserType.OLDCUSTOMER.getId());
List<Order> orders = orderMapper.selectList(wrapper); List<Order> orders = orderMapper.selectList(wrapper);
...@@ -271,6 +272,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -271,6 +272,7 @@ public class PackageUpgradeController extends BaseController {
String school = packageUpgradeMapper.selectShoolByUserId(partner); String school = packageUpgradeMapper.selectShoolByUserId(partner);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("school",school); map.put("school",school);
map.put("substName",sysUser.getSubstName());
map.put("name",sysUser.getName()); map.put("name",sysUser.getName());
map.put("id",sysUser.getId()); map.put("id",sysUser.getId());
map.put("account",sysUser.getAccount()); map.put("account",sysUser.getAccount());
......
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.util.Date;
@TableName("sys_user")
@Data
public class SysUser {
/**
* 主键
*/
@TableId(type = IdType.AUTO)
private String id;
/**
* 头像
*/
private String avatar;
/**
* 账号
*/
private String account;
/**
* 密码
*/
private String password;
/**
* md5密码盐
*/
private String salt;
/**
* 名字
*/
private String name;
/**
* 生日
*/
private String birthday;
/**
* 性别(1:男 2:女)
*/
private String sex;
/**
* 电子邮件
*/
private String email;
/**
* 电话
*/
private String phone;
/**
* 角色id
*/
private String roleid;
/**
* 部门id
*/
private String deptid;
/**
* 状态(1:启用 2:冻结 3:删除)
*/
private String status;
/**
* 创建时间
*/
private Date createtime;
/**
* 保留字段
*/
private String version;
/**
* 工号
*/
private String staffId;
/**
* 渠道大类
*/
@TableField(value = "channelType")
private String channelType;
/**
* 揽装工号
*/
@TableField(value = "salestaffId")
private String salestaffId;
/**
* 县分
*/
@TableField(value = "substName")
private String substName;
/**
* 营服
*/
@TableField(value = "branchName")
private String branchName;
/**
* 渠道
*/
@TableField(value = "subType")
private String subType;
/**
* 创建时间
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
* 归属机构id
*/
@TableField(value = "deptidBelong")
private String deptidBelong;
}
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.SysUser;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
/**
* 用户表的Mapper
*/
@Mapper
@Component
public interface SysUserMapper extends BaseMapper<SysUser> {
}
package com.winsun.utils;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.Hashtable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static org.apache.commons.lang.StringUtils.isNumeric;
/**
* 身份证校验
* @Author: chancy
* @Date: 2020/3/2 13:03
*/
public class IDCardUtil {
/**
* 功能:身份证的有效验证
*
* @param iDStr 身份证号
* @return true 有效:false 无效
*/
public static boolean IDCardValidate(String iDStr) {
Pattern p = Pattern.compile("(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)");
String[] ValCodeArr = {"1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"};
String[] Wi = {"7", "9", "10", "5", "8", "4", "2", "1", "6", "3", "7", "9", "10", "5", "8", "4", "2"};
String Ai = "";
Matcher idc = p.matcher(iDStr);
if (idc.matches()){
if (iDStr.length() == 18)
{
Ai = iDStr.substring(0, 17);
}
// ================ 出生年月是否有效 ================
String strYear = Ai.substring(6, 10);// 年份
String strMonth = Ai.substring(10, 12);// 月份
String strDay = Ai.substring(12, 14);// 日
if (isDate(strYear + "-" + strMonth + "-" + strDay) == false)
{
// errorInfo = "身份证生日无效。";
return false;
}
//15位身份证日期验证
if(false){
}
GregorianCalendar gc = new GregorianCalendar();
SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
try
{
if ((gc.get(Calendar.YEAR) - Integer.parseInt(strYear)) > 150 || (gc.getTime().getTime() - s.parse(strYear + "-" + strMonth + "-" + strDay).getTime()) < 0)
{
//errorInfo = "身份证生日不在有效范围。";
return false;
}
} catch (NumberFormatException e)
{
e.printStackTrace();
} catch (java.text.ParseException e)
{
e.printStackTrace();
}
if (Integer.parseInt(strMonth) > 12 || Integer.parseInt(strMonth) == 0)
{
//errorInfo = "身份证月份无效";
return false;
}
if (Integer.parseInt(strDay) > 31 || Integer.parseInt(strDay) == 0)
{
//errorInfo = "身份证日期无效";
return false;
}
Hashtable h = GetAreaCode();
if (h.get(Ai.substring(0, 2)) == null)
{
//errorInfo = "身份证地区编码错误。";
return false;
}
int TotalmulAiWi = 0;
for (int i = 0; i < 17; i++)
{
TotalmulAiWi = TotalmulAiWi + Integer.parseInt(String.valueOf(Ai.charAt(i))) * Integer.parseInt(Wi[i]);
}
int modValue = TotalmulAiWi % 11;
String strVerifyCode = ValCodeArr[modValue];
Ai = Ai + strVerifyCode;
if (iDStr.length() == 18)
{
if (Ai.equals(iDStr) == false)
{
//errorInfo = "身份证无效,不是合法的身份证号码";
return false;
}
} else
{
return true;
}
}else {
return false;
}
return false;
}
/**
* 功能:判断字符串是否为日期格式
*
* @param strDate
* @return
*/
public static boolean isDate(String strDate)
{
Pattern pattern = Pattern.compile("^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$");
Matcher m = pattern.matcher(strDate);
return m.matches();
}
/**
* 功能:设置地区编码
*
* @return Hashtable 对象
*/
@SuppressWarnings("unchecked")
private static Hashtable GetAreaCode()
{
Hashtable hashtable = new Hashtable();
hashtable.put("11", "北京");
hashtable.put("12", "天津");
hashtable.put("13", "河北");
hashtable.put("14", "山西");
hashtable.put("15", "内蒙古");
hashtable.put("21", "辽宁");
hashtable.put("22", "吉林");
hashtable.put("23", "黑龙江");
hashtable.put("31", "上海");
hashtable.put("32", "江苏");
hashtable.put("33", "浙江");
hashtable.put("34", "安徽");
hashtable.put("35", "福建");
hashtable.put("36", "江西");
hashtable.put("37", "山东");
hashtable.put("41", "河南");
hashtable.put("42", "湖北");
hashtable.put("43", "湖南");
hashtable.put("44", "广东");
hashtable.put("45", "广西");
hashtable.put("46", "海南");
hashtable.put("50", "重庆");
hashtable.put("51", "四川");
hashtable.put("52", "贵州");
hashtable.put("53", "云南");
hashtable.put("54", "西藏");
hashtable.put("61", "陕西");
hashtable.put("62", "甘肃");
hashtable.put("63", "青海");
hashtable.put("64", "宁夏");
hashtable.put("65", "新疆");
hashtable.put("71", "台湾");
hashtable.put("81", "香港");
hashtable.put("82", "澳门");
hashtable.put("91", "国外");
return hashtable;
}
}
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