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

Commit 15f601a6 authored by 胡佳晨's avatar 胡佳晨

vo

parent 6c607435
...@@ -354,9 +354,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -354,9 +354,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
HashMap<String, Object> hashMap = orderUtils.useCoupon(payOrderParam.getVoucherCode(), content, orderTickets.getPriceTotal(),payOrderParam.getPerformanceId(),payOrderParam.getTimeId(),payOrderParam.getTicketId()); HashMap<String, Object> hashMap = orderUtils.useCoupon(payOrderParam.getVoucherCode(), content, orderTickets.getPriceTotal(),payOrderParam.getPerformanceId(),payOrderParam.getTimeId(),payOrderParam.getTicketId());
BigDecimal priceVoucher = (BigDecimal) hashMap.get("voucher"); BigDecimal priceVoucher = (BigDecimal) hashMap.get("voucher");
Integer typeVoucher = (Integer) hashMap.get("type"); Integer typeVoucher = (Integer) hashMap.get("type");
if (typeVoucher.equals(-1)) { // if (typeVoucher.equals(-1)) {
throw new Exception("券不可用"); // throw new Exception("券不可用");
} // }
orderTickets.setPriceVoucher(priceVoucher); orderTickets.setPriceVoucher(priceVoucher);
KylinOrderCoupons couponsVoucher = KylinOrderCoupons.getNew(); KylinOrderCoupons couponsVoucher = KylinOrderCoupons.getNew();
...@@ -592,7 +592,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -592,7 +592,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
syncOrderParam.setOrderCode(orderTickets.getOrderCode()); syncOrderParam.setOrderCode(orderTickets.getOrderCode());
syncOrderParam.setPaymentAt(DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmss)); syncOrderParam.setPaymentAt(DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmss));
syncOrderParam.setCode(orderTickets.getPayCode()); syncOrderParam.setCode(orderTickets.getPayCode());
syncOrderParam.setPrice(orderTickets.getPrice()); syncOrderParam.setPrice(orderTickets.getPriceActual());
syncOrderParam.setPaymentId("FREE_PAYMENT_ID"); syncOrderParam.setPaymentId("FREE_PAYMENT_ID");
syncOrderParam.setPaymentType(orderTickets.getPaymentType()); syncOrderParam.setPaymentType(orderTickets.getPaymentType());
syncOrderParam.setStatus(1); syncOrderParam.setStatus(1);
......
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