Skip to content

G
gdtel-gztel-school-center
Commit ba9eda5f by 黄森林
Options

app开发

parent f76410fe
Showing with 285 additions and 59 deletions
apply-net/src/main/java/com/winsun/controller/PackageNewClothes.java 0 → 100644
package com.winsun.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.Order;
import com.winsun.bean.Package;
import com.winsun.bean.SysUser;
import com.winsun.constant.OrderStatus;
import com.winsun.constant.UserType;
import com.winsun.mapper.*;
import com.winsun.utils.IDCardUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import static org.apache.commons.lang.StringUtils.isNumeric;
@Slf4j
@RestController
@RequestMapping("/packageNewClothes")
public class PackageNewClothes {
private static PackageUpgradeMapper packageUpgradeMapper;
private static PackageMapper packageMapper;
private static OrderMapper orderMapper;
private static SysUserMapper userMapper;
@Autowired
public PackageNewClothes(PackageUpgradeMapper packageUpgradeMapper, PackageMapper packageMapper, OrderMapper orderMapper
, SysUserMapper userMapper) {
PackageNewClothes.packageUpgradeMapper = packageUpgradeMapper;
PackageNewClothes.packageMapper = packageMapper;
PackageNewClothes.orderMapper = orderMapper;
PackageNewClothes.userMapper = userMapper;
}
/**
* 查询学校适用套餐
*
* @param partner
* @return
*/
@RequestMapping(value = "selectSchoolPackage", method = RequestMethod.POST)
public ResponseData<List<Package>> selectSchoolPackage(@RequestParam("partner") String partner) {
String schoolId = packageUpgradeMapper.selectSchoolId(partner);
List<String> packageIds = packageUpgradeMapper.selectPackageId(schoolId);
List<Package> packages = new ArrayList<>();
packageIds.forEach(packageId -> {
Package package1 = packageMapper.selectById(packageId);
packages.add(package1);
});
return ResponseData.success(packages);
}
/**
* 查询套餐详情
*
* @param packageId
* @return
*/
@RequestMapping(value = "selectPackageInfo", method = RequestMethod.POST)
public ResponseData<Package> selectPackageInfo(@RequestParam("packageId") String packageId) {
return ResponseData.success(packageMapper.selectById(packageId));
}
/**
* 身份证验证
*
* @param iDCard
* @return
*/
@RequestMapping(value = "iDCard", method = RequestMethod.POST)
public ResponseData<String> iDCard(@RequestParam("iDCard") String iDCard) {
if (!IDCardUtil.IDCardValidate(iDCard)) {
return ResponseData.error("身份证输入错误！");
}
Integer i = Integer.parseInt(iDCard.substring(6, 10));
DateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd");
Date date = new Date();
Integer format = Integer.parseInt(yyyyMMdd.format(date.getTime()));
Integer time16 = Integer.parseInt(String.valueOf(i + 16) + iDCard.substring(10, 14));
Integer time25 = Integer.parseInt(String.valueOf(i + 25) + iDCard.substring(10, 14)) ;
if(format<time16 ){
return ResponseData.error("根据工信部要求,未满16周岁的用户,应由法定代理人代为办理线上入网,如有疑问请联系客服,谢谢。");
}
if( format > time25){
return ResponseData.error("您已满25周岁,不符合办理条件,如有疑问请联系客服,谢谢。");
}
return ResponseData.success("身份证输入正确。");
}
/**
* 天翼学生证
*
* @param site 地址
* @param kapin 套餐名
* @param idCardz
* @param idCardf
* @param idCardzs
* @param remarks 备注
* @param studentNumber 学号
* @param classNumber 班级
* @param parentName 家长姓名
* @param contactNumber 家长电话
* @param cardId 套餐ID
* @param customerName 学生姓名
* @param partner 用户ID
* @param idCard 家长身份证
* @param userSchool 学校
* @return
*/
@RequestMapping(value = "skywingCard", method = RequestMethod.POST)
public ResponseData<String> SkywingCard(@RequestParam("contactNumber") String contactNumber, @RequestParam("site") String site
, @RequestParam("classNumber") String classNumber, @RequestParam("cardId") String cardId
, @RequestParam("customerName") String customerName, @RequestParam("partner") String partner
, @RequestParam(value = "idCardzs") String idCardzs, @RequestParam(value = "idCardz") String idCardz
, @RequestParam(value = "parentName") String parentName, @RequestParam(value = "idCardf") String idCardf
, @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "studentNumber") String studentNumber
, @RequestParam(value = "userSchool") String userSchool) {
Calendar instance = Calendar.getInstance();
instance.add(Calendar.DATE, -94);
Date time = instance.getTime();
Wrapper<Order> wrapper = new EntityWrapper();
wrapper.eq("hehuoren_id", partner);
wrapper.gt("create_time", time);
wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName());
wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
List<Order> orders = orderMapper.selectList(wrapper);
if (orders.size() != 0) {
return ResponseData.error("");
}
SysUser sysUser = userMapper.selectById(partner);
Order order = new Order();
String id = UUID.randomUUID().toString();
order.setId(id);
order.setIdCard(idCard);
order.setOrderStatus("待处理");
order.setHehuorenId(partner);
order.setSite(site);
order.setKapin(kapin);
order.setPackageId(cardId);
order.setCustomerName(customerName);
order.setContactNumber(contactNumber);
order.setIdCardzs(idCardzs);
order.setIdCardz(idCardz);
order.setIdCardf(idCardf);
order.setRemarks(remarks);
order.setClassNumber(classNumber);
order.setParentName(parentName);
order.setStudentNumber(studentNumber);
Date date = new Date();
order.setCreateTime(date);
order.setUserType(UserType.NEWCUSTOMER.getId());
order.setTjType(0);
SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd");
String format = yyyyMMdd.format(date);
String s = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
order.setOrderNumber("YRYM" + format + s);
order.setHehuorenArea(sysUser.getSubstName());
order.setHehuorenName(sysUser.getName());
String schoolId = packageUpgradeMapper.selectSchoolId(partner);
String schoolName = packageUpgradeMapper.selectSchoolById(schoolId);
order.setHehuorenSchool(schoolName);
order.setHehuorenPhone(sysUser.getPhone());
Integer insert = orderMapper.insert(order);
// MessageUtil.sent(contactNumber,"4","");
if (insert == 1) {
packageUpgradeMapper.inserOrderHis(id, "下单成功", date);
return ResponseData.success(id);
}
return ResponseData.error("升级失败！");
}
}
apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -2,7 +2,6 @@ package com.winsun.controller; ...@@ -2,7 +2,6 @@ package com.winsun.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController; import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.SysUser; import com.winsun.bean.SysUser;
...@@ -62,6 +61,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -62,6 +61,7 @@ public class PackageUpgradeController extends BaseController {
/** /**
* 验证码 * 验证码
*
* @param selectOrder * @param selectOrder
* @return * @return
*/ */
...@@ -71,40 +71,56 @@ public class PackageUpgradeController extends BaseController { ...@@ -71,40 +71,56 @@ 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);
List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper); List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper);
String nbr = packageUpgrade.get(0).get("acc_nbr").toString(); String nbr = null;
if (packageUpgrade.size() != 0) {
nbr = packageUpgrade.get(0).get("acc_nbr").toString();
} else {
return ResponseData.error("当前宽带账号有误！");
}
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);
//MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。"); //MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES); redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES);
return ResponseData.success("已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11)+"验证码："+s); return ResponseData.success("已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11) + "验证码：" + s);
} }
if (selectOrder.length() == 18) { if (selectOrder.length() == 18) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "social_id", selectOrder); wrapper.eq(StringUtils.isNotBlank(selectOrder), "social_id", selectOrder);
List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper); List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper);
String nbr = packageUpgrade.get(0).get("acc_nbr").toString(); String nbr = null;
if (packageUpgrade.size() != 0) {
nbr = packageUpgrade.get(0).get("acc_nbr").toString();
} else {
return ResponseData.error("当前身份证号码有误！");
}
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);
//MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。"); //MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES); redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES);
return ResponseData.success("已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11)+"验证码："+s); return ResponseData.success("已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11) + "验证码：" + s);
} }
if (selectOrder.length() == 11) { if (selectOrder.length() == 11) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder); wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper); List<Map<String, Object>> packageUpgrade = packageUpgradeMapper.selectPackage(wrapper);
String nbr = packageUpgrade.get(0).get("acc_nbr").toString(); String nbr = null;
if (packageUpgrade.size() != 0) {
nbr = packageUpgrade.get(0).get("acc_nbr").toString();
} else {
return ResponseData.error("当前手机号码有误！");
}
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);
// MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。"); // MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES); redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES);
return ResponseData.success("已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11)+"验证码："+s); return ResponseData.success("已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11) + "验证码：" + s);
} }
return ResponseData.error("当前查询条件有误！"); return ResponseData.error("当前查询条件有误！");
} }
/** /**
* 查询套餐升级信息 * 查询套餐升级信息
* @param selectOrder *
* @param verificationCode * @param selectOrder 查询的手机号、身份证、宽带账号
* @param verificationCode 验证码
* @return * @return
*/ */
@RequestMapping(value = "selectPackage", method = RequestMethod.POST) @RequestMapping(value = "selectPackage", method = RequestMethod.POST)
...@@ -120,6 +136,9 @@ public class PackageUpgradeController extends BaseController { ...@@ -120,6 +136,9 @@ public class PackageUpgradeController extends BaseController {
List<Package> packages1 = packageMapper.selectList(wrapper1); List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("name", packageUpgrade.get(0).get("wxcl")); wrapper2.eq("name", packageUpgrade.get(0).get("wxcl"));
List<Package> packages2 = packageMapper.selectList(wrapper2); List<Package> packages2 = packageMapper.selectList(wrapper2);
if (packages2.size() == 0) {
return ResponseData.error("您没有升级套餐！");
}
Map<String, Object> map = packageUpgrade.get(0); Map<String, Object> map = packageUpgrade.get(0);
map.remove("social_id"); map.remove("social_id");
map.put("newPackage", packages1.get(0)); map.put("newPackage", packages1.get(0));
...@@ -133,6 +152,9 @@ public class PackageUpgradeController extends BaseController { ...@@ -133,6 +152,9 @@ public class PackageUpgradeController extends BaseController {
List<Package> packages1 = packageMapper.selectList(wrapper1); List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("name", packageUpgrade.get(0).get("wxcl")); wrapper2.eq("name", packageUpgrade.get(0).get("wxcl"));
List<Package> packages2 = packageMapper.selectList(wrapper2); List<Package> packages2 = packageMapper.selectList(wrapper2);
if (packages2.size() == 0) {
return ResponseData.error("您没有升级套餐！");
}
Map<String, Object> map = packageUpgrade.get(0); Map<String, Object> map = packageUpgrade.get(0);
map.put("newPackage", packages1.get(0)); map.put("newPackage", packages1.get(0));
map.put("oldPackage", packages2.get(0)); map.put("oldPackage", packages2.get(0));
...@@ -145,6 +167,9 @@ public class PackageUpgradeController extends BaseController { ...@@ -145,6 +167,9 @@ public class PackageUpgradeController extends BaseController {
List<Package> packages1 = packageMapper.selectList(wrapper1); List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("name", packageUpgrade.get(0).get("wxcl")); wrapper2.eq("name", packageUpgrade.get(0).get("wxcl"));
List<Package> packages2 = packageMapper.selectList(wrapper2); List<Package> packages2 = packageMapper.selectList(wrapper2);
if (packages2.size() == 0) {
return ResponseData.error("您没有升级套餐！");
}
Map<String, Object> map = packageUpgrade.get(0); Map<String, Object> map = packageUpgrade.get(0);
map.put("newPackage", packages1.get(0)); map.put("newPackage", packages1.get(0));
map.put("oldPackage", packages2.get(0)); map.put("oldPackage", packages2.get(0));
...@@ -156,21 +181,23 @@ public class PackageUpgradeController extends BaseController { ...@@ -156,21 +181,23 @@ public class PackageUpgradeController extends BaseController {
/** /**
* 套餐升级 * 套餐升级
* * @param servId
* @param contactNumber * @param contactNumber 联系号码
* @param oldUserId * @param oldUserId
* @param businessNumber * @param businessNumber 办理号码
* @param cardId * @param cardId 套餐ID
* @param customerName * @param customerName 客户姓名
* @param userId * @param userId
* @param nowPackage * @param nowPackage 现有套餐
* @param partner * @param partner 用户ID
* @param businessPackage * @param businessPackage 办理套餐
* @param is_yct * @param is_yct
* @param mark *
* @param addRess * 羊城通
* @param custName * @param mark 羊城通是否办理
* @param userSchool * @param addRess 地址
* @param custName 姓名
* @param userSchool 学校
* @return * @return
*/ */
@RequestMapping(value = "oldUserUpade", method = RequestMethod.POST) @RequestMapping(value = "oldUserUpade", method = RequestMethod.POST)
...@@ -180,15 +207,15 @@ public class PackageUpgradeController extends BaseController { ...@@ -180,15 +207,15 @@ public class PackageUpgradeController extends BaseController {
, @RequestParam("nowPackage") String nowPackage, @RequestParam("partner") String partner , @RequestParam("nowPackage") String nowPackage, @RequestParam("partner") String partner
, @RequestParam("businessPackage") String businessPackage, @RequestParam(value = "is_yct", required = false) String is_yct , @RequestParam("businessPackage") String businessPackage, @RequestParam(value = "is_yct", required = false) String is_yct
, @RequestParam(value = "mark", required = false) String mark, @RequestParam(value = "addRess", required = false) String addRess , @RequestParam(value = "mark", required = false) String mark, @RequestParam(value = "addRess", required = false) String addRess
, @RequestParam(value = "servId") String servId,@RequestParam(value = "custName", required = false) String custName , @RequestParam(value = "servId") String servId, @RequestParam(value = "custName", required = false) String custName
, @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("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);
if(orders.size() != 0){ if (orders.size() != 0) {
return ResponseData.error("升级订单已存在，不可重复申请！"); return ResponseData.error("升级订单已存在，不可重复申请！");
} }
PackageUpgrade packageUpgrade = packageUpgradeMapper.selectById(servId); PackageUpgrade packageUpgrade = packageUpgradeMapper.selectById(servId);
...@@ -207,7 +234,7 @@ public class PackageUpgradeController extends BaseController { ...@@ -207,7 +234,7 @@ public class PackageUpgradeController extends BaseController {
order.setCreateTime(date); order.setCreateTime(date);
order.setNowPackage(nowPackage); order.setNowPackage(nowPackage);
order.setBusinessPackage(businessPackage); order.setBusinessPackage(businessPackage);
order.setUserId(userId); order.setUserId(oldUserId);
order.setUserType(UserType.OLDCUSTOMER.getId()); order.setUserType(UserType.OLDCUSTOMER.getId());
SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd");
String format = yyyyMMdd.format(date); String format = yyyyMMdd.format(date);
...@@ -215,12 +242,13 @@ public class PackageUpgradeController extends BaseController { ...@@ -215,12 +242,13 @@ public class PackageUpgradeController extends BaseController {
order.setOrderNumber("YRYM" + format + s); order.setOrderNumber("YRYM" + format + s);
order.setHehuorenArea(sysUser.getSubstName()); order.setHehuorenArea(sysUser.getSubstName());
order.setHehuorenName(sysUser.getName()); order.setHehuorenName(sysUser.getName());
String school = packageUpgradeMapper.selectShoolByUserId(partner); String schoolId = packageUpgradeMapper.selectSchoolId(partner);
order.setHehuorenSchool(school); String schoolName = packageUpgradeMapper.selectSchoolById(schoolId);
order.setHehuorenSchool(schoolName);
order.setHehuorenPhone(sysUser.getPhone()); order.setHehuorenPhone(sysUser.getPhone());
Integer insert = orderMapper.insert(order); Integer insert = orderMapper.insert(order);
// MessageUtil.sent(contactNumber,"4",""); // MessageUtil.sent(contactNumber,"4","");
if(StringUtils.isNotBlank(mark)){ if (StringUtils.isNotBlank(mark)) {
String id1 = UUID.randomUUID().toString(); String id1 = UUID.randomUUID().toString();
order.setId(id1); order.setId(id1);
String s1 = String.valueOf((int) ((Math.random() * 9 + 1) * 1000)); String s1 = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
...@@ -231,18 +259,18 @@ public class PackageUpgradeController extends BaseController { ...@@ -231,18 +259,18 @@ public class PackageUpgradeController extends BaseController {
order.setUserSchool(userSchool); order.setUserSchool(userSchool);
insert += orderMapper.insert(order); insert += orderMapper.insert(order);
YangChengTong yangChengTong = new YangChengTong(); YangChengTong yangChengTong = new YangChengTong();
yangChengTong.setSchool(school); yangChengTong.setSchool(schoolName);
yangChengTong.setCustomer_name(custName); yangChengTong.setCustomerName(custName);
yangChengTong.setContact_address(addRess); yangChengTong.setContactAddress(addRess);
yangChengTong.setContact_phone(contactNumber); yangChengTong.setContactPhone(contactNumber);
yangChengTong.setCustomer_phone(businessNumber); yangChengTong.setCustomerPhone(businessNumber);
insert +=yangChengTongrMapper.insert(yangChengTong); insert += yangChengTongrMapper.insert(yangChengTong);
} }
if (insert == 1) { if (insert == 1) {
packageUpgradeMapper.inserOrderHis(id, "下单成功", date); packageUpgradeMapper.inserOrderHis(id, "下单成功", date);
return ResponseData.success(id); return ResponseData.success(id);
} }
if (insert == 2) { if (insert == 3) {
return ResponseData.success("下单成功！"); return ResponseData.success("下单成功！");
} }
return ResponseData.error("升级失败！"); return ResponseData.error("升级失败！");
...@@ -266,14 +294,15 @@ public class PackageUpgradeController extends BaseController { ...@@ -266,14 +294,15 @@ public class PackageUpgradeController extends BaseController {
@RequestMapping(value = "selectUserInfo", method = RequestMethod.POST) @RequestMapping(value = "selectUserInfo", method = RequestMethod.POST)
public ResponseData<Map<String, Object>> selectUserInfo(@RequestParam("partner") String partner) { public ResponseData<Map<String, Object>> selectUserInfo(@RequestParam("partner") String partner) {
SysUser sysUser = userMapper.selectById(partner); SysUser sysUser = userMapper.selectById(partner);
String school = packageUpgradeMapper.selectShoolByUserId(partner); String schoolId = packageUpgradeMapper.selectSchoolId(partner);
String schoolName = packageUpgradeMapper.selectSchoolById(schoolId);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("school",school); map.put("schoolName", schoolName);
map.put("substName",sysUser.getSubstName()); 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());
map.put("phone",sysUser.getPhone()); map.put("phone", sysUser.getPhone());
return ResponseData.success(map); return ResponseData.success(map);
} }
......
common/src/main/java/com/winsun/bean/Order.java
...@@ -3,6 +3,7 @@ package com.winsun.bean; ...@@ -3,6 +3,7 @@ package com.winsun.bean;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data; import lombok.Data;
...@@ -226,6 +227,7 @@ public class Order implements Serializable{ ...@@ -226,6 +227,7 @@ public class Order implements Serializable{
/** /**
* 学校 * 学校
*/ */
@TableField(value = "userSchool")
private String userSchool; private String userSchool;
/** /**
......
common/src/main/java/com/winsun/bean/PackageUpgrade.java
package com.winsun.bean; package com.winsun.bean;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType; import com.baomidou.mybatisplus.enums.IdType;
...@@ -184,6 +185,7 @@ public class PackageUpgrade implements Serializable { ...@@ -184,6 +185,7 @@ public class PackageUpgrade implements Serializable {
/** /**
* 是否受理“DM0002-A01 （0元宽带标识） * 是否受理“DM0002-A01 （0元宽带标识）
*/ */
@TableField("is_0ykd")
private String is0ykd; private String is0ykd;
/** /**
* 宽带速率 * 宽带速率
......
common/src/main/java/com/winsun/bean/SysUser.java
...@@ -89,11 +89,6 @@ public class SysUser { ...@@ -89,11 +89,6 @@ public class SysUser {
private String version; private String version;
/** /**
* 工号
*/
private String staffId;
/**
* 渠道大类 * 渠道大类
*/ */
@TableField(value = "channelType") @TableField(value = "channelType")
......
common/src/main/java/com/winsun/bean/YangChengTong.java
...@@ -24,12 +24,12 @@ public class YangChengTong implements Serializable { ...@@ -24,12 +24,12 @@ public class YangChengTong implements Serializable {
/** /**
*姓名 *姓名
*/ */
private String customer_name; private String customerName;
/** /**
* 登记的手机号 * 登记的手机号
*/ */
private String customer_phone; private String customerPhone;
/** /**
* 学校 * 学校
...@@ -39,12 +39,12 @@ public class YangChengTong implements Serializable { ...@@ -39,12 +39,12 @@ public class YangChengTong implements Serializable {
/** /**
* '联系方式 手机号' * '联系方式 手机号'
*/ */
private String contact_phone; private String contactPhone;
/** /**
* 联系地址 * 联系地址
*/ */
private String contact_address; private String contactAddress;
} }
common/src/main/java/com/winsun/mapper/PackageUpgradeMapper.java
...@@ -24,19 +24,19 @@ public interface PackageUpgradeMapper extends BaseMapper<PackageUpgrade> { ...@@ -24,19 +24,19 @@ public interface PackageUpgradeMapper extends BaseMapper<PackageUpgrade> {
@Select("<script>SELECT * FROM `hhr_xyzx_yd_yrym_list` <where> ${ew.sqlSegment} </where> </script>") @Select("<script>SELECT * FROM `hhr_xyzx_yd_yrym_list` <where> ${ew.sqlSegment} </where> </script>")
List<Map<String,Object>> selectPackage(@Param("ew") Wrapper<PackageUpgrade> wrapper); List<Map<String,Object>> selectPackage(@Param("ew") Wrapper<PackageUpgrade> wrapper);
@Select("select school from `hhr_user_view` where id = #{partner}")
String selectShoolByUserId(String partner);
@Insert("insert into `hhr_order_history` values(#{id},#{status},#{date}) ") @Insert("insert into `hhr_order_history` values(#{id},#{status},#{date}) ")
Integer inserOrderHis(@Param("id")String id, @Param("status")String status, @Param("date")Date date); Integer inserOrderHis(@Param("id")String id, @Param("status")String status, @Param("date")Date date);
@Insert("select * from `hhr_order_history` where oredr_id = #{oredrId}") @Insert("select * from `hhr_order_history` where order_id = #{oredrId}")
List<Map<String,Object>> selectOrderHis(String oredrId); List<Map<String,Object>> selectOrderHis(String oredrId);
@Select("select school_id schoolId from `hhr_user_school` where user_id = #{partner}") @Select("select school_id schoolId from `hhr_user_school` where user_id = #{partner}")
String selectSchoolId(String partner); String selectSchoolId(String partner);
@Select("select package_id packageId from `hhr_user_school` where school_id = #{schoolId}") @Select("select school_name schoolName from `hhr_school` where id = #{schoolId}")
String selectSchoolById(String schoolId);
@Select("select package_id packageId from `hhr_school_package` where school_id = #{schoolId}")
List<String> selectPackageId(String schoolId); List<String> selectPackageId(String schoolId);
......
common/src/main/java/com/winsun/utils/IDCardUtil.java
...@@ -101,7 +101,7 @@ public class IDCardUtil { ...@@ -101,7 +101,7 @@ public class IDCardUtil {
}else { }else {
return false; return false;
} }
return false; return true;
} }
......
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