Skip to content

G
gdtel-gztel-school-center
Commit e6057a86 by 陈浩建
Options

单宽下单接口参数调整，selectOrder调整

parent 799bf539
Showing with 34 additions and 53 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -155,7 +155,6 @@ public class DankuanController { ...@@ -155,7 +155,6 @@ public class DankuanController {
orderView.setProductName(product.getProductTitle()); orderView.setProductName(product.getProductTitle());
orderView.setOrderDate(new Date()); orderView.setOrderDate(new Date());
orderView.setOrderUniversityName(product.getProductUniversity()); orderView.setOrderUniversityName(product.getProductUniversity());
orderView.setStatus(OrderStatus.NOTPAID.getId());
orderView.setHehuorenId(partner); orderView.setHehuorenId(partner);
orderView.setOrderRegion(product.getProductRegion()); orderView.setOrderRegion(product.getProductRegion());
orderView.setPayType("1"); orderView.setPayType("1");
...@@ -214,7 +213,13 @@ public class DankuanController { ...@@ -214,7 +213,13 @@ public class DankuanController {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1]; String id = uuid.split("-")[0] + uuid.split("-")[1];
order.setId(id); order.setId(id);
order.setOrderNumber(orderView.getOrderSeq().toString());
order.setId(id);
SimpleDateFormat sd = new SimpleDateFormat("yyyyMMdd");
SimpleDateFormat sd2 = new SimpleDateFormat("yyyyMM");
String orderNumber = "YRYM" + sd.format(new Date()) + id.substring(1, 12);
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
order.setOrderNumber(orderNumber);
order.setOrderStatus(OrderStatus.NOTPAID.getName().toString()); order.setOrderStatus(OrderStatus.NOTPAID.getName().toString());
order.setHehuorenId(userId); order.setHehuorenId(userId);
order.setCustomerName(orderView.getOrderName()); order.setCustomerName(orderView.getOrderName());
...@@ -470,7 +475,7 @@ public class DankuanController { ...@@ -470,7 +475,7 @@ public class DankuanController {
// map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser"); // map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser");
//测试地址 //测试地址
map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/dankuan/toSubmisOrderPreser.do"); map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/dankuan/toSubmisOrderPreser");
String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识 String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识
...@@ -515,33 +520,6 @@ public class DankuanController { ...@@ -515,33 +520,6 @@ public class DankuanController {
if (StringUtils.isNotBlank(msg) && msg.equals("success")) { if (StringUtils.isNotBlank(msg) && msg.equals("success")) {
dataMapping.put("status", "未支付"); dataMapping.put("status", "未支付");
orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
Order order = new Order();
order.setId(id);
order.setOrderNumber(orderView.getOrderSeq());
order.setOrderStatus(OrderStatus.NOTPAID.getName());
order.setHehuorenId(userId);
order.setCustomerName(orderView.getOrderName());
order.setContactNumber(orderView.getOrderPhone());
order.setIdCard(orderView.getOrderNumber());
order.setCreateTime(new Date());
order.setUserType("5");
order.setNetNumber(orderView.getOrderCustomerAccount());
order.setNetPassword(orderView.getOrderCustomerPwd());
order.setUserSchool(orderView.getOrderUniversityName());
order.setExpenses(orderView.getOrderSetMeal());
order.setKdOrderId(orderView.getOrderSeq());
SysUser sysUser = sysUserMapper.selectById(userId);
order.setHehuorenPhone(sysUser.getPhone());
String schoolId = appMapper.selectSchoolId(userId);
School school = schoolMapper.selectById(schoolId);
order.setHehuorenSchool(school.getSchoolName());
order.setHehuorenName(sysUser.getName());
order.setHehuorenArea(sysUser.getSubstName());
List<String> userId1 = appMapper.selectsupervisorBySchool(schoolId);
SysUser user = sysUserMapper.selectById(userId1.get(0));
order.setSupervisorName(user.getName());
order.setLzgh(school.getLzgh());
orderMapper.insert(order);
appMapper.inserOrderHis(id, "支付请求提交！", new Date(), orderView.getOrderName()); appMapper.inserOrderHis(id, "支付请求提交！", new Date(), orderView.getOrderName());
return result; return result;
} }
......
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
...@@ -330,6 +330,21 @@ public class codeManagerController { ...@@ -330,6 +330,21 @@ public class codeManagerController {
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");// 多媒体账号
// 判断是否在宽带清单中
List<Map<String, Object>> accountNumberList = orderMapper.checkOldKdUser(accountNumber);
// 查询多媒体账号在甲方提供清单中是否存在
if(!accountNumberList.isEmpty() && accountNumberList.size() > 0) { //已存在纪录
mapData.put("code", 1);
return ResponseData.error(mapData,"该账号已存在");
} else {
// 查询多媒体账号在订单表是否存在
List<Map<String, Object>> maps = orderMapper.checkOldhhrOrder(accountNumber);
if(!maps.isEmpty() && maps.size()>0){
mapData.put("code", 1);
return ResponseData.error(mapData,"该账号已存在");
}
}
// 判断身份证号是否在清单中 // 判断身份证号是否在清单中
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);
...@@ -340,15 +355,8 @@ public class codeManagerController { ...@@ -340,15 +355,8 @@ public class codeManagerController {
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);
if ((orderViews.get(0).getUptranseq()==null || StringUtils.isBlank(orderViews.get(0).getUptranseq())) if("0".equals(orderViews.get(0).getWebOrderAmount())){
&& !"0".equals(orderViews.get(0).getWebOrderAmount())) { mapData.put("orderId", order.get(0).getId());
mapData.put("orderId", orderViews.get(0).getOrderId());
mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
mapData.put("userType", order.get(0).getUserType());
mapData.put("kapin", order.get(0).getKapin());
mapData.put("code", 2);//"你已存在未支付的订单，请前往支付页面"
return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面");
} else {
mapData.put("orderSeq", orderViews.get(0).getOrderSeq()); mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
mapData.put("uptranseq", orderViews.get(0).getUptranseq()); mapData.put("uptranseq", orderViews.get(0).getUptranseq());
mapData.put("userType", order.get(0).getUserType()); mapData.put("userType", order.get(0).getUserType());
...@@ -356,22 +364,17 @@ public class codeManagerController { ...@@ -356,22 +364,17 @@ public class codeManagerController {
mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单" mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单"); return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单");
} }
} if (orderViews.get(0).getUptranseq()==null ||
StringUtils.isBlank(orderViews.get(0).getUptranseq())) {
// 判断是否在宽带清单中 mapData.put("orderId", order.get(0).getId());
List<Map<String, Object>> accountNumberList = orderMapper.checkOldKdUser(accountNumber); mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
// 查询多媒体账号在甲方提供清单中是否存在 mapData.put("userType", order.get(0).getUserType());
if(!accountNumberList.isEmpty() && accountNumberList.size() > 0) { //已存在纪录 mapData.put("kapin", order.get(0).getKapin());
mapData.put("code", 1); mapData.put("code", 2);//"你已存在未支付的订单，请前往支付页面"
return ResponseData.error(mapData,"该账号已存在"); return ResponseData.error(mapData,"你已存在未支付的订单，请前往支付页面");
} else {
// 查询多媒体账号在订单表是否存在
List<Map<String, Object>> maps = orderMapper.checkOldhhrOrder(accountNumber);
if(!maps.isEmpty() && maps.size()>0){
mapData.put("code", 1);
return ResponseData.error(mapData,"该账号已存在");
} }
} }
}catch (Exception e){ }catch (Exception e){
return ResponseData.error("连接超时，请重试"); 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