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

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

修改 同步大麦

parent aeb36b9b
...@@ -329,7 +329,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -329,7 +329,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} }
orderTickets.setPriceActual(orderTickets.getPriceTotal()); orderTickets.setPriceActual(orderTickets.getPriceTotal());
orderTickets.setPriceVoucher(BigDecimal.valueOf(0.0)); orderTickets.setPriceVoucher(BigDecimal.valueOf(0.0));
orderTickets.setPriceExpress(payOrderParam.getIsExpress() == 1?ticketData.getPriceExpress():BigDecimal.valueOf(0)); orderTickets.setPriceExpress(payOrderParam.getIsExpress() == 1 ? ticketData.getPriceExpress() : BigDecimal.valueOf(0));
orderTickets.setPriceRefund(BigDecimal.valueOf(0.0)); orderTickets.setPriceRefund(BigDecimal.valueOf(0.0));
orderTickets.setRefundNumber(0); orderTickets.setRefundNumber(0);
orderTickets.setPayType(payOrderParam.getPayType()); orderTickets.setPayType(payOrderParam.getPayType());
...@@ -621,7 +621,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -621,7 +621,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
httpData.add("returnUrl", payAgainParam.getReturnUrl() + payAgainParam.getOrderId()); httpData.add("returnUrl", payAgainParam.getReturnUrl() + payAgainParam.getOrderId());
} }
String returnData = HttpUtil.post(payUrl , httpData); String returnData = HttpUtil.post(payUrl, httpData);
PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class); PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
payResultVo.getData().setOrderId(orderTicketData.getOrderTicketsId()); payResultVo.getData().setOrderId(orderTicketData.getOrderTicketsId());
payResultVo.getData().setPrice(orderTicketData.getPriceActual()); payResultVo.getData().setPrice(orderTicketData.getPriceActual());
...@@ -656,27 +656,27 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -656,27 +656,27 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
sqlsDataA.add(orderTickets.getPayAgainObject(strTime, strTime)); sqlsDataA.add(orderTickets.getPayAgainObject(strTime, strTime));
sqls.add(SqlMapping.get("kylin_order_ticket_status.payAgain")); sqls.add(SqlMapping.get("kylin_order_ticket_status.payAgain"));
LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj(); LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj();
Object[] objectB= ObjectUtil.cloneObjectsArray(4); Object[] objectB = ObjectUtil.cloneObjectsArray(4);
objectB[0]= orderTickets.getUpdatedAt(); objectB[0] = orderTickets.getUpdatedAt();
objectB[1]= orderTickets.getOrderTicketsId(); objectB[1] = orderTickets.getOrderTicketsId();
objectB[2]= strTime; objectB[2] = strTime;
objectB[3]= strTime; objectB[3] = strTime;
sqlsDataB.add(objectB); sqlsDataB.add(objectB);
sqls.add(SqlMapping.get("kylin_order_ticket_relation.payAgain")); sqls.add(SqlMapping.get("kylin_order_ticket_relation.payAgain"));
LinkedList<Object[]> sqlsDataC = ObjectUtil.cloneLinkedListObj(); LinkedList<Object[]> sqlsDataC = ObjectUtil.cloneLinkedListObj();
Object[] objectC = ObjectUtil.cloneObjectsArray(4); Object[] objectC = ObjectUtil.cloneObjectsArray(4);
objectC[0]= orderTickets.getUpdatedAt(); objectC[0] = orderTickets.getUpdatedAt();
objectC[1]= orderTickets.getOrderTicketsId(); objectC[1] = orderTickets.getOrderTicketsId();
objectC[2]= strTime; objectC[2] = strTime;
objectC[3]= strTime; objectC[3] = strTime;
sqlsDataC.add(objectC); sqlsDataC.add(objectC);
sqls.add(SqlMapping.get("kylin_order_ticket_entities.payAgain")); sqls.add(SqlMapping.get("kylin_order_ticket_entities.payAgain"));
LinkedList<Object[]> sqlsDataD = ObjectUtil.cloneLinkedListObj(); LinkedList<Object[]> sqlsDataD = ObjectUtil.cloneLinkedListObj();
Object[] objectD = ObjectUtil.cloneObjectsArray(4); Object[] objectD = ObjectUtil.cloneObjectsArray(4);
objectD[0]= orderTickets.getUpdatedAt(); objectD[0] = orderTickets.getUpdatedAt();
objectD[1]= orderTickets.getOrderTicketsId(); objectD[1] = orderTickets.getOrderTicketsId();
objectD[2]= strTime; objectD[2] = strTime;
objectD[3]= strTime; objectD[3] = strTime;
sqlsDataD.add(objectD); sqlsDataD.add(objectD);
String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD); String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD);
...@@ -742,7 +742,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -742,7 +742,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
if (orderTicketData.getStatus() == 2) { if (orderTicketData.getStatus() == 2) {
orderUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(), null); orderUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(), null);
log.error("订单号为 {} 的订单超时支付", syncOrderParam.getOrderCode()); log.error("订单号为 {} 的订单超时支付", syncOrderParam.getOrderCode());
orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId(),syncOrderParam.getPaymentId(),syncOrderParam.getPaymentType()); orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId(), syncOrderParam.getPaymentId(), syncOrderParam.getPaymentType());
} else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) { } else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode()); log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
} else { } else {
...@@ -766,10 +766,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -766,10 +766,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay")); sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay"));
Object[] objectC = ObjectUtil.cloneObjectsArray(4); Object[] objectC = ObjectUtil.cloneObjectsArray(4);
objectC[0]= orderTickets.getUpdatedAt(); objectC[0] = orderTickets.getUpdatedAt();
objectC[1]= orderTickets.getOrderTicketsId(); objectC[1] = orderTickets.getOrderTicketsId();
objectC[2]= strTime; objectC[2] = strTime;
objectC[3]= strTime; objectC[3] = strTime;
sqlsDataC.add(objectC); sqlsDataC.add(objectC);
orderTicketEntities.setOrderId(orderTicketData.getOrderTicketsId()); orderTicketEntities.setOrderId(orderTicketData.getOrderTicketsId());
...@@ -850,12 +850,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -850,12 +850,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} }
// 大麦回调 // 大麦回调
sycDamaiOrder(orderTickets.getOrderTicketsId(),orderTicketData.getIsMember()); sycDamaiOrder(orderTickets.getOrderTicketsId(), orderTicketData.getIsMember());
} }
log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, "")); log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, ""));
return "success"; return "success";
} catch (Exception e) { } catch (Exception e) {
log.error("SYNCE ORDER E = " , e); log.error("SYNCE ORDER E = ", e);
e.printStackTrace(); e.printStackTrace();
return "fail"; return "fail";
} }
...@@ -892,7 +892,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -892,7 +892,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} }
} }
private boolean sycDamaiOrder(String orderId,int isMember) { private boolean sycDamaiOrder(String orderId, int isMember) {
try { try {
KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(orderId); KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(orderId);
KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId()); KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());
...@@ -980,6 +980,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -980,6 +980,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} }
return true; return true;
} catch (Exception e) { } catch (Exception e) {
log.info("error data =", e);
return false; return false;
} }
} }
......
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