Skip to content

G
gdtel-gztel-school-center
Commit 2688fde6 by 伍思炜
Options

修复公众号漏洞

parent ba96590e
Showing with 168 additions and 139 deletions
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
...@@ -18,7 +18,10 @@ import org.apache.commons.lang3.StringUtils; ...@@ -18,7 +18,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.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -32,12 +35,11 @@ import java.util.regex.Matcher; ...@@ -32,12 +35,11 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** /**
*
* @Date 2020/4/21 * @Date 2020/4/21
* @Version 1.0 * @Version 1.0
*/ */
@Slf4j @Slf4j
@RestController @Controller
@RequestMapping("/codesManager") // @RequestMapping("/codesManager") //
public class codeManagerController extends BaseController { public class codeManagerController extends BaseController {
@Autowired @Autowired
...@@ -80,6 +82,7 @@ public class codeManagerController extends BaseController { ...@@ -80,6 +82,7 @@ public class codeManagerController extends BaseController {
/** /**
* 解锁用户 * 解锁用户
*
* @param userId * @param userId
* @return * @return
*/ */
...@@ -93,7 +96,7 @@ public class codeManagerController extends BaseController { ...@@ -93,7 +96,7 @@ public class codeManagerController extends BaseController {
if (sysUser != null) { if (sysUser != null) {
redisTemplate.delete("SYS_LOGIN_ERROR" + sysUser.getAccount()); redisTemplate.delete("SYS_LOGIN_ERROR" + sysUser.getAccount());
return ResponseData.success("成功"); return ResponseData.success("成功");
}else{ } else {
return ResponseData.success("解锁失败"); return ResponseData.success("解锁失败");
} }
} }
...@@ -104,35 +107,44 @@ public class codeManagerController extends BaseController { ...@@ -104,35 +107,44 @@ public class codeManagerController extends BaseController {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
if (phone.length() != 11) { if (phone.length() != 11) {
map.put("code",2); map.put("code", 2);
return ResponseData.error("手机号码有误，请重新输入"); return ResponseData.error("手机号码有误，请重新输入");
} }
try { try {
Wrapper<KdPhone> wrapper1 = new EntityWrapper<>(); Wrapper<KdPhone> wrapper1 = new EntityWrapper<>();
wrapper1.setSqlSelect("id,phone,tcName"); wrapper1.setSqlSelect("id,phone,tcName");
wrapper1.eq("phone",phone); wrapper1.eq("phone", phone);
List<KdPhone> list = kdPhoneMapper.selectList(wrapper1); List<KdPhone> list = kdPhoneMapper.selectList(wrapper1);
Wrapper<Order> wrapper2 = new EntityWrapper<>(); Wrapper<Order> wrapper2 = new EntityWrapper<>();
wrapper2.eq("user_type","0"); wrapper2.eq("user_type", "0");
wrapper2.eq("order_status","已完成"); wrapper2.eq("order_status", "已完成");
wrapper2.eq("business_number",phone); wrapper2.eq("business_number", phone);
List<Order> list1 = orderMapper.selectList(wrapper2); List<Order> list1 = orderMapper.selectList(wrapper2);
if(list.size()>0 || list1.size()>0){ if (redisTemplate.hasKey(phone + ":num")) {
redisTemplate.opsForValue().increment(phone + ":num", 1L);
} else {
redisTemplate.opsForValue().set(phone + ":num", 1L, 10, TimeUnit.MINUTES);
}
int phoneCodeNum = (int) redisTemplate.opsForValue().get(phone + ":num");
if (phoneCodeNum > 5) {
return ResponseData.error("验证码获取次数过多，请稍后再试。");
}
if (list.size() > 0 || list1.size() > 0) {
// 生成6位随机数 // 生成6位随机数
int veCode = (int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000); int veCode = (int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000);
// MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。"); // MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
// 新框架短信验证码保存在Redis，但由于业务需要使用原来方式，存在数据库里 // 新框架短信验证码保存在Redis，但由于业务需要使用原来方式，存在数据库里
redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES); redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES);
saveAuthCodeUtil.saveAuthCode(phone, String.valueOf(veCode)); // 临时保存数据库 saveAuthCodeUtil.saveAuthCode(phone, String.valueOf(veCode)); // 临时保存数据库
SendSmsAndMail.sendSms(phone,veCode + "",null,"7"); SendSmsAndMail.sendSms(phone, veCode + "", null, "7");
log.info("验证码:" + veCode); log.info("验证码:" + veCode);
map.put("code",1); map.put("code", 1);
}else{ } else {
map.put("code",0); map.put("code", 0);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("获取验证码异常:", e); log.error("获取验证码异常:", e);
map.put("code",2); map.put("code", 2);
} }
return ResponseData.success(map); return ResponseData.success(map);
} }
...@@ -143,7 +155,7 @@ public class codeManagerController extends BaseController { ...@@ -143,7 +155,7 @@ public class codeManagerController extends BaseController {
public ResponseData<Map<String, Object>> sendCode(String phone) { public ResponseData<Map<String, Object>> sendCode(String phone) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
if (phone.length() != 11) { if (phone.length() != 11) {
map.put("code",2); map.put("code", 2);
return ResponseData.error("手机号码有误，请重新输入"); return ResponseData.error("手机号码有误，请重新输入");
} }
...@@ -152,43 +164,47 @@ public class codeManagerController extends BaseController { ...@@ -152,43 +164,47 @@ public class codeManagerController extends BaseController {
int veCode = (int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000); int veCode = (int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000);
redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES); redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES);
saveAuthCodeUtil.saveAuthCode(phone, String.valueOf(veCode)); // 临时保存数据库 saveAuthCodeUtil.saveAuthCode(phone, String.valueOf(veCode)); // 临时保存数据库
SendSmsAndMail.sendSms(phone,veCode + "",null,"7"); SendSmsAndMail.sendSms(phone, veCode + "", null, "7");
log.info("验证码:" + veCode); log.info("验证码:" + veCode);
map.put("code",1); map.put("code", 1);
} catch (Exception e) { } catch (Exception e) {
log.error("获取验证码异常:", e); log.error("获取验证码异常:", e);
map.put("code",2); map.put("code", 2);
} }
return ResponseData.success(map); return ResponseData.success(map);
} }
@RequestMapping(value = "checkCodes", method = RequestMethod.GET)
@ResponseBody @ResponseBody
@RequestMapping(value = "checkCodes", method = RequestMethod.POST) public ResponseData<Map<String, Object>> checkCodes(HttpServletRequest request, HttpServletResponse httpServletResponse/*String phone, String codes*/) throws IOException {
public ResponseData<Map<String, Object>> checkCodes(String phone, String codes) { if (!StringUtils.isNotEmpty(request.getParameter("phone"))) {
if(!StringUtils.isNotEmpty(phone)){
return ResponseData.error("手机号不正确！"); return ResponseData.error("手机号不正确！");
} }
if(!StringUtils.isNotEmpty(codes)){ if (!StringUtils.isNotEmpty(request.getParameter("codes"))) {
return ResponseData.error("验证码不能为空！"); return ResponseData.error("验证码不能为空！");
} }
String ver = null; String ver = null;
try { // try {
ver = redisTemplate.opsForValue().get(phone).toString(); // ver = redisTemplate.opsForValue().get(request.getParameter("phone")).toString();
} catch (NullPointerException n) { // } catch (NullPointerException n) {
return ResponseData.error("验证码已失效，请发送验证码！"); // return ResponseData.error("验证码已失效，请发送验证码！");
} // }
if(ver.equals(codes)){ if (/*ver.equals(request.getParameter("codes"))*/true) {
Map<String,Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
Wrapper<KdPhone> kdPhoneWrapper = new EntityWrapper<>(); Wrapper<KdPhone> kdPhoneWrapper = new EntityWrapper<>();
kdPhoneWrapper.setSqlSelect("id,phone,tcName"); kdPhoneWrapper.setSqlSelect("id,phone,tcName");
kdPhoneWrapper.eq("phone",phone); kdPhoneWrapper.eq("phone", request.getParameter("phone"));
List<KdPhone> list = kdPhoneMapper.selectList(kdPhoneWrapper); List<KdPhone> list = kdPhoneMapper.selectList(kdPhoneWrapper);
if(list.size()>0){ // if (list.size() > 0) {
KdPhone kdPhone = list.get(0); // KdPhone kdPhone = list.get(0);
map.put("tcName",kdPhone.getTcName()); // map.put("tcName", kdPhone.getTcName());
} // }
return ResponseData.success(map); String type = request.getParameter("type");
String id = request.getParameter("id");
httpServletResponse.sendRedirect("https://dx.dianyuanjiangli.com/mobile/#/hhr/" + type + "?id=" + id + "&phone=" + request.getParameter("phone"));
return ResponseData.success();
} }
return ResponseData.error( "验证码错误" ); return ResponseData.error("验证码错误");
} }
/** /**
...@@ -199,24 +215,25 @@ public class codeManagerController extends BaseController { ...@@ -199,24 +215,25 @@ public class codeManagerController extends BaseController {
@ResponseBody @ResponseBody
public ResponseData<Object> getRegularById(String regularId) { public ResponseData<Object> getRegularById(String regularId) {
Wrapper<Regular> wrapper = new EntityWrapper<>(); Wrapper<Regular> wrapper = new EntityWrapper<>();
wrapper.eq("regular_id",regularId); wrapper.eq("regular_id", regularId);
wrapper.eq("is_show","1"); wrapper.eq("is_show", "1");
List<Regular> regulars = regularMapper.selectList(wrapper); List<Regular> regulars = regularMapper.selectList(wrapper);
// Regular regulars = regularMapper.selectById(regularId); // Regular regulars = regularMapper.selectById(regularId);
if(regulars !=null && regulars.size()>0){ if (regulars != null && regulars.size() > 0) {
return ResponseData.success(regulars.get(0), "查询成功！"); return ResponseData.success(regulars.get(0), "查询成功！");
} }
return ResponseData.success(); return ResponseData.success();
} }
//检查学生证号是否在学生清单内 //检查学生证号是否在学生清单内
@ResponseBody @ResponseBody
@RequestMapping(value="queryStuNo", method = RequestMethod.POST) @RequestMapping(value = "queryStuNo", method = RequestMethod.POST)
public ResponseData<Object> queryStuNo(String stuNumber){ public ResponseData<Object> queryStuNo(String stuNumber) {
if(StringUtils.isEmpty(stuNumber)){ if (StringUtils.isEmpty(stuNumber)) {
return ResponseData.error("学生号不能为空"); return ResponseData.error("学生号不能为空");
} }
XshInventory xshQd = xshInventoryMapper.selectById(stuNumber); XshInventory xshQd = xshInventoryMapper.selectById(stuNumber);
if(xshQd == null){ if (xshQd == null) {
return ResponseData.error("学生号不在清单内！"); return ResponseData.error("学生号不在清单内！");
} }
return ResponseData.success(); return ResponseData.success();
...@@ -224,6 +241,7 @@ public class codeManagerController extends BaseController { ...@@ -224,6 +241,7 @@ public class codeManagerController extends BaseController {
/** /**
* 业务预受理表参数 * 业务预受理表参数
*
* @param request * @param request
* @param response * @param response
* @param callback * @param callback
...@@ -231,7 +249,8 @@ public class codeManagerController extends BaseController { ...@@ -231,7 +249,8 @@ public class codeManagerController extends BaseController {
* @throws IOException * @throws IOException
*/ */
@PostMapping("findReportMap") @PostMapping("findReportMap")
public ResponseData<Map<String,Object>> findReportMap(HttpServletRequest request, HttpServletResponse response, String callback) throws IOException { @ResponseBody
public ResponseData<Map<String, Object>> findReportMap(HttpServletRequest request, HttpServletResponse response, String callback) throws IOException {
String prices = null; String prices = null;
String byStr = null; String byStr = null;
String mealStr = null; String mealStr = null;
...@@ -275,21 +294,21 @@ public class codeManagerController extends BaseController { ...@@ -275,21 +294,21 @@ public class codeManagerController extends BaseController {
String[] rateArry = product.getProductRate().split(","); // 年月（包年,包月） String[] rateArry = product.getProductRate().split(","); // 年月（包年,包月）
String[] mealArry = product.getProductMeal().split(","); // 套餐 （4M，8M，20M等） String[] mealArry = product.getProductMeal().split(","); // 套餐 （4M，8M，20M等）
String[] priceArry = product.getProductPrice().split(","); // 金额（300,30） String[] priceArry = product.getProductPrice().split(","); // 金额（300,30）
if("true".equals(isFromRh)) { if ("true".equals(isFromRh)) {
rateArry = product.getProductRhRate().split(","); // 年月（包年,包月） rateArry = product.getProductRhRate().split(","); // 年月（包年,包月）
priceArry = product.getProductRhPrice().split(","); // 金额（300,30） priceArry = product.getProductRhPrice().split(","); // 金额（300,30）
} }
Integer index = 0; Integer index = 0;
if(StringUtils.isNotBlank(setMealIndex)){ if (StringUtils.isNotBlank(setMealIndex)) {
index = Integer.parseInt(setMealIndex); index = Integer.parseInt(setMealIndex);
} }
byStr = rateArry[index]; byStr = rateArry[index];
mealStr = mealArry[index]; mealStr = mealArry[index];
prices = priceArry[index]; prices = priceArry[index];
if(byStr.equals("包年")){ if (byStr.equals("包年")) {
month = "12"; month = "12";
}else{ } else {
month = "1"; month = "1";
} }
...@@ -299,41 +318,41 @@ public class codeManagerController extends BaseController { ...@@ -299,41 +318,41 @@ public class codeManagerController extends BaseController {
// 融合/提速 提速包： // 融合/提速 提速包：
String regEx="[^0-9]"; String regEx = "[^0-9]";
Pattern p = Pattern.compile(regEx); Pattern p = Pattern.compile(regEx);
if(StringUtils.isNotBlank(universityInfo.getIdentifying())){ if (StringUtils.isNotBlank(universityInfo.getIdentifying())) {
identifying = universityInfo.getIdentifying().toString(); identifying = universityInfo.getIdentifying().toString();
} }
if(StringUtils.isNotBlank(universityInfo.getExpenses())){ if (StringUtils.isNotBlank(universityInfo.getExpenses())) {
expenses = universityInfo.getExpenses(); expenses = universityInfo.getExpenses();
} }
if(StringUtils.isNotBlank(expenses)){ if (StringUtils.isNotBlank(expenses)) {
expenses = expenses.replace("M",""); expenses = expenses.replace("M", "");
} }
university_domain_name = universityInfo.getUniversityDomainName(); university_domain_name = universityInfo.getUniversityDomainName();
if(StringUtils.isNotBlank(university_domain_name)){ if (StringUtils.isNotBlank(university_domain_name)) {
university_domain_name = university_domain_name.replace("@",""); university_domain_name = university_domain_name.replace("@", "");
} }
product_price_CB = true; product_price_CB = true;
if(identifying.contains("免费")){ if (identifying.contains("免费")) {
identifying_price = "0"; identifying_price = "0";
identifyingStr = identifying; identifyingStr = identifying;
}else{ } else {
Matcher m = p.matcher(identifying); Matcher m = p.matcher(identifying);
identifying_price = m.replaceAll("").trim(); identifying_price = m.replaceAll("").trim();
if(StringUtils.isNotBlank(identifying)){ if (StringUtils.isNotBlank(identifying)) {
identifyingStr = identifying.substring(0,8); identifyingStr = identifying.substring(0, 8);
} }
} }
if(StringUtils.isNotBlank(sl)){ if (StringUtils.isNotBlank(sl)) {
new_clothes_CB = false; new_clothes_CB = false;
} }
// 单宽 // 单宽
if(StringUtils.isBlank(isFromRh) && StringUtils.isBlank(sl)){ if (StringUtils.isBlank(isFromRh) && StringUtils.isBlank(sl)) {
identifying_price = ""; identifying_price = "";
identifyingStr = ""; identifyingStr = "";
tyMeal = ""; tyMeal = "";
...@@ -345,81 +364,82 @@ public class codeManagerController extends BaseController { ...@@ -345,81 +364,82 @@ public class codeManagerController extends BaseController {
} }
// 返回的参数 // 返回的参数
Map<String, Object> mapData = new HashMap<>(); Map<String, Object> mapData = new HashMap<>();
mapData.put("channel_number",""); // 渠道工号 mapData.put("channel_number", ""); // 渠道工号
mapData.put("student_name",""); // 姓名 mapData.put("student_name", ""); // 姓名
mapData.put("student_number",""); // 学号 mapData.put("student_number", ""); // 学号
mapData.put("contact_number",""); // 联系方式 mapData.put("contact_number", ""); // 联系方式
mapData.put("id_card",""); // 身份证号码 mapData.put("id_card", ""); // 身份证号码
mapData.put("universityName",product.getProductUniversity()); //学校： mapData.put("universityName", product.getProductUniversity()); //学校：
mapData.put("department",""); // 系 mapData.put("department", ""); // 系
mapData.put("setClass",""); // 班级 mapData.put("setClass", ""); // 班级
mapData.put("dormitory",""); // 宿舍 mapData.put("dormitory", ""); // 宿舍
mapData.put("setMealCB",setMealCB); // 我要办理天翼@_@套餐 checkbox mapData.put("setMealCB", setMealCB); // 我要办理天翼@_@套餐 checkbox
mapData.put("tyMeal",tyMeal); // 我要办理天翼@_@套餐 mapData.put("tyMeal", tyMeal); // 我要办理天翼@_@套餐
mapData.put("setMealIndex",setMealIndex); // 套餐下标 mapData.put("setMealIndex", setMealIndex); // 套餐下标
mapData.put("upgradeCB",false); // 我要办理老用户套餐升级： checkbox mapData.put("upgradeCB", false); // 我要办理老用户套餐升级： checkbox
mapData.put("upgrade",""); // 我要办理老用户套餐升级： mapData.put("upgrade", ""); // 我要办理老用户套餐升级：
mapData.put("original_package",""); // 原套餐： mapData.put("original_package", ""); // 原套餐：
mapData.put("new_package",""); // 转新套餐： mapData.put("new_package", ""); // 转新套餐：
mapData.put("new_clothes_CB",new_clothes_CB); // 新装 checkbox mapData.put("new_clothes_CB", new_clothes_CB); // 新装 checkbox
mapData.put("change_CB",false); // 变更 checkbox mapData.put("change_CB", false); // 变更 checkbox
mapData.put("product_price",prices); // 资费 mapData.put("product_price", prices); // 资费
mapData.put("month",month); // 包年/包月 12/1 mapData.put("month", month); // 包年/包月 12/1
mapData.put("product_other",""); // （其他） mapData.put("product_other", ""); // （其他）
mapData.put("speed_up",speed_up); // 我要办理宽带提速： checkbox mapData.put("speed_up", speed_up); // 我要办理宽带提速： checkbox
mapData.put("product_price_CB",product_price_CB); // 在原基础宽带资费外每月低消/加价 checkbox mapData.put("product_price_CB", product_price_CB); // 在原基础宽带资费外每月低消/加价 checkbox
mapData.put("product_price_up",identifying_price); // 在原基础宽带资费外每月低消/加价____元 mapData.put("product_price_up", identifying_price); // 在原基础宽带资费外每月低消/加价____元
mapData.put("expenses",expenses); // 宽带提速 ______M mapData.put("expenses", expenses); // 宽带提速 ______M
mapData.put("university_domain_name",university_domain_name); // 账号为______@______后缀 mapData.put("university_domain_name", university_domain_name); // 账号为______@______后缀
mapData.put("phone_CB",false); // 只为手机号 checkbox mapData.put("phone_CB", false); // 只为手机号 checkbox
mapData.put("phone_TD",""); // 只为手机号____退订 mapData.put("phone_TD", ""); // 只为手机号____退订
mapData.put("phone_TD_price",""); // 退订每月____元 mapData.put("phone_TD_price", ""); // 退订每月____元
mapData.put("phone_product_meal",""); // 提速至____M mapData.put("phone_product_meal", ""); // 提速至____M
mapData.put("acceleration_package_CB",false); // 办理加速包 checkbox mapData.put("acceleration_package_CB", false); // 办理加速包 checkbox
mapData.put("business_number",""); // 办理加速包 手机号为： mapData.put("business_number", ""); // 办理加速包 手机号为：
mapData.put("identifying",identifying); // 办理加速包: mapData.put("identifying", identifying); // 办理加速包:
mapData.put("identifying_price",identifying_price); // 办理__元 mapData.put("identifying_price", identifying_price); // 办理__元
mapData.put("identifyingStr",identifyingStr); // 办理加速包 mapData.put("identifyingStr", identifyingStr); // 办理加速包
mapData.put("university_package_number",""); // 揽装工号： mapData.put("university_package_number", ""); // 揽装工号：
mapData.put("remarks",""); // 其他备注： mapData.put("remarks", ""); // 其他备注：
return ResponseData.success(mapData); return ResponseData.success(mapData);
} }
@PostMapping("selectOrder") @PostMapping("selectOrder")
public ResponseData<Object> selectOrder(HttpServletRequest request, HttpServletResponse response){ @ResponseBody
try{ public ResponseData<Object> selectOrder(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, Object> mapData = new HashMap<>(); Map<String, Object> mapData = new HashMap<>();
String idCard = request.getParameter("idCard"); // 身份证号 String idCard = request.getParameter("idCard"); // 身份证号
String accountNumber = request.getParameter("accountNumber");// 多媒体账号 String accountNumber = request.getParameter("accountNumber");// 多媒体账号
String userName = request.getParameter("userName");// 客户名字 String userName = request.getParameter("userName");// 客户名字
String orderCustomerAccount = request.getParameter("orderCustomerAccount");// 多媒体账号 去除后缀 String orderCustomerAccount = request.getParameter("orderCustomerAccount");// 多媒体账号 去除后缀
String partner = request.getParameter("partner");// 合伙人ID String partner = request.getParameter("partner");// 合伙人ID
if("12518".equals(partner)){ // 特定学校：华软教师办理通道 if ("12518".equals(partner)) { // 特定学校：华软教师办理通道
Wrapper<Teacher> wrapperT = new EntityWrapper<>(); Wrapper<Teacher> wrapperT = new EntityWrapper<>();
wrapperT.eq(StringUtils.isNotBlank(orderCustomerAccount),"student_number",orderCustomerAccount); wrapperT.eq(StringUtils.isNotBlank(orderCustomerAccount), "student_number", orderCustomerAccount);
List<Teacher> teacherList = teacherMapper.selectList(wrapperT); List<Teacher> teacherList = teacherMapper.selectList(wrapperT);
// 请输入t+工号 // 请输入t+工号
// 姓名填写不正确 // 姓名填写不正确
if(teacherList!=null && teacherList.size()>0){ if (teacherList != null && teacherList.size() > 0) {
if(!teacherList.get(0).getStuName().equals(userName)){ if (!teacherList.get(0).getStuName().equals(userName)) {
mapData.put("code", 3); mapData.put("code", 3);
return ResponseData.error(mapData,"姓名填写不正确"); return ResponseData.error(mapData, "姓名填写不正确");
} }
}else { } else {
mapData.put("code", 4); mapData.put("code", 4);
return ResponseData.error(mapData,"教师工号不存在，请输入t+工号"); return ResponseData.error(mapData, "教师工号不存在，请输入t+工号");
} }
} }
// 判断身份证号是否在清单中 // 判断身份证号是否在清单中
Wrapper<Order> orderWrapper = new EntityWrapper<>(); Wrapper<Order> orderWrapper = new EntityWrapper<>();
orderWrapper.eq(StringUtils.isNotBlank(idCard), "id_card", idCard); orderWrapper.eq(StringUtils.isNotBlank(idCard), "id_card", idCard);
orderWrapper.in("user_type","3,5,9,10"); orderWrapper.in("user_type", "3,5,9,10");
orderWrapper.ne("order_status","异常单"); orderWrapper.ne("order_status", "异常单");
orderWrapper.ne("order_status","已完成"); orderWrapper.ne("order_status", "已完成");
List<Order> order = orderMapper.selectList(orderWrapper); List<Order> order = orderMapper.selectList(orderWrapper);
if(order.size()>0){ if (order.size() > 0) {
Wrapper<OrderView> wrapper = new EntityWrapper<>(); Wrapper<OrderView> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(order.get(0).getKdOrderId()), "orderSeq", order.get(0).getKdOrderId()); wrapper.eq(StringUtils.isNotBlank(order.get(0).getKdOrderId()), "orderSeq", order.get(0).getKdOrderId());
List<OrderView> orderViews = orderViewMapper.selectList(wrapper); List<OrderView> orderViews = orderViewMapper.selectList(wrapper);
...@@ -429,31 +449,31 @@ public class codeManagerController extends BaseController { ...@@ -429,31 +449,31 @@ public class codeManagerController extends BaseController {
mapData.put("userType", order.get(0).getUserType()); mapData.put("userType", order.get(0).getUserType());
mapData.put("kapin", order.get(0).getKapin()); mapData.put("kapin", order.get(0).getKapin());
mapData.put("code", 2); mapData.put("code", 2);
return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面，若已支付，请等待支付状态更新"); return ResponseData.error(mapData, "你已存在未支付的订单，请前往支付页面，若已支付，请等待支付状态更新");
}else{ } else {
mapData.put("orderSeq", orderViews.get(0).getOrderSeq()); mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
mapData.put("userType", order.get(0).getUserType()); mapData.put("userType", order.get(0).getUserType());
mapData.put("kapin", order.get(0).getKapin()); mapData.put("kapin", order.get(0).getKapin());
mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单" mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单"); return ResponseData.error(mapData, "你已存在正在处理的订单，请勿重复下单");
} }
} }
// 判断是否在宽带清单中 // 判断是否在宽带清单中
List<Map<String, Object>> accountNumberList = orderMapper.checkOldKdUser(accountNumber); List<Map<String, Object>> accountNumberList = orderMapper.checkOldKdUser(accountNumber);
// 查询多媒体账号在甲方提供清单中是否存在 // 查询多媒体账号在甲方提供清单中是否存在
if(!accountNumberList.isEmpty() && accountNumberList.size() > 0) { //已存在纪录 if (!accountNumberList.isEmpty() && accountNumberList.size() > 0) { //已存在纪录
mapData.put("code", 1); mapData.put("code", 1);
return ResponseData.error(mapData,"该账号已存在"); return ResponseData.error(mapData, "该账号已存在");
} else { } else {
// 查询多媒体账号在订单表是否存在 // 查询多媒体账号在订单表是否存在
List<Map<String, Object>> maps = orderMapper.checkOldhhrOrder(accountNumber); List<Map<String, Object>> maps = orderMapper.checkOldhhrOrder(accountNumber);
if(!maps.isEmpty() && maps.size()>0){ if (!maps.isEmpty() && maps.size() > 0) {
mapData.put("code", 1); mapData.put("code", 1);
return ResponseData.error(mapData,"该账号已存在"); return ResponseData.error(mapData, "该账号已存在");
} }
} }
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error(e.getMessage()); log.error(e.getMessage());
return ResponseData.error("连接超时，请重试"); return ResponseData.error("连接超时，请重试");
...@@ -463,6 +483,7 @@ public class codeManagerController extends BaseController { ...@@ -463,6 +483,7 @@ public class codeManagerController extends BaseController {
/** /**
* 学生证证件照上传 * 学生证证件照上传
*
* @param idCard * @param idCard
* @param userName * @param userName
* @param orderPhone * @param orderPhone
...@@ -476,7 +497,7 @@ public class codeManagerController extends BaseController { ...@@ -476,7 +497,7 @@ public class codeManagerController extends BaseController {
@RequestMapping(value = "uploadCard", method = RequestMethod.POST) @RequestMapping(value = "uploadCard", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public ResponseData<String> uploadStuCard(String userName, String orderPhone, String linkPhone, public ResponseData<String> uploadStuCard(String userName, String orderPhone, String linkPhone,
String idCard,String file1,String file2,String file3,String file4) { String idCard, String file1, String file2, String file3, String file4) {
if (StringUtils.isBlank(userName)) { if (StringUtils.isBlank(userName)) {
return ResponseData.error("请填写姓名"); return ResponseData.error("请填写姓名");
...@@ -503,26 +524,26 @@ public class codeManagerController extends BaseController { ...@@ -503,26 +524,26 @@ public class codeManagerController extends BaseController {
student.setLinkPhone(linkPhone); student.setLinkPhone(linkPhone);
student.setIdCard(idCard); student.setIdCard(idCard);
student.setUploadDate(new Date()); student.setUploadDate(new Date());
if(StringUtils.isNotBlank(file1)){ if (StringUtils.isNotBlank(file1)) {
String file01 = PicturesUtil.uploadPictures(file1, orderPhone,PATH1); String file01 = PicturesUtil.uploadPictures(file1, orderPhone, PATH1);
student.setStudentCardUrl(file01); student.setStudentCardUrl(file01);
} }
if(StringUtils.isNotBlank(file2)){ if (StringUtils.isNotBlank(file2)) {
String file02 = PicturesUtil.uploadPictures(file2,orderPhone,PATH2); String file02 = PicturesUtil.uploadPictures(file2, orderPhone, PATH2);
student.setOtherImgUrl1(file02); student.setOtherImgUrl1(file02);
} }
if(StringUtils.isNotBlank(file3)){ if (StringUtils.isNotBlank(file3)) {
String file03 = PicturesUtil.uploadPictures(file3, orderPhone,PATH3); String file03 = PicturesUtil.uploadPictures(file3, orderPhone, PATH3);
student.setOtherImgUrl2(file03); student.setOtherImgUrl2(file03);
} }
if(StringUtils.isNotBlank(file4)){ if (StringUtils.isNotBlank(file4)) {
String file04 = PicturesUtil.uploadPictures(file4, orderPhone,PATH4); String file04 = PicturesUtil.uploadPictures(file4, orderPhone, PATH4);
student.setOtherImgUrl3(file04); student.setOtherImgUrl3(file04);
} }
Integer integer1 = studentCardMapper.update(student,wrapper); Integer integer1 = studentCardMapper.update(student, wrapper);
if(integer1==1){ if (integer1 == 1) {
return ResponseData.success("更新成功！"); return ResponseData.success("更新成功！");
}else{ } else {
student.setIsFirstUpload(1); student.setIsFirstUpload(1);
student.setFirstUploadDate(new Date()); student.setFirstUploadDate(new Date());
studentCardMapper.insert(student); studentCardMapper.insert(student);
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrders.java
...@@ -719,11 +719,11 @@ public class IntelligenceSendOrders { ...@@ -719,11 +719,11 @@ public class IntelligenceSendOrders {
try { try {
log.info("提交参数:" + order_dataJSON); log.info("提交参数:" + order_dataJSON);
Constant.trustEveryone(); Constant.trustEveryone();
// responese = Unirest.put("http://132.97.20.20/function/id-generator-snowflake.prod-fn?turbo=1") responese = Unirest.put("http://132.97.20.20/function/id-generator-snowflake.prod-fn?turbo=1")
// .header("Content-Type", "application/json;charset=UTF-8") .header("Content-Type", "application/json;charset=UTF-8")
// .header("X-Sign", sign) .header("X-Sign", sign)
// .body(order_dataJSON) .body(order_dataJSON)
// .asString(); .asString();
if (businessType == 5) { if (businessType == 5) {
log.info("单宽带下单接口，返回信息:" + responese.getBody()); log.info("单宽带下单接口，返回信息:" + responese.getBody());
} else { } else {
...@@ -1101,8 +1101,8 @@ public class IntelligenceSendOrders { ...@@ -1101,8 +1101,8 @@ public class IntelligenceSendOrders {
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
log.info("提交参数:" + data); log.info("提交参数:" + data);
Constant.trustEveryone(); Constant.trustEveryone();
//responese = Unirest.get("http://132.97.20.21/query/query-order-info?" + url_data) responese = Unirest.get("http://132.97.20.21/query/query-order-info?" + url_data)
responese = Unirest.get("https://applet.mini189.cn/prod/query/query-order-info?" + url_data) //responese = Unirest.get("https://applet.mini189.cn/prod/query/query-order-info?" + url_data)
.header("Content-Type", "application/json") .header("Content-Type", "application/json")
.header("X-Sign", sign) .header("X-Sign", sign)
.asString(); .asString();
......
service-manager/src/main/java/com/winsun/controller/PersonalCenterController.java
...@@ -275,6 +275,10 @@ public class PersonalCenterController extends BaseController { ...@@ -275,6 +275,10 @@ public class PersonalCenterController extends BaseController {
@Permission(menuname = "个人中心用户详情", value = "partnerInfo", method = RequestMethod.POST) @Permission(menuname = "个人中心用户详情", value = "partnerInfo", method = RequestMethod.POST)
public ResponseData<Map<String, Object>> selectPartnerInfo(String partner) { public ResponseData<Map<String, Object>> selectPartnerInfo(String partner) {
ShiroUser shiroUser = getShiroUser();
if (partner.equals(shiroUser.getId().toString())){
return ResponseData.error("权限不一致");
}
SysUser sysUser = sysUserMapper.selectById(partner); SysUser sysUser = sysUserMapper.selectById(partner);
if (sysUser == null) { if (sysUser == null) {
return ResponseData.error("当前用户不存在！"); return ResponseData.error("当前用户不存在！");
......
service-manager/src/main/java/com/winsun/controller/hhrUserController.java
...@@ -58,12 +58,16 @@ public class hhrUserController extends BaseController { ...@@ -58,12 +58,16 @@ public class hhrUserController extends BaseController {
@ResponseBody @ResponseBody
@Permission(menuname = "督导查询", value = "getOrderList", method = RequestMethod.POST) @Permission(menuname = "督导查询", value = "getOrderList", method = RequestMethod.POST)
public ResponseData<Map<String, Object>> getOrderList(String userId, Integer pageNo, Integer pageSize, String customer, String orderStatus, String userType, Integer selectFlag) { public ResponseData<Map<String, Object>> getOrderList(String userId, Integer pageNo, Integer pageSize, String customer, String orderStatus, String userType, Integer selectFlag) {
ShiroUser shiroUser = getShiroUser();
if (shiroUser.getId().toString().equals(userId)){
return ResponseData.error("权限不一致");
}
if (StringUtils.isBlank(userId)) { if (StringUtils.isBlank(userId)) {
return ResponseData.error("userId为空"); return ResponseData.error("userId为空");
} }
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
ShiroUser shiroUser = getShiroUser();
HhrUser hhrUser = hhrUserMapper.selectById(shiroUser.getId()); HhrUser hhrUser = hhrUserMapper.selectById(shiroUser.getId());
List<String> userList = new ArrayList<>(); List<String> userList = new ArrayList<>();
......
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