Skip to content

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

融合下单 -》 修改参数

parent ab15447c
Showing with 18 additions and 8 deletions
apply-net/src/main/java/com/winsun/controller/RongHeController.java
...@@ -381,6 +381,11 @@ public class RongHeController { ...@@ -381,6 +381,11 @@ public class RongHeController {
Wrapper<OrderView> wrapper = new EntityWrapper<>(); Wrapper<OrderView> wrapper = new EntityWrapper<>();
wrapper.eq("orderSeq", orderseq); wrapper.eq("orderSeq", orderseq);
List<OrderView> orderViews = orderViewMapper.selectList(wrapper);
if(orderViews.size()>0){
if(!"".equals(orderViews.get(0).getUptranseq())&&uptranseq.equals(orderViews.get(0).getUptranseq())){
}else {
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("orderReqtranSeq", orderreqtranseq); dataMapping.put("orderReqtranSeq", orderreqtranseq);
dataMapping.put("uptranseq", uptranseq); dataMapping.put("uptranseq", uptranseq);
...@@ -394,8 +399,11 @@ public class RongHeController { ...@@ -394,8 +399,11 @@ public class RongHeController {
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping2), objectEntityWrapper); orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping2), objectEntityWrapper);
List<Order> orders = orderMapper.selectList(objectEntityWrapper); List<Order> orders = orderMapper.selectList(objectEntityWrapper);
appMapper.inserOrderHis(orders.get(0).getId(), "支付完成,未下单！", new Date(), orders.get(0).getCustomerName()); appMapper.inserOrderHis(orders.get(0).getId(), "支付完成,未下单！", new Date(), orders.get(0).getCustomerName());
}
}
}catch (Exception e){ }catch (Exception e){
e.getMessage(); e.printStackTrace();
} }
} }
...@@ -478,11 +486,14 @@ public class RongHeController { ...@@ -478,11 +486,14 @@ public class RongHeController {
* 测试后提交代码要恢复正式环境地址 * 测试后提交代码要恢复正式环境地址
*/ */
String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?kdId=" + orderSeq; String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?kdId=" + orderSeq;
// 测试
// String MERCHANTURL = "http://3715zj2369.qicp.vip:52511/#/hhr/kdyToSuccessPage?kdId=" + orderSeq;
map.put("MERCHANTURL", MERCHANTURL); map.put("MERCHANTURL", MERCHANTURL);
// 融合回调后端接口地址 // 融合回调后端接口地址
//正式地址 //正式地址
map.put("BACKDROPURL", "https://dx.dianyuanjiangli.com/app/ciop/rongHe/toSubmisOrderPreser"); map.put("BACKDROPURL", "https://dx.dianyuanjiangli.com/app/ciop/rongHe/toSubmisOrderPreser");
// 测试
// map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/rongHe/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;//商户标识
//* 将值转换为大写 *//* //* 将值转换为大写 *//*
map.put("MAC", MD5Utils.md5(str).toUpperCase()); map.put("MAC", MD5Utils.md5(str).toUpperCase());
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
...@@ -591,7 +591,6 @@ public class IntelligenceSendOrder { ...@@ -591,7 +591,6 @@ public class IntelligenceSendOrder {
propertyMap4.put("name", "用户类型"); propertyMap4.put("name", "用户类型");
propertyMap4.put("value", universityUserType); propertyMap4.put("value", universityUserType);
Map<String, String> propertyMap5 = new HashMap<String, String>(); Map<String, String> propertyMap5 = new HashMap<String, String>();
propertyMap5.put("name", "月租类型");
propertyMap5.put("name", "月租类型"); propertyMap5.put("name", "月租类型");
propertyMap5.put("value", universityMonthlyRentType); propertyMap5.put("value", universityMonthlyRentType);
...@@ -1040,13 +1039,13 @@ public class IntelligenceSendOrder { ...@@ -1040,13 +1039,13 @@ public class IntelligenceSendOrder {
} }
} }
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
// HttpHost proxy = new HttpHost("172.18.101.170", 3128); HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(500000) .setSocketTimeout(500000)
.setConnectTimeout(500000) .setConnectTimeout(500000)
.setConnectionRequestTimeout(500000) .setConnectionRequestTimeout(500000)
// .setProxy(proxy) .setProxy(proxy)
.build(); .build();
CloseableHttpClient httpclient = CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build(); HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
...@@ -1407,7 +1406,7 @@ public class IntelligenceSendOrder { ...@@ -1407,7 +1406,7 @@ public class IntelligenceSendOrder {
propertyMap11.put("value", (String) orderMap.get("orderCustomerPwd")); propertyMap11.put("value", (String) orderMap.get("orderCustomerPwd"));
Map<String, Object> propertyMap12 = new HashMap<String, Object>(); Map<String, Object> propertyMap12 = new HashMap<String, Object>();
propertyMap12.put("name", "学生证号"); propertyMap12.put("name", "学生证号");
propertyMap12.put("value", (String) orderMap.get("order_customerStudentId")); propertyMap12.put("value", (String) orderMap.get("orderCustomerStudentId"));
Map<String, Object> propertyMap13 = new HashMap<String, Object>(); Map<String, Object> propertyMap13 = new HashMap<String, Object>();
propertyMap13.put("name", "宽带首月费用类型"); propertyMap13.put("name", "宽带首月费用类型");
propertyMap13.put("value", universityChargeMode); propertyMap13.put("value", universityChargeMode);
...@@ -1422,7 +1421,7 @@ public class IntelligenceSendOrder { ...@@ -1422,7 +1421,7 @@ public class IntelligenceSendOrder {
if (orderMap.get("webOrderAmount").toString().equals("0")) { if (orderMap.get("webOrderAmount").toString().equals("0")) {
propertyMap17.put("value", order.getBusinessNumber()); propertyMap17.put("value", order.getBusinessNumber());
} else { } else {
propertyMap17.put("value", orderMap.get("order_customer_remarks")); propertyMap17.put("value", orderMap.get("orderCustomerRemarks"));
} }
addPropertyList.add(propertyMap15); addPropertyList.add(propertyMap15);
......
task/src/main/java/com/winsun/TimingTask/RhZhiNenTask.java
...@@ -58,7 +58,7 @@ public class RhZhiNenTask { ...@@ -58,7 +58,7 @@ public class RhZhiNenTask {
* 下发智能平台订单 * 下发智能平台订单
* *
*/ */
@Scheduled(cron = "0 0/6 * * * ? ") @Scheduled(cron = "0 0/1 * * * ? ")
// @Scheduled(fixedRate=2800000) // @Scheduled(fixedRate=2800000)
public void sendZhiNengOrder() { public void sendZhiNengOrder() {
log.info("智能平台定时器下单启动"); log.info("智能平台定时器下单启动");
......
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