Skip to content

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

app开发

parent 361d0e68
Showing with 285 additions and 46 deletions
apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -5,11 +5,18 @@ import com.baomidou.mybatisplus.mapper.Wrapper; ...@@ -5,11 +5,18 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.auth.core.annotion.Permission; 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.auth.core.user.beans.SysUser;
import com.winsun.auth.core.user.mapper.SysUserMapper;
import com.winsun.bean.Order;
import com.winsun.bean.Package; import com.winsun.bean.Package;
import com.winsun.bean.PackageUpgrade; import com.winsun.bean.PackageUpgrade;
import com.winsun.bean.YangChengTong;
import com.winsun.constant.OrderStatus;
import com.winsun.constant.UserType;
import com.winsun.mapper.OrderMapper;
import com.winsun.mapper.PackageMapper; import com.winsun.mapper.PackageMapper;
import com.winsun.mapper.PackageUpgradeMapper; import com.winsun.mapper.PackageUpgradeMapper;
import com.winsun.utils.MessageUtil; import com.winsun.mapper.YangChengTongrMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,8 +27,8 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -20,8 +27,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.text.SimpleDateFormat;
import java.util.Map; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
...@@ -36,95 +43,199 @@ public class PackageUpgradeController extends BaseController { ...@@ -36,95 +43,199 @@ public class PackageUpgradeController extends BaseController {
private static PackageMapper packageMapper; private static PackageMapper packageMapper;
private static YangChengTongrMapper yangChengTongrMapper;
private static OrderMapper orderMapper;
private static SysUserMapper userMapper;
@Autowired @Autowired
@Qualifier("redisStringTemplate") @Qualifier("redisStringTemplate")
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
@Autowired @Autowired
public PackageUpgradeController(PackageUpgradeMapper packageUpgradeMapper,PackageMapper packageMapper) { public PackageUpgradeController(PackageUpgradeMapper packageUpgradeMapper, PackageMapper packageMapper,
YangChengTongrMapper yangChengTongrMapper, OrderMapper orderMapper
, SysUserMapper userMapper) {
PackageUpgradeController.packageUpgradeMapper = packageUpgradeMapper; PackageUpgradeController.packageUpgradeMapper = packageUpgradeMapper;
PackageUpgradeController.packageMapper = packageMapper; PackageUpgradeController.packageMapper = packageMapper;
PackageUpgradeController.yangChengTongrMapper = yangChengTongrMapper;
PackageUpgradeController.orderMapper = orderMapper;
PackageUpgradeController.userMapper = userMapper;
} }
@Permission(menuname = "发送验证码", value = "sendVerificationCode", method = RequestMethod.POST) @Permission(menuname = "发送验证码", value = "sendVerificationCode", method = RequestMethod.POST)
public ResponseData<String> sendVerificationCode(@RequestParam("selectOrder") String selectOrder) { public ResponseData<String> sendVerificationCode(@RequestParam("selectOrder") String selectOrder) {
Wrapper<PackageUpgrade> wrapper = new EntityWrapper(); Wrapper<PackageUpgrade> wrapper = new EntityWrapper();
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 = packageUpgrade.get(0).get("acc_nbr").toString();
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)); return ResponseData.success("已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11));
} }
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 = packageUpgrade.get(0).get("acc_nbr").toString();
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)); return ResponseData.success("已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11));
} }
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 = packageUpgrade.get(0).get("acc_nbr").toString();
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)); return ResponseData.success("已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11));
} }
return ResponseData.error("当前查询条件有误！"); return ResponseData.error("当前查询条件有误！");
} }
@Permission(menuname = "查询宽带信息", value = "selectPackage", method = RequestMethod.POST) @Permission(menuname = "查询宽带信息", value = "selectPackage", method = RequestMethod.POST)
public ResponseData<Map<String,Object>> selectPackage(@RequestParam("selectOrder") String selectOrder,@RequestParam("verificationCode") String verificationCode) { public ResponseData<Map<String, Object>> selectPackage(@RequestParam("selectOrder") String selectOrder, @RequestParam("verificationCode") String verificationCode) {
if(redisTemplate.opsForValue().get(selectOrder).toString().equals(verificationCode)){ if (redisTemplate.opsForValue().get(selectOrder).toString().equals(verificationCode)) {
Wrapper<PackageUpgrade> wrapper = new EntityWrapper(); Wrapper<PackageUpgrade> wrapper = new EntityWrapper();
Wrapper<Package> wrapper1 = new EntityWrapper(); Wrapper<Package> wrapper1 = new EntityWrapper();
Wrapper<Package> wrapper2 = new EntityWrapper(); Wrapper<Package> wrapper2 = new EntityWrapper();
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);
wrapper1.eq("name",packageUpgrade.get(0).get("cdma_disc_desc")); wrapper1.eq("name", packageUpgrade.get(0).get("cdma_disc_desc"));
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(wrapper1); List<Package> packages2 = packageMapper.selectList(wrapper2);
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));
return ResponseData.success(map); return ResponseData.success(map);
} }
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);
wrapper1.eq("name",packageUpgrade.get(0).get("cdma_disc_desc")); wrapper1.eq("name", packageUpgrade.get(0).get("cdma_disc_desc"));
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(wrapper1); List<Package> packages2 = packageMapper.selectList(wrapper2);
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));
return ResponseData.success(map); return ResponseData.success(map);
} }
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);
wrapper1.eq("name",packageUpgrade.get(0).get("cdma_disc_desc")); wrapper1.eq("name", packageUpgrade.get(0).get("cdma_disc_desc"));
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(wrapper1); List<Package> packages2 = packageMapper.selectList(wrapper2);
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));
return ResponseData.success(map); return ResponseData.success(map);
} }
} }
return ResponseData.error("验证码有误！"); return ResponseData.error("验证码有误！");
} }
@Permission(menuname = "提交套餐升级", value = "oldUserUpade", method = RequestMethod.POST)
public ResponseData<String> oldUserUpade(@RequestParam("contactNumber") String contactNumber, @RequestParam("oldUserId") String oldUserId
, @RequestParam("businessNumber") String businessNumber, @RequestParam("cardId") String cardId
, @RequestParam("customerName") String customerName, @RequestParam("userId") String userId
, @RequestParam("nowPackage") String nowPackage, @RequestParam("partner") String partner
, @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 = "idCard", required = false) String idCard,@RequestParam(value = "custName", required = false) String custName
, @RequestParam(value = "userSchool", required = false) String userSchool) {
Wrapper<Order> wrapper = new EntityWrapper();
wrapper.eq("business_number",businessNumber);
wrapper.eq("user_type",UserType.OLDCUSTOMER.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(OrderStatus.PENDINGACCEPTANCE.getName());
order.setHehuorenId(partner);
order.setPackageId(cardId);
order.setCustomerName(customerName);
order.setBusinessNumber(businessNumber);
order.setContactNumber(contactNumber);
Date date = new Date();
order.setCreateTime(date);
order.setNowPackage(nowPackage);
order.setBusinessPackage(businessPackage);
order.setUserId(userId);
order.setUserType(UserType.OLDCUSTOMER.getId());
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 school = packageUpgradeMapper.selectShoolByUserId(partner);
order.setHehuorenSchool(school);
order.setHehuorenPhone(sysUser.getPhone());
Integer insert = orderMapper.insert(order);
// MessageUtil.sent(contactNumber,"4","");
if(StringUtils.isNotBlank(mark)){
String id1 = UUID.randomUUID().toString();
order.setId(id1);
String s1 = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
order.setOrderNumber("YRYM" + format + s1);
order.setUserType(UserType.YCTK.getId());
order.setAddress(addRess);
order.setBusinessPackage("天翼羊城通手机卡业务");
order.setUserSchool(userSchool);
insert += orderMapper.insert(order);
YangChengTong yangChengTong = new YangChengTong();
yangChengTong.setSchool(school);
yangChengTong.setCustomer_name(custName);
yangChengTong.setContact_address(addRess);
yangChengTong.setContact_phone(contactNumber);
yangChengTong.setCustomer_phone(businessNumber);
insert +=yangChengTongrMapper.insert(yangChengTong);
}
if (insert == 1) {
packageUpgradeMapper.inserOrderHis(id, "下单成功", date);
return ResponseData.success(id);
}
if (insert == 2) {
return ResponseData.success("下单成功！");
}
return ResponseData.error("升级失败！");
}
@Permission(menuname = "查询订单详情", value = "selectOrderInfo", method = RequestMethod.POST)
public ResponseData<Order> selectOrderInfo(@RequestParam("orderId") String orderId) {
Order order = orderMapper.selectById(orderId);
return ResponseData.success(order);
}
@Permission(menuname = "查询用户详情", value = "selectOrderInfo", method = RequestMethod.POST)
public ResponseData<SysUser> selectUserInfo(@RequestParam("partner") String partner) {
SysUser sysUser = userMapper.selectById(partner);
return ResponseData.success(sysUser);
}
@Permission(menuname = "查询订单历史状态", value = "selectOrderInfo", method = RequestMethod.POST)
public ResponseData<List<Map<String, Object>>> selectOrderHis(@RequestParam("orderId") String orderId) {
List<Map<String, Object>> list = packageUpgradeMapper.selectOrderHis(orderId);
return ResponseData.success(list);
}
} }
common/src/main/java/com/winsun/bean/Order.java
...@@ -226,7 +226,7 @@ public class Order implements Serializable{ ...@@ -226,7 +226,7 @@ public class Order implements Serializable{
/** /**
* 学校 * 学校
*/ */
//private String userSchool; private String userSchool;
/** /**
* 学生证审核状态， 0 未审核，1已审核 * 学生证审核状态， 0 未审核，1已审核
......
common/src/main/java/com/winsun/bean/YangChengTong.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_yangchengtong")
public class YangChengTong implements Serializable {
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private int id;
/**
*姓名
*/
private String customer_name;
/**
* 登记的手机号
*/
private String customer_phone;
/**
* 学校
*/
private String school;
/**
* '联系方式 手机号'
*/
private String contact_phone;
/**
* 联系地址
*/
private String contact_address;
}
common/src/main/java/com/winsun/constant/UserType.java 0 → 100644
package com.winsun.constant;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
* 排序
* @author Liph
* @datetime 2019-09-19/9/27 11:19
*/
public enum UserType {
//1：老客户；0新客户;2:老客户续约3：融合 4：抽奖；5：单宽；6：羊城通卡
OLDCUSTOMER("1", "老客户"),
NEWCUSTOMER("0", "新客户"),
OLDCUSTOMERRENEW ("2", "老客户续约"),
RH("3", "融合"),
LUCKYDRAW("4", "抽奖"),
DY("5", "单宽"),
YCTK("6", "羊城通卡");
UserType(String id, String name) {
this.id = id;
this.name = name;
};
private static final Map<String, UserType> DATAS = new HashMap<>();
static {
Arrays.asList(values()).forEach(data -> DATAS.put(data.getId(), data));
}
private String id;
private String name;
public String getId() {
return id;
}
public String getName() {
return name;
}
public static UserType findById(String id) {
return DATAS.getOrDefault(id, null);
}
}
common/src/main/java/com/winsun/mapper/PackageUpgradeMapper.java
...@@ -2,12 +2,14 @@ package com.winsun.mapper; ...@@ -2,12 +2,14 @@ package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.PackageUpgrade; import com.winsun.bean.PackageUpgrade;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -21,4 +23,21 @@ public interface PackageUpgradeMapper extends BaseMapper<PackageUpgrade> { ...@@ -21,4 +23,21 @@ 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}) ")
Integer inserOrderHis(@Param("id")String id, @Param("status")String status, @Param("date")Date date);
@Insert("select * from `hhr_order_history` where oredr_id = #{oredrId}")
List<Map<String,Object>> selectOrderHis(String oredrId);
@Select("select school_id schoolId from `hhr_user_school` where user_id = #{partner}")
String selectSchoolId(String partner);
@Select("select package_id packageId from `hhr_user_school` where school_id = #{schoolId}")
List<String> selectPackageId(String schoolId);
} }
common/src/main/java/com/winsun/mapper/YangChengTongrMapper.java 0 → 100644
package com.winsun.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.winsun.bean.YangChengTong;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
@Mapper
@Component
public interface YangChengTongrMapper extends BaseMapper<YangChengTong> {
}
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