Skip to content

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

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

parent 799bf539
Showing with 67 additions and 63 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
......@@ -155,7 +155,6 @@ public class DankuanController {
orderView.setProductName(product.getProductTitle());
orderView.setOrderDate(new Date());
orderView.setOrderUniversityName(product.getProductUniversity());
orderView.setStatus(OrderStatus.NOTPAID.getId());
orderView.setHehuorenId(partner);
orderView.setOrderRegion(product.getProductRegion());
orderView.setPayType("1");
......@@ -214,7 +213,13 @@ public class DankuanController {
String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1];
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.setHehuorenId(userId);
order.setCustomerName(orderView.getOrderName());
......@@ -470,7 +475,7 @@ public class DankuanController {
// 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;//商户标识
......@@ -515,33 +520,6 @@ public class DankuanController {
if (StringUtils.isNotBlank(msg) && msg.equals("success")) {
dataMapping.put("status", "未支付");
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());
return result;
}
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
......@@ -269,7 +269,7 @@ public class RongHeController {
order.setId(id);
SimpleDateFormat sd = new SimpleDateFormat("yyyyMMdd");
SimpleDateFormat sd2 = new SimpleDateFormat("yyyyMM");
String orderNumber = "YRYM" + sd.format(new Date()) + uuid.substring(1, 12);
String orderNumber = "YRYM" + sd.format(new Date()) + id.substring(1, 12);
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
Date parse = null;
try {
......@@ -326,7 +326,8 @@ public class RongHeController {
}
@RequestMapping(value = "toSubmisOrderPreser", method = {RequestMethod.GET, RequestMethod.POST}, produces = "text/plain;charset=UTF-8")
public void toSubmisOrderPreser(HttpServletRequest request) throws Exception {
public void toSubmisOrderPreser(HttpServletRequest request){
try{
String orderseq = request.getParameter("ORDERSEQ");//orderseq
String uptranseq = request.getParameter("UPTRANSEQ"); // 穗易付平台，支付流水号uptranseq
String orderamount = request.getParameter("ORDERAMOUNT");//orderamount 价格
......@@ -355,6 +356,10 @@ public class RongHeController {
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping2), objectEntityWrapper);
List<Order> orders = orderMapper.selectList(objectEntityWrapper);
appMapper.inserOrderHis(orders.get(0).getId(), "支付完成,未下单！", new Date(), orders.get(0).getCustomerName());
}catch (Exception e){
e.getMessage();
}
}
......@@ -367,13 +372,18 @@ public class RongHeController {
* @throws Exception
*/
@PostMapping(value = "orderPay")
public ResponseData<Object> toPaymentPlatformPage(HttpServletRequest request, HttpServletResponse response) throws Exception {
public ResponseData<Object> toPaymentPlatformPage(HttpServletRequest request, HttpServletResponse response){
try {
String orderId = request.getParameter("orderId");
String ipay = request.getParameter("ipay");
String userId = request.getParameter("userId");
String rhTime = request.getParameter("rhTime");
String result = JsoupMethodZhifu(orderId, ipay, userId, request, response,rhTime);
return ResponseData.success(result);
}catch (Exception e){
e.getMessage();
}
return ResponseData.error("订单异常");
}
@RequestMapping("/selectUniversity")
public ResponseData<UniversityInfo> selectUniversity(@RequestParam("universityId") String universityId) {
......@@ -386,7 +396,8 @@ public class RongHeController {
* @Description:支付请求
*/
public String JsoupMethodZhifu(String orderId, String ipay, String userId,
HttpServletRequest request, HttpServletResponse response, String rhTime) throws Exception {
HttpServletRequest request, HttpServletResponse response, String rhTime){
try{
log.info("----------首先发送支付请求接口----------");
//查询订单信息
OrderView orderView = orderViewMapper.selectById(orderId);
......@@ -477,6 +488,9 @@ public class RongHeController {
appMapper.inserOrderHis(id, "支付请求提交！", new Date(), orderView.getOrderName());
return result;
}
}catch (Exception e){
e.getMessage();
}
return null;
}
......
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
......@@ -330,6 +330,21 @@ public class codeManagerController {
Map<String, Object> mapData = new HashMap<>();
String idCard = request.getParameter("idCard"); // 身份证号
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<>();
orderWrapper.eq(StringUtils.isNotBlank(idCard), "id_card", idCard);
......@@ -340,15 +355,8 @@ public class codeManagerController {
Wrapper<OrderView> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(order.get(0).getKdOrderId()), "orderSeq", order.get(0).getKdOrderId());
List<OrderView> orderViews = orderViewMapper.selectList(wrapper);
if ((orderViews.get(0).getUptranseq()==null || StringUtils.isBlank(orderViews.get(0).getUptranseq()))
&& !"0".equals(orderViews.get(0).getWebOrderAmount())) {
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 {
if("0".equals(orderViews.get(0).getWebOrderAmount())){
mapData.put("orderId", order.get(0).getId());
mapData.put("orderSeq", orderViews.get(0).getOrderSeq());
mapData.put("uptranseq", orderViews.get(0).getUptranseq());
mapData.put("userType", order.get(0).getUserType());
......@@ -356,22 +364,17 @@ public class codeManagerController {
mapData.put("code", 0); //不可重复下单"你已存在正在处理的订单，请勿重复下单"
return ResponseData.error(mapData,"你已存在正在处理的订单，请勿重复下单");
}
}
// 判断是否在宽带清单中
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,"该账号已存在");
if (orderViews.get(0).getUptranseq()==null ||
StringUtils.isBlank(orderViews.get(0).getUptranseq())) {
mapData.put("orderId", order.get(0).getId());
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,"你已存在未支付的订单，请前往支付页面");
}
}
}catch (Exception e){
return ResponseData.error("连接超时，请重试");
}
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
......@@ -65,7 +65,8 @@ public class IntelligenceSendOrder {
* 单宽下单公共类
* @param order hhr_order map类型
*/
public void singleBroadSendOrder(Map<String, Object> order) throws Exception {
public void singleBroadSendOrder(Map<String, Object> order) {
try {
// 初始化下单支付参数
String ORDERSEQ = "", ORDERAMOUNT = "", ORDERREQTRANSEQ = "", UPTRANSEQ = "";
......@@ -98,7 +99,7 @@ public class IntelligenceSendOrder {
universityInfoMapper.selectProductManager(order.get("hehuoren_id").toString());
if (hehuoren_id.size() > 0 && hehuoren_id.get(0).get("university_id") != null) {
Wrapper<UniversityInfo> universityInfoWrapper = new EntityWrapper<>();
universityInfoWrapper.eq("universityId", hehuoren_id.get(0).get("university_id").toString());
universityInfoWrapper.eq("university_id", hehuoren_id.get(0).get("university_id").toString());
List<Map<String, Object>> findUniversityById = universityInfoMapper.selectMaps(universityInfoWrapper);
schoolMap = findUniversityById.get(0);
} else {
......@@ -132,6 +133,12 @@ public class IntelligenceSendOrder {
productName = "校园宽带300元";
}
if(productName.equals("校园宽带0元")){
productName = "校园宽带（免月租）";
ORDERAMOUNT = "0元";
ORDERREQTRANSEQ = "00000";
UPTRANSEQ = "00000";
}
System.out.println("------" + productName);
// productName = "校园宽带30元";
for (int i = 0; i < list.size(); i++) {
......@@ -216,6 +223,9 @@ public class IntelligenceSendOrder {
+ ORDERREQTRANSEQ);
log.info("重复订单");
}
}catch (Exception e){
e.getMessage();
}
}
private void setPriceIndex(Map<String, Object> schoolMap, Map<String, Object> orderMap, String ORDERAMOUNT) {
......@@ -317,7 +327,6 @@ public class IntelligenceSendOrder {
/**
* 获取订单信息
* @param request
* @param schoolMap
* @param orderMap
* @param currentTimeStr
......@@ -350,7 +359,7 @@ public class IntelligenceSendOrder {
.setSocketTimeout(50000)
.setConnectTimeout(50000)
.setConnectionRequestTimeout(50000)
// .setProxy(proxy)
.setProxy(proxy)
.build();
CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......@@ -555,7 +564,7 @@ public class IntelligenceSendOrder {
// 产品自定义属性；暂时默认属性名称只能传“日租卡号码”
Map<String, String> propertyMap = new HashMap<String, String>();
propertyMap.put("name", "宽带速率");
String setMeal = (String) orderMap.get("order_set_meal");
String setMeal = (String) orderMap.get("orderSetMeal");
if (StringUtils.isNotBlank(setMeal)) {
setMeal = setMeal.replace("包月", "");
setMeal = setMeal.replace("包年", "");
......@@ -787,7 +796,7 @@ public class IntelligenceSendOrder {
throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(500000)
......
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