下单接口 提交

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

@@ -203,7 +203,7 @@ public class KylinOrderTickets implements Serializable {
                 orderTicketsId, userId, userName, userMobile, performanceTitle, orderCode, qrCode, orderType, orderVersion,
                 number, price, priceMember, priceTotal, priceVoucher, priceActual, priceExpress, priceRefund, refundNumber,
                 payType, paymentType, timePay, expressContacts, expressAddress, expressPhone, couponType, getTicketType,
-                getTicketDescribe, payCountdownMinute, comment, createdAt, updatedAt
+                getTicketDescribe, payCountdownMinute, comment, createdAt, updatedAt,payCode
         };
     }
 

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

@@ -153,8 +153,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             String timeStart = ticketData.getTimeStart(); // 普通开售时间
             String timeEnd = ticketData.getTimeEnd(); // 购票停售时间
             String timeExpressEnd = ticketData.getTimeEndExpress(); // 快递停售时间
-            boolean isMember = feignAdamBaseClient.isMember(uid).getData();//获取是否是会员
-//            boolean isMember = true;
+//            boolean isMember = feignAdamBaseClient.isMember(uid).getData();//获取是否是会员
+            boolean isMember = true;
             int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属
             if (ticketData.getIsExclusive() == 1) {
                 memberType = 2;
@@ -290,10 +290,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         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.setUserName("");
-//        orderTickets.setUserMobile("");
+//        orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
+//        orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
+        orderTickets.setUserName("");
+        orderTickets.setUserMobile("");
         orderTickets.setPerformanceTitle(performanceData.getTitle());
         orderTickets.setOrderCode(IDGenerator.ticketOrderCode(orderTicketId));
         orderTickets.setPayCode("");
@@ -309,7 +309,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             orderTickets.setPriceTotal(ticketData.getPrice().multiply(new BigDecimal(payOrderParam.getNumber())).add(payOrderParam.getIsExpress() == 1 ? ticketData.getPriceExpress() : new BigDecimal("0")));
         }
 
+        if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
+            orderTickets.setPriceActual(new BigDecimal("0.01"));
+        } else {
             orderTickets.setPriceActual(orderTickets.getPriceTotal());
+        }
+
         orderTickets.setPriceVoucher(new BigDecimal("0.0"));
         orderTickets.setPriceExpress(ticketData.getPriceExpress());
         orderTickets.setPriceRefund(new BigDecimal(0.0));
@@ -334,9 +339,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTickets.setPayCountdownMinute(performanceData.getPayCountdownMinute());
         orderTickets.setCreatedAt(LocalDateTime.now());
         orderTickets.setUpdatedAt(null);
-        sqls.add(SqlMapping.get("kylin_order_ticket.add"));
-        LinkedList<Object[]> sqlsDataA = new LinkedList<Object[]>();
-        sqlsDataA.add(orderTickets.getAddObject());
+
 
 
         //生成订单 order_ticket_status
@@ -485,6 +488,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         payResultVo.setOrder_id(orderTicketId);
         payResultVo.setPrice(orderTickets.getPriceActual());
         orderTickets.setPayCode(payResultVo.getCode());
+        sqls.add(SqlMapping.get("kylin_order_ticket.add"));
+        LinkedList<Object[]> sqlsDataA = new LinkedList<Object[]>();
+        sqlsDataA.add(orderTickets.getAddObject());
+
+        //少mq
         if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) {
             payResultVo.setShowUrl(payOrderParam.getShowUrl());
             payResultVo.setReturnUrl(payOrderParam.getReturnUrl() + orderTicketId);
@@ -505,7 +513,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         mongoVoUtils.resetOrderListVo(uid, 1, orderTicketVo.getOrderTicketsId());
 
         // 执行sql
-        String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD);
+        String sqlData = SqlMapping.gets(sqls,  sqlsDataB, sqlsDataC, sqlsDataD,sqlsDataA);
         rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 sqlData);
         return ResponseDto.success(payResultVo);
@@ -605,34 +613,34 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     public String syncOrder(SyncOrderParam syncOrderParam) {
         //支付时间
         LocalDateTime now = LocalDateTime.now();
-
-        if (!RedisLockUtil.tryLock("order_lock:" + syncOrderParam.getOrder_code(), 240, 240)) {
-            return "fail";//参数错误
-        }
-        RLock lock = RedisLockUtil.lock("order_lock:" + syncOrderParam.getOrder_code(), 240);
+//
+//        if (!RedisLockUtil.tryLock("order_lock:" + syncOrderParam.getOrder_code(), 240, 240)) {
+//            return "fail";//参数错误
+//        }
+//        RLock lock = RedisLockUtil.lock("order_lock:" + syncOrderParam.getOrder_code(), 240);
 
 
         String timePay = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
         KylinOrderTicketVo orderTicketData = mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(syncOrderParam.getOrder_code())), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
         if (orderTicketData == null) {
-            lock.unlock();
+//            lock.unlock();
             return "fail";//订单不存在
         }
 
         if (orderTicketData.getStatus() != KylinTableStatusConst.ORDER_STATUS0) {
             if (orderTicketData.getPayCode().equals(syncOrderParam.getCode()) && orderTicketData.getStatus() == KylinTableStatusConst.ORDER_STATUS1) {
-                lock.unlock();
+//                lock.unlock();
                 return "success";//已经支付
             }
 
             if (!orderTicketData.getPayCode().equals(syncOrderParam.getCode())) {
-                lock.unlock();
+//                lock.unlock();
                 return "fail";//重复支付
             }
         }
 
         if (orderTicketData.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) {
-            lock.unlock();
+//            lock.unlock();
             return "fail";//价格不符
         }
 
@@ -718,9 +726,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
         MessageDataVo dataVo = new MessageDataVo();
         dataVo.setName(orderTicketData.getPerformanceTitle());
-        String time1=DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketData.getUseStart()),DateUtil.Formatter.yyyyMMdd);
+        String time1=DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketData.getUseStart()),DateUtil.Formatter.yyyy_MM_dd);
         String time2=DateUtil.format( DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceData.getTimeStart()),DateUtil.Formatter.HHmm);
-        dataVo.setTime( time1+time2);
+        dataVo.setTime( time1+" "+time2);
 
         MessageConfigVo configVo = new MessageConfigVo();
         configVo.setStatus(true);

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

@@ -38,6 +38,8 @@ public class OtherUtils {
                 sign = sign.toUpperCase();
                 httpData.add("sign", sign);
 
+                System.out.println("data = = = "+httpData.toString());
+
                 String returnData = HttpUtil.post(serviceUrl + "sendSmsMessage", httpData);
                 JsonNode postResultNew = JsonUtils.fromJson(returnData, JsonNode.class);
                 if (!postResultNew.get("message").toString().equals("OK")) {

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

@@ -11,7 +11,7 @@ kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` =
 kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ? 
 
 # ----------------------------------------------------
-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)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.payAgain=UPDATE  kylin_order_tickets SET order_type = ? ,order_code = ? , updated_at = ?  WHERE order_tickets_id = ?
 kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? 
 kylin_order_ticket.close=UPDATE  kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ?