Merge remote-tracking branch 'origin/dev-smile' into dev-smile

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

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

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

@@ -5,7 +5,7 @@ kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id
 bi_ticket_access_records.insert=INSERT INTO `bi_ticket_access_records` (  `user_id`,  `access_type`,  `performance_id`,  `order_id`,  `order_code`,`ip_address`,  `area`,  `area_province`,  `area_city`,  `area_county`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?);
 # ------------------------创建订单----------------------------
 kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code,ip_address,area,area_province,area_city,area_county)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at,agent_status,agent_distributions.agent_id_master,agent_distributions_master)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at,agent_status,agent_distributions,agent_id_master,agent_distributions_master)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status , produce_code ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_coupon.add=INSERT INTO kylin_order_coupons(order_id ,coupon_code ,coupon_type ,coupon_price,created_at,updated_at)VALUES(?,?,?,?,?,?)