Skip to content

G
gdtel-gztel-school-center
Commit 868f60c0 by 彭祥礼
Options

Merge remote-tracking branch 'origin/master'

parents eff05540 8880a625
Showing with 103 additions and 4 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -110,7 +110,7 @@ public class DankuanController { ...@@ -110,7 +110,7 @@ public class DankuanController {
@RequestParam("orderNumber") String orderNumber, @RequestParam("orderCustomerStudentId") String orderCustomerStudentId, @RequestParam("orderNumber") String orderNumber, @RequestParam("orderCustomerStudentId") String orderCustomerStudentId,
@RequestParam("orderCustomerAccount") String orderCustomerAccount, @RequestParam("orderCustomerPwd") String orderCustomerPwd, @RequestParam("orderCustomerAccount") String orderCustomerAccount, @RequestParam("orderCustomerPwd") String orderCustomerPwd,
@RequestParam("orderSetMeal") String orderSetMeal, @RequestParam("productId") String productId, @RequestParam("orderSetMeal") String orderSetMeal, @RequestParam("productId") String productId,
@RequestParam("webOrderAmount") String webOrderAmount) { @RequestParam("webOrderAmount") String webOrderAmount, @RequestParam("partner") String partner) throws Exception {
if (!IDCardUtil.IDCardValidate(orderNumber)) { if (!IDCardUtil.IDCardValidate(orderNumber)) {
return ResponseData.error("您的身份证输入有误，请重新输入！"); return ResponseData.error("您的身份证输入有误，请重新输入！");
} }
...@@ -135,6 +135,18 @@ public class DankuanController { ...@@ -135,6 +135,18 @@ public class DankuanController {
orderV.setUptranseq(orderViews.get(0).getUptranseq()); orderV.setUptranseq(orderViews.get(0).getUptranseq());
return ResponseData.error(orderV, "当前身份证号订单已存在并完成支付！"); return ResponseData.error(orderV, "当前身份证号订单已存在并完成支付！");
} }
if ("0".equals(orderViews.get(0).getWeborderamount())) {
Wrapper<Order> wrapperO = new EntityWrapper<>();
wrapperO.eq("order_number", orderViews.get(0).getOrderseq());
wrapperO.eq("user_type", "5");
List<Order> orders = orderMapper.selectList(wrapperO);
if (orders.size() == 0) {
return ResponseData.error("当前身份证号订单异常，请联系客服！");
}
orderV.setOrderseq(orders.get(0).getId());
orderV.setUptranseq(orderViews.get(0).getOrderId().toString());
return ResponseData.error(orderV, "当前身份证号订单已存在！");
}
orderV.setOrderId(orderViews.get(0).getOrderId()); orderV.setOrderId(orderViews.get(0).getOrderId());
orderV.setOrderseq(orderViews.get(0).getOrderseq()); orderV.setOrderseq(orderViews.get(0).getOrderseq());
return ResponseData.error(orderV, "当前身份证号已有订单存在！"); return ResponseData.error(orderV, "当前身份证号已有订单存在！");
...@@ -169,6 +181,12 @@ public class DankuanController { ...@@ -169,6 +181,12 @@ public class DankuanController {
orderView.setCustomerid("xyzxyql"); orderView.setCustomerid("xyzxyql");
orderView.setOrderCustomerType("学生"); orderView.setOrderCustomerType("学生");
Integer insert = orderViewMapper.insert(orderView); Integer insert = orderViewMapper.insert(orderView);
if(webOrderAmount.equals("0")){
ResponseData<OrderView> res = createOrder(orderView, partner, orderSeq);
if(!res.isSuccess()){
return res;
}
}
if (insert == 1) { if (insert == 1) {
orderV.setOrderId(orderView.getOrderId()); orderV.setOrderId(orderView.getOrderId());
orderV.setOrderseq(orderView.getOrderseq()); orderV.setOrderseq(orderView.getOrderseq());
...@@ -177,6 +195,87 @@ public class DankuanController { ...@@ -177,6 +195,87 @@ public class DankuanController {
return ResponseData.error("提交失败！"); return ResponseData.error("提交失败！");
} }
public static ResponseData<OrderView> createOrder(OrderView orderView, String userId, String orderseq) throws Exception {
String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1];
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());*/
// 根据学校名称，获取该学校信息
Wrapper<UniversityInfo> wrapper1 = new EntityWrapper<>();
wrapper1.eq("university_name", orderView.getOrderUniversityName());
wrapper1.eq("university_region", orderView.getOrderRegion());
Map<String, Object> schoolMap = universityInfoMapper.selectMaps(wrapper1).get(0);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
String currentTimeStr = simpleDateFormat.format(new Date());
String productId = null;
if (StringUtils.isBlank(orderView.getOrderseqthd())) {
JSONObject productJsonObject = getProductId(currentTimeStr);
if (productJsonObject.toString().indexOf("list") == -1) {
return ResponseData.error("未找到产品信息，如有疑问请联系客服！");
}
JSONArray list = productJsonObject.getJSONArray("list");
String productName = "校园宽带0元";
for (int i = 0; i < list.size(); i++) {
JSONObject itmeJson = JSONObject.parseObject(list.get(i).toString());
// 判断获取的全部产品与订单产品符合的拿取对应的ID
if (itmeJson.getString("name").indexOf(productName) != -1) {
productId = itmeJson.getString("id"); // 获取对应产品ID
break;
}
}
}
String saleId = null; // 销售id
JSONObject saleJsonObject = getSaleId(productId, currentTimeStr); // 获取销售ID
log.info("----------调用智能平台的获取销售品接口返回值：" + saleJsonObject);
JSONArray saleList = saleJsonObject.getJSONArray("list");
JSONObject itmeJson = JSONObject.parseObject(saleList.get(0).toString());
saleId = itmeJson.getString("saleId");
JSONObject submitOrderJsonObject = getOrderInfo(schoolMap, orderView, currentTimeStr, productId, saleId, orderView.getOrderseq(), "", "0", "");
String orderNum = (String) submitOrderJsonObject.get("orderNumber");
if (StringUtils.isNotBlank(orderNum)) {
Wrapper<OrderView> wrapper = new EntityWrapper<>();
wrapper.eq("orderSeq", orderseq);
Map<String, Object> dataMapping1 = new HashMap<>();
dataMapping1.put("orderSeqTHD", orderNum);
dataMapping1.put("status", "已支付");
orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping1), wrapper);
order.setOrderStatus("审核中");
order.setOrderId(orderNum);
order.setThStatus(submitOrderJsonObject.get("status").toString());
orderMapper.insert(order);
appMapper.inserOrderHis(id, "待审核！", new Date(), orderView.getOrdername());
} else {
return ResponseData.error("智能平台订单创建失败，如有疑问请联系客服！");
}
return ResponseData.success(orderView,"智能平台订单创建成功");
}
@RequestMapping(value = "toSubmisOrderPreser", method = {RequestMethod.GET, RequestMethod.POST}, produces = "text/plain;charset=UTF-8") @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) throws Exception {
OrderView orderMap = null; OrderView orderMap = null;
...@@ -411,7 +510,7 @@ public class DankuanController { ...@@ -411,7 +510,7 @@ public class DankuanController {
* @version 1.0 * @version 1.0
* @exception: * @exception:
*/ */
private JSONObject getProductId(String currentTimeStr) throws Exception { private static JSONObject getProductId(String currentTimeStr) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String, String> signMap = new HashMap<String, String>();//待签名参数 Map<String, String> signMap = new HashMap<String, String>();//待签名参数
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000) RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000)
...@@ -473,7 +572,7 @@ public class DankuanController { ...@@ -473,7 +572,7 @@ public class DankuanController {
* 单宽支付平台异步更新后台地址，主要对订单进去保存和提交订单到智能平台上 * 单宽支付平台异步更新后台地址，主要对订单进去保存和提交订单到智能平台上
*/ */
@RequestMapping(value = "getSaleId", method = {RequestMethod.GET, RequestMethod.POST}, produces = "text/plain;charset=UTF-8") @RequestMapping(value = "getSaleId", method = {RequestMethod.GET, RequestMethod.POST}, produces = "text/plain;charset=UTF-8")
private JSONObject getSaleId(String productId, String currentTimeStr) throws Exception { private static JSONObject getSaleId(String productId, String currentTimeStr) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String, String> signMap = new HashMap<String, String>();//待签名参数 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);
...@@ -535,7 +634,7 @@ public class DankuanController { ...@@ -535,7 +634,7 @@ public class DankuanController {
* @version 1.0 * @version 1.0
* @exception: * @exception:
*/ */
private JSONObject getOrderInfo(Map<String, Object> schoolMap, OrderView orderMap, String currentTimeStr, String productId, String saleId, String ORDERSEQ, String UPTRANSEQ, String ORDERAMOUNT, String ORDERREQTRANSEQ) throws Exception { private static JSONObject getOrderInfo(Map<String, Object> schoolMap, OrderView orderMap, String currentTimeStr, String productId, String saleId, String ORDERSEQ, String UPTRANSEQ, String ORDERAMOUNT, String ORDERREQTRANSEQ) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000) RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(50000)
.setConnectTimeout(50000).setConnectionRequestTimeout(50000).build(); .setConnectTimeout(50000).setConnectionRequestTimeout(50000).build();
......
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