Skip to content

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

Merge remote-tracking branch 'origin/master'

parents c3ed3135 5fcfa77d
Showing with 126 additions and 42 deletions
apply-net/src/main/java/com/winsun/controller/RongHeController.java
......@@ -79,7 +79,7 @@ public class RongHeController {
//随机生成六位数字验证码
String vCode = String.valueOf((int) (Math.random() * 900000 + 100000));
//第一次发送验证码
session.setAttribute("currentDate", System.currentTimeMillis());//Session放入当前系统时间
/*session.setAttribute("currentDate", System.currentTimeMillis());//Session放入当前系统时间
long currentDate = (Long) session.getAttribute("currentDate");
Long date = (Long) session.getAttribute("date");
//12小时内若发送验证码，currentDate的值则变成当前系统时间替换第一次发送验证码存入的时间，
......@@ -91,7 +91,7 @@ public class RongHeController {
}
session.setAttribute("date", System.currentTimeMillis());//Session放入当前系统时间
session.setAttribute("phoneNum", phone);//Session放入手机号码
session.setAttribute("verifyCode", vCode);//Session放入验证码
session.setAttribute("verifyCode", vCode);//Session放入验证码*/
if("".equals(verifyCode)){
SendSmsAndMail.sendSms(phone,vCode+"","7");
verifyCode = vCode;
......@@ -428,6 +428,12 @@ public class RongHeController {
return null;
}
@RequestMapping("/selectUniversity")
public ResponseData<UniversityInfo> selectUniversity(@RequestParam("universityId") String universityId) {
UniversityInfo universityInfo = universityInfoMapper.selectById(universityId);
return ResponseData.success(universityInfo);
}
/**
* @author ljh
* @Description:支付请求
......@@ -665,7 +671,7 @@ public class RongHeController {
/**
* @author ljh
* @Description:提交单宽
* @Description:提交融合
* @method:getOrderInfo
* @return: JSONObject
* @date 2018年6月5日上午10:41:21
......
common/src/main/java/com/winsun/bean/PackageUpgrade.java
......@@ -17,6 +17,7 @@ import java.io.Serializable;
@Data
@TableName("hhr_xyzx_yd_yrym_list")
public class PackageUpgrade implements Serializable {
private static final long serialVersionUID = -5156512189291778668L;
/**
* 月份
*/
......
common/src/main/java/com/winsun/bean/QueryBys.java 0 → 100644
package com.winsun.bean;
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_bys")
public class QueryBys implements Serializable {
private static final long serialVersionUID = 1266551976065352556L;
/**
* 主键标识
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
*
*/
private String name;
/**
*
*/
private String phone;
/**
*
*/
private String idCard;
}
common/src/main/java/com/winsun/mapper/QueryBysMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.QueryBys;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Mapper
@Component
public interface QueryBysMapper extends BaseMapper<QueryBys> {
@Select("select * from `hhr_xyzx_yd_yrym_list` where acc_nbr = #{idCard} or social_id=#{idCard}")
List<Map<String,Object>> checkIsStockByStr(String idCard);
}
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
......@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
......@@ -38,6 +37,8 @@ import java.util.concurrent.TimeUnit;
public class PackageUpgradeController extends BaseController {
private static AppMapper appMapper;
private static QueryBysMapper queryBysMapper;
private static PackageMapper packageMapper;
private static YangChengTongrMapper yangChengTongrMapper;
......@@ -51,7 +52,7 @@ public class PackageUpgradeController extends BaseController {
private RedisTemplate redisTemplate;
@Autowired
public PackageUpgradeController(AppMapper appMapper, PackageMapper packageMapper,
public PackageUpgradeController(AppMapper appMapper, PackageMapper packageMapper,QueryBysMapper queryBysMapper,
YangChengTongrMapper yangChengTongrMapper, OrderMapper orderMapper
, SysUserMapper userMapper) {
PackageUpgradeController.appMapper = appMapper;
......@@ -59,6 +60,7 @@ public class PackageUpgradeController extends BaseController {
PackageUpgradeController.yangChengTongrMapper = yangChengTongrMapper;
PackageUpgradeController.orderMapper = orderMapper;
PackageUpgradeController.userMapper = userMapper;
PackageUpgradeController.queryBysMapper=queryBysMapper;
}
/**
......@@ -117,7 +119,6 @@ public class PackageUpgradeController extends BaseController {
redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES);
return ResponseData.success(null, "已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11) + "验证码：" + s);
}
......@@ -142,9 +143,6 @@ public class PackageUpgradeController extends BaseController {
return ResponseData.error("验证码已失效，请重新登入！");
}
} else {
if (selectOrder.contains("@")) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr2", selectOrder);
}
if (selectOrder.length() == 11) {
wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
}
......@@ -157,43 +155,72 @@ public class PackageUpgradeController extends BaseController {
return ResponseData.error("验证码已失效，请重新登入！");
}
}
Map<String, Object> objMap = new HashMap();
Wrapper<QueryBys> queryBysWrapper = new EntityWrapper<>();
if (selectOrder.length() == 18) {
if (!IDCardUtil.IDCardValidate(selectOrder)) {
return ResponseData.error("您的身份证输入有误，请重新输入！");
}
queryBysWrapper.eq(StringUtils.isNotBlank(selectOrder),"id_card", selectOrder);
}
if (selectOrder.length() == 11) {
queryBysWrapper.eq(StringUtils.isNotBlank(selectOrder), "phone", selectOrder);
}
if (ver.equals(verificationCode)) {
Wrapper<Package> wrapper1 = new EntityWrapper();
Wrapper<Package> wrapper2 = new EntityWrapper();
//查找存量表是否存在
List<Map<String, Object>> packageUpgrade = appMapper.selectMaps(wrapper);
if (packageUpgrade.get(0).get("cdma_disc_desc").equals("(预付费)天翼不限量99元套餐201802")) {
String is_bltc1 = packageUpgrade.get(0).get("is_bltc1").toString();
String is_bltc2 = packageUpgrade.get(0).get("is_bltc2").toString();
String is_bltc3 = packageUpgrade.get(0).get("is_bltc3").toString();
if (is_bltc1.equals("是") && is_bltc2.equals("否") && is_bltc3.equals("否")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-49元畅享");
} else if (is_bltc1.equals("否") && is_bltc2.equals("是") && is_bltc3.equals("是")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-29元畅享");
} else if (is_bltc1.equals("否") && is_bltc2.equals("是") && is_bltc3.equals("否")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-39元畅享");
}
}
wrapper1.eq("name", packageUpgrade.get(0).get("cdma_disc_desc"));
List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
List<Package> packages2 = packageMapper.selectList(wrapper2);
if (packages2.size() == 0) {
return ResponseData.error("您没有升级套餐");
}
Map<String, Object> map = packageUpgrade.get(0);
map.put("acc_nbr", map.get("acc_nbr").toString().substring(0, 3) + "****" + map.get("acc_nbr").toString().substring(7, 11));
if (map.containsKey("acc_nbr2")) {
String[] split = map.get("acc_nbr2").toString().split("@");
map.put("acc_nbr", map.get("acc_nbr2").toString().substring(0, 4) + "*****@" + split[1]);
}
if (packages1.size() == 0) {
map.put("oldPackage", null);
//查找毕业生清单表
List<Map<String,Object>> queryBys = queryBysMapper.selectMaps(queryBysWrapper);
if (queryBys.size()>0) {
objMap.put("isBys", true);
return ResponseData.success(objMap);
} else {
map.put("oldPackage", packages1.get(0));
objMap.put("isBys", false);
if (packageUpgrade.size() > 0) {
//是存量 跳转到套餐升级
objMap.put("isStock", true);
Wrapper<Package> wrapper1 = new EntityWrapper();
Wrapper<Package> wrapper2 = new EntityWrapper();
if (packageUpgrade.get(0).get("cdma_disc_desc").equals("(预付费)天翼不限量99元套餐201802")) {
String is_bltc1 = packageUpgrade.get(0).get("is_bltc1").toString();
String is_bltc2 = packageUpgrade.get(0).get("is_bltc2").toString();
String is_bltc3 = packageUpgrade.get(0).get("is_bltc3").toString();
if (is_bltc1.equals("是") && is_bltc2.equals("否") && is_bltc3.equals("否")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-49元畅享");
} else if (is_bltc1.equals("否") && is_bltc2.equals("是") && is_bltc3.equals("是")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-29元畅享");
} else if (is_bltc1.equals("否") && is_bltc2.equals("是") && is_bltc3.equals("否")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-39元畅享");
}
}
wrapper1.eq("name", packageUpgrade.get(0).get("cdma_disc_desc"));
List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
List<Package> packages2 = packageMapper.selectList(wrapper2);
if (packages2.size() == 0) {
return ResponseData.error("您没有升级套餐");
}
Map<String, Object> map = packageUpgrade.get(0);
map.put("acc_nbr", map.get("acc_nbr").toString().substring(0, 3) + "****" + map.get("acc_nbr").toString().substring(7, 11));
if (map.containsKey("acc_nbr2")) {
String[] split = map.get("acc_nbr2").toString().split("@");
map.put("acc_nbr", map.get("acc_nbr2").toString().substring(0, 4) + "*****@" + split[1]);
}
if (packages1.size() == 0) {
map.put("oldPackage", null);
} else {
map.put("oldPackage", packages1.get(0));
}
map.put("newPackage", packages2.get(0));
return ResponseData.success(map);
} else {
//不是存量 跳转到三大权益
objMap.put("isStock", false);
return ResponseData.success(objMap);
}
}
map.put("newPackage", packages2.get(0));
return ResponseData.success(map);
}
return ResponseData.error("验证码有误");
}
......
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