Merge branch 'dev_pvuv' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_pvuv

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -226,7 +226,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
     public HashMap<String, Object> ticketTimesPartner(String performancesId, Integer isAgent) {
         KylinPerformanceVo vo = dataUtils.getPerformanceVo(performancesId);
         vo = checkAppStatusInfo(vo);
-        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_TICKET.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
+//        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_TICKET.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
         List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList();
         if (null != ticketTimesList) {
 
@@ -396,7 +396,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         KylinTicketVo ticketVo = null;
         KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
         performancesInfo = checkAppStatusInfo(performancesInfo);
-        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_ORDER.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
+//        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_ORDER.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
         for (int i = 0; i < performancesInfo.getTicketTimeList().size(); i++) {
             for (int x = 0; x < performancesInfo.getTicketTimeList().get(i).getTicketList().size(); x++) {
                 KylinTicketVo ticketItem = performancesInfo.getTicketTimeList().get(i).getTicketList().get(x);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/QueueUtils.java

@@ -45,21 +45,21 @@ public class QueueUtils {
         stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
     }
 
-    public void pushPvUv(String uid, String accessType, String performanceId, String orderId, String orderCode, String ipAddress) {
-        try {
-            KylinIpAreaVo vo = dataUtils.getKylinIpAreaVo(ipAddress);
-            String area = vo.getArea();
-            String areaProvince = vo.getProvince();
-            String areaCity = vo.getCity();
-            String areaCounty = vo.getCounty();
-            sendMsgByRedis(MQConst.KylinQueue.SQL_PERFORMANCE_LACK.getKey(),
-                    SqlMapping.get("bi_ticket_access_records.insert", new Object[]{
-                            uid, accessType, performanceId, orderId, orderCode,
-                            ipAddress, area, areaProvince, areaCity, areaCounty,
-                            LocalDateTime.now(),
-                    }));
-        } catch (Exception e) {
-
-        }
-    }
+//    public void pushPvUv(String uid, String accessType, String performanceId, String orderId, String orderCode, String ipAddress) {
+//        try {
+//            KylinIpAreaVo vo = dataUtils.getKylinIpAreaVo(ipAddress);
+//            String area = vo.getArea();
+//            String areaProvince = vo.getProvince();
+//            String areaCity = vo.getCity();
+//            String areaCounty = vo.getCounty();
+//            sendMsgByRedis(MQConst.KylinQueue.SQL_PERFORMANCE_LACK.getKey(),
+//                    SqlMapping.get("bi_ticket_access_records.insert", new Object[]{
+//                            uid, accessType, performanceId, orderId, orderCode,
+//                            ipAddress, area, areaProvince, areaCity, areaCounty,
+//                            LocalDateTime.now(),
+//                    }));
+//        } catch (Exception e) {
+//
+//        }
+//    }
 }

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

 kylin_order_ticket_entities.updateStatusByStation=UPDATE kylin_order_ticket_entities SET `status`=?,check_client=?,updated_at=? WHERE order_ticket_entities_id=? 
-
 # ------------------------缺票登记(不用考虑并发)----------------------------
 kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id` ,`performance_id` ,`ticket_id` ,`user_id` ,`user_name` ,`user_mobile` ,`send_status` ,`ip_address` ,`created_at`)VALUES(? ,? ,? ,? ,? ,? ,? ,? ,?);
-
+# ------------------------PV/UV----------------------------
+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)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)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 ,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_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 = ? or updated_at is null)
 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 = ? or updated_at is null)
 kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 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 = ? or updated_at is null)
-
-
-
 # ------------------------用户发起订单退款----------------------------
 kylin_order_ticket_status.refund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
@@ -26,17 +20,14 @@ kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,orde
 kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
 kylin_order_refund.refundOrderExpress=INSERT INTO kylin_order_express (order_express_id,performances_id,order_tickets_id,order_refunds_id,order_express_code,mailno,express_type,filter_result,remark,express_status,send_type,send_express_type,express_contacts,express_phone,send_express_address,appointment_time,pro_name,cargo_type_code,limit_type_code,express_type_code,goods_value_total,goods_number,created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-
 # ------------------------用户发起订单退款撤回----------------------------
 kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
-
 # ------------------------用户转赠相关接口----------------------------
-kylin_order_task.insert = INSERT INTO `kylin_order_task`(`order_id` , `status` , `created_at`) VALUES (? ,? ,?);
-kylin_order_task.delete = DELETE FROM kylin_order_task WHERE order_id = ?;
-kylin_order_ticket_status.transfer.update = UPDATE kylin_order_ticket_status SET transfer_status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_ticket_relation.transfer.update = UPDATE kylin_order_ticket_relations SET transfer_uid = ?, transfer_id = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-
+kylin_order_task.insert=INSERT INTO `kylin_order_task`(`order_id` , `status` , `created_at`) VALUES (? ,? ,?);
+kylin_order_task.delete=DELETE FROM kylin_order_task WHERE order_id = ?;
+kylin_order_ticket_status.transfer.update=UPDATE kylin_order_ticket_status SET transfer_status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_relation.transfer.update=UPDATE kylin_order_ticket_relations SET transfer_uid = ?, transfer_id = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 # ------------------------ 订单补充入场人 ----------------------------
-kylin_order_refund_entities.supplementEnter = UPDATE kylin_order_ticket_entities SET enter_type = ?,enter_name = ?,enter_mobile = ?,enter_id_code = ?,updated_at = ? WHERE order_ticket_entities_id = ?
+kylin_order_refund_entities.supplementEnter=UPDATE kylin_order_ticket_entities SET enter_type = ?,enter_name = ?,enter_mobile = ?,enter_id_code = ?,updated_at = ? WHERE order_ticket_entities_id = ?

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

@@ -101,6 +101,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         String uid = CurrentUtil.getCurrentUid();
         HashMap<String, Object> advanceMap = null;
         try {
+            String orderTicketId = IDGenerator.nextSnowId();
+            String orderCode = IDGenerator.ticketOrderCode(orderTicketId);
+//            queueUtils.pushPvUv(uid, KylinTableStatusConst.PvUv.TK_PAY.getKey(), payOrderParam.getPerformanceId(), orderTicketId, orderCode, CurrentUtil.getCliIpAddr());
             if (payOrderParam.getVoucherType() != null && payOrderParam.getVoucherType().equals(3)) {
                 isPay = false;
                 if (payOrderParam.getNumber() > 1) {
@@ -125,8 +128,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
             }
 
-            queueUtils.pushPvUv(uid,KylinTableStatusConst.PvUv.TK_PAY.getKey(),performanceData.getPerformancesId(),null,null,CurrentUtil.getCliIpAddr());
-
             if (performanceData == null || ticketTimesData == null || ticketData == null) {
                 return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }
@@ -345,7 +346,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     }
                 }
 
-                ResponseDto<PayInnerResultVo> resultData = order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, content, useTime, advanceMap, addressesVo);
+                ResponseDto<PayInnerResultVo> resultData = order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, content, useTime, advanceMap, addressesVo, orderTicketId, orderCode);
                 isDownGeneral = false;
                 return resultData;
             }
@@ -374,7 +375,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
     }
 
-    private ResponseDto<PayInnerResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, String content, String useTime, HashMap<String, Object> advanceMap, AdamAddressesVo addressesVo) throws Exception {
+    private ResponseDto<PayInnerResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, String content, String useTime, HashMap<String, Object> advanceMap, AdamAddressesVo addressesVo, String orderTicketId, String orderCode) throws Exception {
         LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr();
         String headerCliSource = CurrentUtil.getHeaderCliSource(), headerCliVersion = CurrentUtil.getHeaderCliVersion();
         String source = headerCliSource == null ? "" : headerCliSource;
@@ -382,14 +383,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         LocalDateTime now = LocalDateTime.now();
         //生成订单 order_ticket
         KylinOrderTickets orderTickets = KylinOrderTickets.getNew();
-        String orderTicketId = IDGenerator.nextSnowId();
         orderTickets.setOrderTicketsId(orderTicketId);
         orderTickets.setUserId(uid);
         Map token = CurrentUtil.getTokenClaims();
         orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
         orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
         orderTickets.setPerformanceTitle(performanceData.getTitle());
-        orderTickets.setOrderCode(IDGenerator.ticketOrderCode(orderTicketId));
+        orderTickets.setOrderCode(orderCode);
         orderTickets.setPayCode("");
         orderTickets.setQrCode("");
         orderTickets.setOrderType(source);
@@ -646,7 +646,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         KylinIpAreaVo vo = dataUtils.getKylinIpAreaVo(CurrentUtil.getCliIpAddr());
         sqls.add(SqlMapping.get("kylin_order_ticket.add"));
         LinkedList<Object[]> sqlsDataA = ObjectUtil.cloneLinkedListObj();
-        sqlsDataA.add(orderTickets.getAddObject(CurrentUtil.getCliIpAddr(),vo.getArea(),vo.getProvince(),vo.getCity(),vo.getCounty()));
+        sqlsDataA.add(orderTickets.getAddObject(CurrentUtil.getCliIpAddr(), vo.getArea(), vo.getProvince(), vo.getCity(), vo.getCounty()));
         // 生成vo
         KylinOrderTicketVo orderTicketVo = KylinOrderTicketVo.getNew();
         orderTicketVo.setOrderTicket(orderTickets);

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

@@ -44,21 +44,21 @@ public class QueueUtils {
         stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
     }
 
-    public void pushPvUv(String uid, String accessType, String performanceId, String orderId, String orderCode, String ipAddress) {
-        try {
-            KylinIpAreaVo vo = dataUtils.getKylinIpAreaVo(ipAddress);
-            String area = vo.getArea();
-            String areaProvince = vo.getProvince();
-            String areaCity = vo.getCity();
-            String areaCounty = vo.getCounty();
-            sendMsgByRedis(MQConst.KylinQueue.SQL_PERFORMANCE_LACK.getKey(),
-                    SqlMapping.get("bi_ticket_access_records.insert", new Object[]{
-                            uid, accessType, performanceId, orderId, orderCode,
-                            ipAddress, area, areaProvince, areaCity, areaCounty,
-                            LocalDateTime.now(),
-                    }));
-        } catch (Exception e) {
-
-        }
-    }
+//    public void pushPvUv(String uid, String accessType, String performanceId, String orderId, String orderCode, String ipAddress) {
+//        try {
+//            KylinIpAreaVo vo = dataUtils.getKylinIpAreaVo(ipAddress);
+//            String area = vo.getArea();
+//            String areaProvince = vo.getProvince();
+//            String areaCity = vo.getCity();
+//            String areaCounty = vo.getCounty();
+//            sendMsgByRedis(MQConst.KylinQueue.SQL_PERFORMANCE_LACK.getKey(),
+//                    SqlMapping.get("bi_ticket_access_records.insert", new Object[]{
+//                            uid, accessType, performanceId, orderId, orderCode,
+//                            ipAddress, area, areaProvince, areaCity, areaCounty,
+//                            LocalDateTime.now(),
+//                    }));
+//        } catch (Exception e) {
+//
+//        }
+//    }
 }

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

@@ -2,7 +2,7 @@ kylin_order_ticket_entities.updateStatusByStation=UPDATE kylin_order_ticket_enti
 # ------------------------缺票登记(不用考虑并发)----------------------------
 kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id` ,`performance_id` ,`ticket_id` ,`user_id` ,`user_name` ,`user_mobile` ,`send_status` ,`ip_address` ,`created_at`)VALUES(? ,? ,? ,? ,? ,? ,? ,? ,?);
 # ------------------------PV/UV----------------------------
-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 (?,?,?,?,?,?,?,?,?,?,?);
+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)VALUES(?,?,?,?,?,?,?,?,?,?,?)