提交 order

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -138,6 +138,11 @@ public class KylinOrderTickets implements Serializable {
      */
     private String paymentType;
 
+    /**
+     * 支付的订单号
+     */
+    private String paymentId;
+
     /**
      * 支付时间
      */
@@ -240,7 +245,7 @@ public class KylinOrderTickets implements Serializable {
      */
     public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId,updateTime,createTime
+                paymentId,paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId,updateTime,createTime
         };
     }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -494,6 +494,7 @@ CREATE TABLE `kylin_order_tickets`
     `refund_number`        int(32)          NOT NULL DEFAULT 0 COMMENT '退款张数',
     `pay_type`             varchar(255)     NOT NULL DEFAULT '' COMMENT '选择支付方式',
     `payment_type`         varchar(255)     NULL     DEFAULT '' COMMENT '实际支付方式',
+    `payment_id`           varchar(255)     NULL     DEFAULT '' COMMENT '支付的订单号',
     `time_pay`             varchar(255)     NULL     DEFAULT '' COMMENT '支付时间',
     `express_contacts`     varchar(255)     NOT NULL DEFAULT '' COMMENT '收货人',
     `express_address`      varchar(255)     NOT NULL DEFAULT '' COMMENT '收货地址',

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -534,18 +534,21 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         httpData.add("price", orderTickets.getPriceActual().toString());
         httpData.add("name", useTime + ticketData.getTitle() + "-" + performanceData.getTitle());
         httpData.add("detail", performanceData.getTitle() + "-" + ticketData.getTitle() + "-" + useTime);
-        httpData.add("order_code", orderTickets.getOrderCode());
-        httpData.add("client_ip", CurrentUtil.getCliIpAddr());
-        httpData.add("notify_url", synUrl);
-        httpData.add("create_date", orderTickets.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        httpData.add("expire_time", (orderTickets.getPayCountdownMinute()) + "");
+        httpData.add("orderCode", orderTickets.getOrderCode());
+        httpData.add("clientIp", CurrentUtil.getCliIpAddr());
+        httpData.add("notifyUrl", synUrl);
+        httpData.add("createDate", orderTickets.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        httpData.add("expireTime", (orderTickets.getPayCountdownMinute()) + "");
+        httpData.add("payType", payOrderParam.getPayType());
+        httpData.add("deviceFrom", payOrderParam.getDeviceFrom());
 
         if (payOrderParam.getDeviceFrom().equals("js") || payOrderParam.getDeviceFrom().equals("applet")) {
-            httpData.add("open_id", payOrderParam.getOpenId());
+            httpData.add("openId", payOrderParam.getOpenId());
         }
+
         if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) {
-            httpData.add("show_url", payOrderParam.getShowUrl() + orderTicketId);
-            httpData.add("return_url", payOrderParam.getReturnUrl() + orderTicketId);
+            httpData.add("showUrl", payOrderParam.getShowUrl() + orderTicketId);
+            httpData.add("returnUrl", payOrderParam.getReturnUrl() + orderTicketId);
         }
 
         currentTime = System.currentTimeMillis();
@@ -636,17 +639,22 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 httpData.add("price", orderTicketData.getPriceActual().toString());
                 httpData.add("name", entitiesData.getUseStart() + "" + entitiesData.getPerformanceTitle());
                 httpData.add("detail", entitiesData.getPerformanceTitle() + "-" + entitiesData.getTicketTitle() + "-" + entitiesData.getUseStart());
-                httpData.add("order_code", orderTicketData.getOrderCode());
-                httpData.add("client_ip", CurrentUtil.getCliIpAddr());
-                httpData.add("notify_url", synUrl);
-                httpData.add("create_date", orderTicketData.getCreatedAt());
-                httpData.add("expire_time", orderTicketData.getPayCountdownMinute().toString());
+                httpData.add("orderCode", orderTicketData.getOrderCode());
+                httpData.add("clientIp", CurrentUtil.getCliIpAddr());
+                httpData.add("notifyUrl", synUrl);
+                httpData.add("createDate", orderTicketData.getCreatedAt());
+                httpData.add("expireTime", orderTicketData.getPayCountdownMinute().toString());
+
+                httpData.add("payType", payAgainParam.getPayType());
+                httpData.add("deviceFrom", payAgainParam.getDeviceFrom());
 
-                httpData.add("open_id", payAgainParam.getOpenId());
+                if (payAgainParam.getDeviceFrom().equals("js") || payAgainParam.getDeviceFrom().equals("applet")) {
+                    httpData.add("openId", payAgainParam.getOpenId());
+                }
 
                 if (payAgainParam.getPayType().equals("alipay") && payAgainParam.getDeviceFrom().equals("wap")) {
-                    httpData.add("show_url", payAgainParam.getShowUrl() + payAgainParam.getOrderId());
-                    httpData.add("return_url", payAgainParam.getReturnUrl() + payAgainParam.getOrderId());
+                    httpData.add("showUrl", payAgainParam.getShowUrl() + payAgainParam.getOrderId());
+                    httpData.add("returnUrl", payAgainParam.getReturnUrl() + payAgainParam.getOrderId());
                 }
 
                 String returnData = HttpUtil.post(payUrl + payAgainParam.getDeviceFrom() + "/" + payAgainParam.getPayType(), httpData);
@@ -765,6 +773,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 orderTickets.setTimePay(timePay);
                 orderTickets.setQrCode(IDGenerator.ticketQrCode(orderTicketData.getOrderTicketsId()));
                 orderTickets.setUpdatedAt(now);
+                orderTickets.setPaymentId(syncOrderParam.getPayment_id());
                 sqls.add(SqlMapping.get("kylin_order_ticket.synPay"));
                 sqlsDataA.add(orderTickets.getSynOrderObject(strTime, strTime));
 

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/sqlmap.properties

@@ -18,7 +18,7 @@ kylin_order_ticket_entities.payAgain=UPDATE kylin_order_ticket_entities SET upda
 
 
 # ------------------------支付回调----------------------------
-kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_id =? ,payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)