记得上下班打卡 | git大法好,push需谨慎

Commit f6752925 authored by 胡佳晨's avatar 胡佳晨

order 改回来 可以上线

parent f3ab8d48
...@@ -626,9 +626,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -626,9 +626,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
// 调用支付 // 调用支付
LinkedMultiValueMap<String, String> httpData = ObjectUtil.cloneLinkedMultiValueMapStringAndString(); LinkedMultiValueMap<String, String> httpData = ObjectUtil.cloneLinkedMultiValueMapStringAndString();
httpData.add("type", "TICKET"); httpData.add("type", "TICKET");
// httpData.add("price", orderTickets.getPriceActual().toString()); httpData.add("price", orderTickets.getPriceActual().toString());
//todo 不能上线
httpData.add("price", "0.01");
httpData.add("name", name); httpData.add("name", name);
httpData.add("detail", content); httpData.add("detail", content);
httpData.add("orderCode", orderTickets.getOrderCode()); httpData.add("orderCode", orderTickets.getOrderCode());
...@@ -755,9 +753,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -755,9 +753,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} }
LinkedMultiValueMap<String, String> httpData = ObjectUtil.cloneLinkedMultiValueMapStringAndString(); LinkedMultiValueMap<String, String> httpData = ObjectUtil.cloneLinkedMultiValueMapStringAndString();
httpData.add("type", "TICKET"); httpData.add("type", "TICKET");
// httpData.add("price", orderTicketData.getPriceActual().toString()); httpData.add("price", orderTicketData.getPriceActual().toString());
//todo 不能上线
httpData.add("price", "0.01");
httpData.add("name", name); httpData.add("name", name);
httpData.add("detail", entitiesData.getPerformanceTitle() + "-" + entitiesData.getTicketTitle() + "-" + entitiesData.getUseStart()); httpData.add("detail", entitiesData.getPerformanceTitle() + "-" + entitiesData.getTicketTitle() + "-" + entitiesData.getUseStart());
httpData.add("orderCode", orderTicketData.getOrderCode()); httpData.add("orderCode", orderTicketData.getOrderCode());
...@@ -881,11 +877,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -881,11 +877,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} }
} }
//todo 不能上线 if (orderTicketData.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) {
// if (orderTicketData.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) { log.error("订单号:" + syncOrderParam.getOrderCode() + " 价格不符");
// log.error("订单号:" + syncOrderParam.getOrderCode() + " 价格不符"); return "fail";//价格不符
// return "fail";//价格不符 }
// }
LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr(); LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr();
LinkedList<Object[]> sqlsDataA = ObjectUtil.cloneLinkedListObj(); LinkedList<Object[]> sqlsDataA = ObjectUtil.cloneLinkedListObj();
......
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